You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mu...@apache.org on 2013/04/09 16:09:24 UTC

[1/2] git commit: updated refs/heads/master to ef2983c

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 <mu...@citrix.com>
Authored: Tue Apr 9 19:19:34 2013 +0530
Committer: Murali Reddy <mu...@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
   -->


[2/2] git commit: updated refs/heads/master to ef2983c

Posted by mu...@apache.org.
region id is not Long, its integer changing the regionId parameter in
ListGlobalLoadBalancerRuleCmd.java


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ef2983cc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ef2983cc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ef2983cc

Branch: refs/heads/master
Commit: ef2983cc12e909696be1c0c390c14d22cd4bebe1
Parents: 120d834
Author: Murali Reddy <mu...@citrix.com>
Authored: Tue Apr 9 19:23:13 2013 +0530
Committer: Murali Reddy <mu...@citrix.com>
Committed: Tue Apr 9 19:23:13 2013 +0530

----------------------------------------------------------------------
 .../ha/gslb/ListGlobalLoadBalancerRuleCmd.java     |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ef2983cc/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java
index dae861a..d75de57 100644
--- a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java
@@ -45,7 +45,7 @@ public class ListGlobalLoadBalancerRuleCmd extends BaseListTaggedResourcesCmd {
     @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = GlobalLoadBalancerResponse.class, description = "the ID of the global load balancer rule")
     private Long id;
 
-    @Parameter(name = ApiConstants.REGION_ID, type = CommandType.UUID, entityType = RegionResponse.class, description = "region ID")
+    @Parameter(name = ApiConstants.REGION_ID, type = CommandType.INTEGER, entityType = RegionResponse.class, description = "region ID")
     private Integer regionId;
 
     // ///////////////////////////////////////////////////