Updated Branches: refs/heads/master 3e7d0efb9 -> 459081383
Fix UsageServer startup Add back @Component to ConfigurationDaoImpl and scan for the package in Spring config. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/45908138 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/45908138 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/45908138 Branch: refs/heads/master Commit: 45908138367b4349f82db93ada61d4a2129144d5 Parents: 3e7d0ef Author: Darren Shepherd <[email protected]> Authored: Tue Oct 1 00:25:50 2013 -0700 Committer: Darren Shepherd <[email protected]> Committed: Tue Oct 1 10:30:36 2013 -0700 ---------------------------------------------------------------------- .../cloudstack/framework/config/dao/ConfigurationDaoImpl.java | 3 ++- usage/resources/usageApplicationContext.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/45908138/framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java ---------------------------------------------------------------------- diff --git a/framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java b/framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java index 26292b7..e402988 100644 --- a/framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java +++ b/framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java @@ -25,8 +25,8 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; - import org.apache.cloudstack.framework.config.impl.ConfigurationVO; +import org.springframework.stereotype.Component; import com.cloud.utils.component.ComponentLifecycle; import com.cloud.utils.crypt.DBEncryptionUtil; @@ -37,6 +37,7 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; +@Component @Local(value = {ConfigurationDao.class}) public class ConfigurationDaoImpl extends GenericDaoBase<ConfigurationVO, String> implements ConfigurationDao { private static final Logger s_logger = Logger.getLogger(ConfigurationDaoImpl.class); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/45908138/usage/resources/usageApplicationContext.xml ---------------------------------------------------------------------- diff --git a/usage/resources/usageApplicationContext.xml b/usage/resources/usageApplicationContext.xml index fc67e0a..f39127b 100644 --- a/usage/resources/usageApplicationContext.xml +++ b/usage/resources/usageApplicationContext.xml @@ -31,7 +31,7 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd";> <context:annotation-config /> - <context:component-scan base-package="com.cloud.usage, com.cloud.event.dao, com.cloud.user.dao, com.cloud.configuration.dao, com.cloud.alert.dao, com.cloud.domain.dao"> + <context:component-scan base-package="com.cloud.usage, com.cloud.event.dao, com.cloud.user.dao, com.cloud.configuration.dao, com.cloud.alert.dao, com.cloud.domain.dao, org.apache.cloudstack.framework.config.dao"> <context:exclude-filter type="assignable" expression="com.cloud.usage.UsageServiceImpl"/> </context:component-scan>
