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/4198e655 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/4198e655 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/4198e655 Branch: refs/heads/noa/packaging_rpm_fixes Commit: 4198e655007ab86a219ac018f8c2cd62478ea1cb Parents: 02a0439 Author: Min Chen <[email protected]> Authored: Wed Feb 27 15:27:43 2013 -0800 Committer: Min Chen <[email protected]> Committed: Wed Feb 27 15:28:32 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/4198e655/client/tomcatconf/componentContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in index cd2ca11..9f9f38c 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/4198e655/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" />
