removing @Autowired, which is not JSR complaint. initializing the bean 'GlobalLoadBalancingRulesServiceImpl' through the componentContext.xml
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b585fa11 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b585fa11 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b585fa11 Branch: refs/heads/bvt Commit: b585fa11c13bb7d548b2c16ba1ed1057a1b55f3f Parents: 6a7156a Author: Murali Reddy <murali.re...@citrix.com> Authored: Fri Mar 29 14:02:57 2013 +0530 Committer: Murali Reddy <murali.re...@citrix.com> Committed: Fri Mar 29 15:53:59 2013 +0530 ---------------------------------------------------------------------- client/tomcatconf/componentContext.xml.in | 2 ++ client/tomcatconf/nonossComponentContext.xml.in | 5 +++++ .../gslb/GlobalLoadBalancingRulesServiceImpl.java | 9 ++++----- 3 files changed, 11 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b585fa11/client/tomcatconf/componentContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in index a98a41f..3f8277a 100644 --- a/client/tomcatconf/componentContext.xml.in +++ b/client/tomcatconf/componentContext.xml.in @@ -333,4 +333,6 @@ <bean id="ClassicalPrimaryDataStoreProvider" class="org.apache.cloudstack.storage.datastore.provider.CloudStackPrimaryDataStoreProviderImpl"> </bean> + <bean id="GlobalLoadBalancingRulesServiceImpl" class ="org.apache.cloudstack.region.gslb.GlobalLoadBalancingRulesServiceImpl" /> + </beans> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b585fa11/client/tomcatconf/nonossComponentContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/nonossComponentContext.xml.in b/client/tomcatconf/nonossComponentContext.xml.in index 1cc1722..97a4f28 100644 --- a/client/tomcatconf/nonossComponentContext.xml.in +++ b/client/tomcatconf/nonossComponentContext.xml.in @@ -47,6 +47,11 @@ </property> </bean> + <bean id="GlobalLoadBalancingRulesServiceImpl" class ="org.apache.cloudstack.region.gslb.GlobalLoadBalancingRulesServiceImpl" > + <property name="GslbServiceProvider"> + <ref bean="Netscaler"/> + </property> + </bean> <bean id ="AccountManagerImpl" class="com.cloud.user.AccountManagerImpl"> <property name="UserAuthenticators"> <list> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b585fa11/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java ---------------------------------------------------------------------- diff --git a/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java b/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java index 9cc10aa..696e6e9 100644 --- a/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java +++ b/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java @@ -44,8 +44,6 @@ import org.apache.cloudstack.api.command.user.region.ha.gslb.*; import org.apache.cloudstack.region.Region; import org.apache.cloudstack.region.dao.RegionDao; import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; import javax.ejb.Local; import javax.inject.Inject; @@ -54,7 +52,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -@Component @Local(value = {GlobalLoadBalancingRulesService.class}) public class GlobalLoadBalancingRulesServiceImpl implements GlobalLoadBalancingRulesService { @@ -80,9 +77,11 @@ public class GlobalLoadBalancingRulesServiceImpl implements GlobalLoadBalancingR IPAddressDao _ipAddressDao; @Inject AgentManager _agentMgr; - @Autowired(required=false) - protected GslbServiceProvider _gslbProvider; + protected GslbServiceProvider _gslbProvider=null; + public void setGslbServiceProvider(GslbServiceProvider provider) { + this._gslbProvider = provider; + } @Override @DB
