Updated Branches: refs/heads/vmsync 6a1e1e80f -> d84bb9720
Checked in the fixes to the incorrect package. This xml is an incredibly poor choice to use. When will you fix this Kelven? Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0493ea3f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0493ea3f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0493ea3f Branch: refs/heads/vmsync Commit: 0493ea3ff698698c0a55907fc43b5a1bc6017822 Parents: 6a1e1e8 Author: Alex Huang <[email protected]> Authored: Fri May 24 10:31:11 2013 -0700 Committer: Alex Huang <[email protected]> Committed: Fri May 24 10:31:11 2013 -0700 ---------------------------------------------------------------------- client/tomcatconf/applicationContext.xml.in | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0493ea3f/client/tomcatconf/applicationContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/applicationContext.xml.in b/client/tomcatconf/applicationContext.xml.in index 2aace39..9cece35 100644 --- a/client/tomcatconf/applicationContext.xml.in +++ b/client/tomcatconf/applicationContext.xml.in @@ -770,8 +770,7 @@ <bean id="usageEventUtils" class="com.cloud.event.UsageEventUtils" /> <bean id="userContextInitializer" class="com.cloud.user.UserContextInitializer" /> <bean id="VHD" class="org.apache.cloudstack.storage.image.format.VHD" /> - <bean id="vMEntityManagerImpl" class="org.apache.cloudstack.engine.cloud.entity.api.VMEntityManagerImpl" /> - <bean id="virtualMachineEntityFactory" class="org.apache.cloudstack.engine.cloud.entity.api.VirtualMachineEntityFactory" /> + <bean id="vMEntityManagerImpl" class="org.apache.cloudstack.engine.vm.VMEntityManagerImpl" /> <bean id="virtualMachineEntityImpl" class="org.apache.cloudstack.engine.cloud.entity.api.VirtualMachineEntityImpl" /> <bean id="virtualMachineRestService" class="org.apache.cloudstack.engine.rest.service.api.VirtualMachineRestService" /> <bean id="volumeDataFactoryImpl" class="org.apache.cloudstack.storage.volume.VolumeDataFactoryImpl" /> @@ -828,7 +827,7 @@ <property name="name" value="VmWorkJobWakeupDispatcher" /> </bean> - <bean id="vmWorkJobDaoImpl" class="com.cloud.vm.VmWorkJobDaoImpl" /> + <bean id="vmWorkJobDaoImpl" class="org.apache.cloudstack.vm.jobs.VmWorkJobDaoImpl" /> <!-- Baremetal components
