From 45908138367b4349f82db93ada61d4a2129144d5 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Tue, 1 Oct 2013 00:25:50 -0700 Subject: [PATCH] Fix UsageServer startup Add back @Component to ConfigurationDaoImpl and scan for the package in Spring config. --- .../cloudstack/framework/config/dao/ConfigurationDaoImpl.java | 3 ++- usage/resources/usageApplicationContext.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) 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 26292b757e5..e4029888007 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 implements ConfigurationDao { private static final Logger s_logger = Logger.getLogger(ConfigurationDaoImpl.class); diff --git a/usage/resources/usageApplicationContext.xml b/usage/resources/usageApplicationContext.xml index fc67e0ad32a..f39127b2dc2 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"> - +