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 @@
+
+
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 @@
+
+
+
+
+
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