Updated Branches: refs/heads/master 6dad8adf8 -> 984b59d1e
CLOUDSTACK-2701 Moved bean VmwareStorageMotionStrategy to nonossComponentContext.xml.in Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/984b59d1 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/984b59d1 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/984b59d1 Branch: refs/heads/master Commit: 984b59d1eecf677ad2d824d37175976f9b6e2eec Parents: 6dad8ad Author: Sateesh Chodapuneedi <[email protected]> Authored: Mon Jun 3 10:03:36 2013 +0530 Committer: Sateesh Chodapuneedi <[email protected]> Committed: Mon Jun 3 10:03:36 2013 +0530 ---------------------------------------------------------------------- client/tomcatconf/applicationContext.xml.in | 1 - client/tomcatconf/nonossComponentContext.xml.in | 1 + 2 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/984b59d1/client/tomcatconf/applicationContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/applicationContext.xml.in b/client/tomcatconf/applicationContext.xml.in index 11ed42b..ee99785 100644 --- a/client/tomcatconf/applicationContext.xml.in +++ b/client/tomcatconf/applicationContext.xml.in @@ -735,7 +735,6 @@ <bean id="agentMonitor" class="com.cloud.agent.manager.AgentMonitor" /> <bean id="alertGenerator" class="com.cloud.event.AlertGenerator" /> <bean id="ancientDataMotionStrategy" class="org.apache.cloudstack.storage.motion.AncientDataMotionStrategy" /> - <bean id="vmwareStorageMotionStrategy" class="org.apache.cloudstack.storage.motion.VmwareStorageMotionStrategy"/> <bean id="xenserverStorageMotionStrategy" class="org.apache.cloudstack.storage.motion.XenServerStorageMotionStrategy" /> <bean id="ancientImageDataStoreProvider" class="org.apache.cloudstack.storage.image.store.AncientImageDataStoreProvider" /> <bean id="ancientSnapshotStrategy" class="org.apache.cloudstack.storage.snapshot.strategy.AncientSnapshotStrategy" /> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/984b59d1/client/tomcatconf/nonossComponentContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/nonossComponentContext.xml.in b/client/tomcatconf/nonossComponentContext.xml.in index 6bf7e14..42c9fc5 100644 --- a/client/tomcatconf/nonossComponentContext.xml.in +++ b/client/tomcatconf/nonossComponentContext.xml.in @@ -80,6 +80,7 @@ <bean id="VmwareDatacenterDaoImpl" class="com.cloud.hypervisor.vmware.dao.VmwareDatacenterDaoImpl" /> <bean id="VmwareDatacenterZoneMapDaoImpl" class="com.cloud.hypervisor.vmware.dao.VmwareDatacenterZoneMapDaoImpl" /> <bean id="LegacyZoneDaoImpl" class="com.cloud.hypervisor.vmware.dao.LegacyZoneDaoImpl" /> + <bean id="vmwareStorageMotionStrategy" class="org.apache.cloudstack.storage.motion.VmwareStorageMotionStrategy"/> <!-- Nicira support components
