From b585fa11c13bb7d548b2c16ba1ed1057a1b55f3f Mon Sep 17 00:00:00 2001
From: Murali Reddy <murali.reddy@citrix.com>
Date: Fri, 29 Mar 2013 14:02:57 +0530
Subject: [PATCH] removing @Autowired, which is not JSR complaint.

initializing the bean 'GlobalLoadBalancingRulesServiceImpl' through the componentContext.xml
---
 client/tomcatconf/componentContext.xml.in                | 2 ++
 client/tomcatconf/nonossComponentContext.xml.in          | 5 +++++
 .../region/gslb/GlobalLoadBalancingRulesServiceImpl.java | 9 ++++-----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in
index a98a41ffd5a..3f8277a2222 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>
diff --git a/client/tomcatconf/nonossComponentContext.xml.in b/client/tomcatconf/nonossComponentContext.xml.in
index 1cc1722cff5..97a4f28e244 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>
diff --git a/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java b/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java
index 9cc10aa044e..696e6e9aa48 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