You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/02/08 22:10:34 UTC
[22/43] git commit: refs/heads/ui-plugins - Remove duplicate bean for
ApiRateLimitServiceImpl to make sure that only one ApiChecker instance is
injected in ApiServer.
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/12cbaad6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/12cbaad6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/12cbaad6
Branch: refs/heads/ui-plugins
Commit: 12cbaad69147edb9c91e4025fe19d1ed6275a198
Parents: d71cfc1
Author: Min Chen <mi...@citrix.com>
Authored: Thu Feb 7 21:42:30 2013 -0800
Committer: Min Chen <mi...@citrix.com>
Committed: Thu Feb 7 21:50:07 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/12cbaad6/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/12cbaad6/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>