You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ki...@apache.org on 2013/02/05 12:47:36 UTC
git commit: refs/heads/4.1 - CLOUDSTACK-1154: Added @Component
annotation to RegionServiceImpl and RegionManagerImpl
Updated Branches:
refs/heads/4.1 7970384f6 -> cffa45f71
CLOUDSTACK-1154: Added @Component annotation to RegionServiceImpl and RegionManagerImpl
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/cffa45f7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/cffa45f7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/cffa45f7
Branch: refs/heads/4.1
Commit: cffa45f710fec5d069bb470481de1aac10ebad21
Parents: 7970384
Author: Kishan Kavala <ki...@cloud.com>
Authored: Tue Feb 5 17:17:13 2013 +0530
Committer: Kishan Kavala <ki...@cloud.com>
Committed: Tue Feb 5 17:17:13 2013 +0530
----------------------------------------------------------------------
client/tomcatconf/componentContext.xml.in | 1 -
.../cloudstack/region/RegionManagerImpl.java | 2 ++
.../cloudstack/region/RegionServiceImpl.java | 2 ++
3 files changed, 4 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cffa45f7/client/tomcatconf/componentContext.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in
index 065188c..9099b91 100644
--- a/client/tomcatconf/componentContext.xml.in
+++ b/client/tomcatconf/componentContext.xml.in
@@ -50,7 +50,6 @@
<bean id="premiumSecondaryStorageManagerImpl" class="com.cloud.secstorage.PremiumSecondaryStorageManagerImpl" />
<bean id="randomlyIncreasingVMInstanceDaoImpl" class="com.cloud.vm.dao.RandomlyIncreasingVMInstanceDaoImpl" />
<bean id="ipv6AddressManagerImpl" class="com.cloud.network.Ipv6AddressManagerImpl" />
- <bean id="RegionManagerImpl" class="org.apache.cloudstack.region.RegionManagerImpl" />
<bean id="ApiRateLimitService" class="org.apache.cloudstack.ratelimit.ApiRateLimitServiceImpl">
<property name="name" value="ApiRateLimitService"/>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cffa45f7/server/src/org/apache/cloudstack/region/RegionManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/org/apache/cloudstack/region/RegionManagerImpl.java b/server/src/org/apache/cloudstack/region/RegionManagerImpl.java
index 190c69c..c7bca5b 100755
--- a/server/src/org/apache/cloudstack/region/RegionManagerImpl.java
+++ b/server/src/org/apache/cloudstack/region/RegionManagerImpl.java
@@ -33,6 +33,7 @@ import org.apache.cloudstack.region.dao.RegionDao;
import org.apache.cloudstack.region.dao.RegionSyncDao;
import org.apache.commons.httpclient.NameValuePair;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.domain.Domain;
import com.cloud.domain.DomainVO;
@@ -54,6 +55,7 @@ import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.uuididentity.dao.IdentityDao;
+@Component
@Local(value = { RegionManager.class })
public class RegionManagerImpl extends ManagerBase implements RegionManager, Manager{
public static final Logger s_logger = Logger.getLogger(RegionManagerImpl.class);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cffa45f7/server/src/org/apache/cloudstack/region/RegionServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/org/apache/cloudstack/region/RegionServiceImpl.java b/server/src/org/apache/cloudstack/region/RegionServiceImpl.java
index f10f638..7aed881 100755
--- a/server/src/org/apache/cloudstack/region/RegionServiceImpl.java
+++ b/server/src/org/apache/cloudstack/region/RegionServiceImpl.java
@@ -36,6 +36,7 @@ import org.apache.cloudstack.api.command.admin.user.UpdateUserCmd;
import org.apache.cloudstack.api.command.user.region.ListRegionsCmd;
import org.apache.cloudstack.region.dao.RegionDao;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.domain.Domain;
import com.cloud.domain.dao.DomainDao;
@@ -52,6 +53,7 @@ import com.cloud.user.dao.UserDao;
import com.cloud.utils.component.Manager;
import com.cloud.utils.component.ManagerBase;
+@Component
@Local(value = { RegionService.class })
public class RegionServiceImpl extends ManagerBase implements RegionService, Manager {
public static final Logger s_logger = Logger.getLogger(RegionServiceImpl.class);