incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject git commit: refs/heads/master - Fix CLOUDSTACK-1425 and CLOUDSTACK-1399: Failed to load UserVmDaoImpl in new Spring framework and register it into internal dao map.
Date Thu, 28 Feb 2013 01:09:45 GMT
Updated Branches:
  refs/heads/master 50f995f8b -> 36f4b44c3


Fix CLOUDSTACK-1425 and CLOUDSTACK-1399: Failed to load UserVmDaoImpl in
new Spring framework and register it into internal dao map.


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

Branch: refs/heads/master
Commit: 36f4b44c367e8b842a80e9decd51c16a9a4a07c8
Parents: 50f995f
Author: Min Chen <min.chen@citrix.com>
Authored: Wed Feb 27 15:27:43 2013 -0800
Committer: Min Chen <min.chen@citrix.com>
Committed: Wed Feb 27 15:47:07 2013 -0800

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


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/36f4b44c/client/tomcatconf/componentContext.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in
index 5588303..a09e858 100644
--- a/client/tomcatconf/componentContext.xml.in
+++ b/client/tomcatconf/componentContext.xml.in
@@ -48,7 +48,8 @@
   <bean id="consoleProxyManagerImpl" class="com.cloud.consoleproxy.ConsoleProxyManagerImpl"
/>
   <bean id="securityGroupManagerImpl2" class="com.cloud.network.security.SecurityGroupManagerImpl2"
/>
   <bean id="premiumSecondaryStorageManagerImpl" class="com.cloud.secstorage.PremiumSecondaryStorageManagerImpl"
/>
-  <bean id="randomlyIncreasingVMInstanceDaoImpl" class="com.cloud.vm.dao.RandomlyIncreasingVMInstanceDaoImpl"
/>
+  <!-- <bean id="randomlyIncreasingVMInstanceDaoImpl" class="com.cloud.vm.dao.RandomlyIncreasingVMInstanceDaoImpl"
/> -->
+  <bean id="userVmDaoImpl" class="com.cloud.vm.dao.UserVmDaoImpl" />
   <bean id="ipv6AddressManagerImpl" class="com.cloud.network.Ipv6AddressManagerImpl" />
 
   <bean id="apiRateLimitServiceImpl" class="org.apache.cloudstack.ratelimit.ApiRateLimitServiceImpl"/>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/36f4b44c/client/tomcatconf/nonossComponentContext.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/nonossComponentContext.xml.in b/client/tomcatconf/nonossComponentContext.xml.in
index 89bd49b..35e1b28 100644
--- a/client/tomcatconf/nonossComponentContext.xml.in
+++ b/client/tomcatconf/nonossComponentContext.xml.in
@@ -49,7 +49,8 @@
   <bean id="consoleProxyManagerImpl" class="com.cloud.consoleproxy.ConsoleProxyManagerImpl"
/>
   <bean id="securityGroupManagerImpl2" class="com.cloud.network.security.SecurityGroupManagerImpl2"
/>
   <bean id="premiumSecondaryStorageManagerImpl" class="com.cloud.secstorage.PremiumSecondaryStorageManagerImpl"
/>
-  <bean id="randomlyIncreasingVMInstanceDaoImpl" class="com.cloud.vm.dao.RandomlyIncreasingVMInstanceDaoImpl"
/>
+  <!-- <bean id="randomlyIncreasingVMInstanceDaoImpl" class="com.cloud.vm.dao.RandomlyIncreasingVMInstanceDaoImpl"
/> -->
+  <bean id="userVmDaoImpl" class="com.cloud.vm.dao.UserVmDaoImpl" />
 
   <bean id="ipv6AddressManagerImpl" class="com.cloud.network.Ipv6AddressManagerImpl" />
 


Mime
View raw message