incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject [2/2] git commit: refs/heads/4.1 - Remove duplicate bean for ApiRateLimitServiceImpl to make sure that only one ApiChecker instance is injected in ApiServer.
Date Fri, 08 Feb 2013 05:43:12 GMT
Updated Branches:
  refs/heads/4.1 1884f518a -> 3ce7531d2


Remove duplicate bean for ApiRateLimitServiceImpl to make sure that only
one ApiChecker instance is injected in ApiServer.

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

Branch: refs/heads/4.1
Commit: 3ce7531d2b9b1ec0bc4bf2b8935df306f6310d79
Parents: 3050c43
Author: Min Chen <min.chen@citrix.com>
Authored: Thu Feb 7 21:42:30 2013 -0800
Committer: Min Chen <min.chen@citrix.com>
Committed: Thu Feb 7 21:42:30 2013 -0800

----------------------------------------------------------------------
 client/tomcatconf/componentContext.xml.in       |    7 ++-----
 client/tomcatconf/nonossComponentContext.xml.in |    7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3ce7531d/client/tomcatconf/componentContext.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in
index de013de..43d31fb 100644
--- a/client/tomcatconf/componentContext.xml.in
+++ b/client/tomcatconf/componentContext.xml.in
@@ -52,9 +52,8 @@
   <bean id="randomlyIncreasingVMInstanceDaoImpl" class="com.cloud.vm.dao.RandomlyIncreasingVMInstanceDaoImpl"
/>
   <bean id="ipv6AddressManagerImpl" class="com.cloud.network.Ipv6AddressManagerImpl" />
 
-  <bean id="ApiRateLimitService" class="org.apache.cloudstack.ratelimit.ApiRateLimitServiceImpl">
-    <property name="name" value="ApiRateLimitService"/>
-  </bean>
+  <bean id="apiRateLimitServiceImpl" class="org.apache.cloudstack.ratelimit.ApiRateLimitServiceImpl"/>
+
    
   <!--
       Network Elements
@@ -116,8 +115,6 @@
 
   <bean id="StaticRoleBasedAPIAccessChecker" class="org.apache.cloudstack.acl.StaticRoleBasedAPIAccessChecker"/>
 
-  <bean id="ApiRateLimitServiceImpl" class="org.apache.cloudstack.ratelimit.ApiRateLimitServiceImpl"/>
-
   <bean id="ExteralIpAddressAllocator" class="com.cloud.network.ExteralIpAddressAllocator">
     <property name="name" value="Basic"/>
   </bean>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3ce7531d/client/tomcatconf/nonossComponentContext.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/nonossComponentContext.xml.in b/client/tomcatconf/nonossComponentContext.xml.in
index b306f52..5532bec 100644
--- a/client/tomcatconf/nonossComponentContext.xml.in
+++ b/client/tomcatconf/nonossComponentContext.xml.in
@@ -52,9 +52,8 @@
   <bean id="randomlyIncreasingVMInstanceDaoImpl" class="com.cloud.vm.dao.RandomlyIncreasingVMInstanceDaoImpl"
/>
 
   <bean id="ipv6AddressManagerImpl" class="com.cloud.network.Ipv6AddressManagerImpl" />
-  <bean id="ApiRateLimitService" class="org.apache.cloudstack.ratelimit.ApiRateLimitServiceImpl">
-    <property name="name" value="ApiRateLimitService"/>
-  </bean>
+
+  <bean id="apiRateLimitServiceImpl" class="org.apache.cloudstack.ratelimit.ApiRateLimitServiceImpl"/>
 
   <!-- bean id="bareMetalVmManagerImpl" class="com.cloud.baremetal.BareMetalVmManagerImpl"
/ -->
   <bean id="VmwareManager" class="com.cloud.hypervisor.vmware.manager.VmwareManagerImpl"/>
@@ -125,8 +124,6 @@
 
   <bean id="StaticRoleBasedAPIAccessChecker" class="org.apache.cloudstack.acl.StaticRoleBasedAPIAccessChecker"/>
 
-  <bean id="ApiRateLimitServiceImpl" class="org.apache.cloudstack.ratelimit.ApiRateLimitServiceImpl"/>
-
   <bean id="ExteralIpAddressAllocator" class="com.cloud.network.ExteralIpAddressAllocator">
     <property name="name" value="Basic"/>
   </bean>


Mime
View raw message