Updated Branches: refs/heads/master 9180bd599 -> ef2983cc1
Fixing the regression introduced by spring refactor to stream line oss and non oss components. sincle the GSLB service impl has different configuration, moving it out the bean definition from applicationContext to ComponentContext and non-ossComponentContext Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/120d8341 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/120d8341 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/120d8341 Branch: refs/heads/master Commit: 120d834186c750e53d0fe55fc0c039b88b64626c Parents: 9180bd5 Author: Murali Reddy <murali.re...@citrix.com> Authored: Tue Apr 9 19:19:34 2013 +0530 Committer: Murali Reddy <murali.re...@citrix.com> Committed: Tue Apr 9 19:19:34 2013 +0530 ---------------------------------------------------------------------- client/tomcatconf/applicationContext.xml.in | 1 - client/tomcatconf/nonossComponentContext.xml.in | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/120d8341/client/tomcatconf/applicationContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/applicationContext.xml.in b/client/tomcatconf/applicationContext.xml.in index 0b4ba82..3b51a83 100644 --- a/client/tomcatconf/applicationContext.xml.in +++ b/client/tomcatconf/applicationContext.xml.in @@ -733,7 +733,6 @@ <bean id="defaultEndPointSelector" class="org.apache.cloudstack.storage.endpoint.DefaultEndPointSelector" /> <bean id="defaultPrimaryDataStoreProviderManagerImpl" class="org.apache.cloudstack.storage.datastore.manager.DefaultPrimaryDataStoreProviderManagerImpl" /> <bean id="eventUtils" class="com.cloud.event.EventUtils" /> - <bean id="globalLoadBalancingRulesServiceImpl" class="org.apache.cloudstack.region.gslb.GlobalLoadBalancingRulesServiceImpl" /> <bean id="hypervsiorHostEndPointRpcServer" class="org.apache.cloudstack.storage.HypervsiorHostEndPointRpcServer" /> <bean id="iSCSI" class="org.apache.cloudstack.storage.datastore.type.ISCSI" /> <bean id="ISO" class="org.apache.cloudstack.storage.image.format.ISO" /> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/120d8341/client/tomcatconf/nonossComponentContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/nonossComponentContext.xml.in b/client/tomcatconf/nonossComponentContext.xml.in index 187446c..fc8a9cd 100644 --- a/client/tomcatconf/nonossComponentContext.xml.in +++ b/client/tomcatconf/nonossComponentContext.xml.in @@ -43,7 +43,12 @@ --> <bean id="premiumDatabaseUpgradeChecker" class="com.cloud.upgrade.PremiumDatabaseUpgradeChecker"/> - + <bean id="GlobalLoadBalancingRulesServiceImpl" class ="org.apache.cloudstack.region.gslb.GlobalLoadBalancingRulesServiceImpl" > + <property name="GslbServiceProvider"> + <ref bean="Netscaler"/> + </property> + </bean> + <!-- DAO with customized configuration under non-OSS deployment -->
