From 918bc74050d478625ed78af44dc60f8ff0532c63 Mon Sep 17 00:00:00 2001
From: Edison Su <sudison@gmail.com>
Date: Fri, 1 Nov 2013 16:16:03 -0700
Subject: [PATCH] fix compile

---
 .../cloudstack/core/spring-engine-storage-core-context.xml    | 4 +++-
 .../spring-engine-storage-snapshot-storage-context.xml        | 2 --
 .../storage/vmsnapshot/DefaultVMSnapshotStrategy.java         | 1 -
 engine/storage/snapshot/test/src/VMSnapshotStrategyTest.java  | 2 +-
 .../cloudstack/storage/helper/HypervisorHelperImpl.java       | 2 +-
 .../cloudstack/storage/helper}/VMSnapshotHelperImpl.java      | 4 ++--
 .../storage/{snapshot => vmsnapshot}/VMSnapshotHelper.java    | 2 +-
 7 files changed, 8 insertions(+), 9 deletions(-)
 rename engine/storage/{snapshot/src/org/apache/cloudstack/storage/vmsnapshot => src/org/apache/cloudstack/storage/helper}/VMSnapshotHelperImpl.java (98%)
 rename engine/storage/src/org/apache/cloudstack/storage/{snapshot => vmsnapshot}/VMSnapshotHelper.java (96%)

diff --git a/engine/storage/resources/META-INF/cloudstack/core/spring-engine-storage-core-context.xml b/engine/storage/resources/META-INF/cloudstack/core/spring-engine-storage-core-context.xml
index b17e410ee6a..8040d801b3e 100644
--- a/engine/storage/resources/META-INF/cloudstack/core/spring-engine-storage-core-context.xml
+++ b/engine/storage/resources/META-INF/cloudstack/core/spring-engine-storage-core-context.xml
@@ -37,7 +37,9 @@
     <bean id="BAREMETAL" class="org.apache.cloudstack.storage.image.format.BAREMETAL" />
     
     <bean id="hypervisorHelperImpl" class="org.apache.cloudstack.storage.helper.HypervisorHelperImpl" />
-    <bean id="vmSnapshotHelper" class="org.apache.cloudstack.storage.vmsnapshot.VMSnapshotHelperImpl" />
+
+    <bean id="VMSnapshotHelperImpl"
+          class="org.apache.cloudstack.storage.helper.VMSnapshotHelperImpl" />
 
     <bean id="objectInDataStoreManagerImpl"
         class="org.apache.cloudstack.storage.datastore.ObjectInDataStoreManagerImpl" />
diff --git a/engine/storage/snapshot/resources/META-INF/cloudstack/storage/spring-engine-storage-snapshot-storage-context.xml b/engine/storage/snapshot/resources/META-INF/cloudstack/storage/spring-engine-storage-snapshot-storage-context.xml
index d25aeea0250..72997509130 100644
--- a/engine/storage/snapshot/resources/META-INF/cloudstack/storage/spring-engine-storage-snapshot-storage-context.xml
+++ b/engine/storage/snapshot/resources/META-INF/cloudstack/storage/spring-engine-storage-snapshot-storage-context.xml
@@ -33,6 +33,4 @@
     <bean id="DefaultVMSnapshotStrategy"
         class="org.apache.cloudstack.storage.vmsnapshot.DefaultVMSnapshotStrategy" />
 
-    <bean id="VMSnapshotHelperImpl"
-        class="org.apache.cloudstack.storage.vmsnapshot.VMSnapshotHelperImpl" />
 </beans>
diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java b/engine/storage/snapshot/src/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java
index ad165ccb46c..be3cce94da9 100644
--- a/engine/storage/snapshot/src/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java
+++ b/engine/storage/snapshot/src/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java
@@ -27,7 +27,6 @@ import javax.naming.ConfigurationException;
 import org.apache.cloudstack.engine.subsystem.api.storage.StrategyPriority;
 import org.apache.cloudstack.engine.subsystem.api.storage.VMSnapshotStrategy;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
-import org.apache.cloudstack.storage.snapshot.VMSnapshotHelper;
 import org.apache.cloudstack.storage.to.VolumeObjectTO;
 import org.apache.log4j.Logger;
 
diff --git a/engine/storage/snapshot/test/src/VMSnapshotStrategyTest.java b/engine/storage/snapshot/test/src/VMSnapshotStrategyTest.java
index d68eb36b8e2..8e36fafb5d2 100644
--- a/engine/storage/snapshot/test/src/VMSnapshotStrategyTest.java
+++ b/engine/storage/snapshot/test/src/VMSnapshotStrategyTest.java
@@ -29,7 +29,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.VMSnapshotStrategy;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.storage.to.VolumeObjectTO;
 import org.apache.cloudstack.storage.vmsnapshot.DefaultVMSnapshotStrategy;
-import org.apache.cloudstack.storage.snapshot.VMSnapshotHelper;
+import org.apache.cloudstack.storage.vmsnapshot.VMSnapshotHelper;
 import org.apache.cloudstack.test.utils.SpringUtils;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/engine/storage/src/org/apache/cloudstack/storage/helper/HypervisorHelperImpl.java b/engine/storage/src/org/apache/cloudstack/storage/helper/HypervisorHelperImpl.java
index 713c2a98a30..86c90a196bb 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/helper/HypervisorHelperImpl.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/helper/HypervisorHelperImpl.java
@@ -30,7 +30,7 @@ import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.storage.command.ForgetObjectCmd;
 import org.apache.cloudstack.storage.command.IntroduceObjectAnswer;
 import org.apache.cloudstack.storage.command.IntroduceObjectCmd;
-import org.apache.cloudstack.storage.snapshot.VMSnapshotHelper;
+import org.apache.cloudstack.storage.vmsnapshot.VMSnapshotHelper;
 import org.apache.cloudstack.storage.to.VolumeObjectTO;
 import org.apache.log4j.Logger;
 
diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/vmsnapshot/VMSnapshotHelperImpl.java b/engine/storage/src/org/apache/cloudstack/storage/helper/VMSnapshotHelperImpl.java
similarity index 98%
rename from engine/storage/snapshot/src/org/apache/cloudstack/storage/vmsnapshot/VMSnapshotHelperImpl.java
rename to engine/storage/src/org/apache/cloudstack/storage/helper/VMSnapshotHelperImpl.java
index 05d40441e0d..1200be89629 100644
--- a/engine/storage/snapshot/src/org/apache/cloudstack/storage/vmsnapshot/VMSnapshotHelperImpl.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/helper/VMSnapshotHelperImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cloudstack.storage.vmsnapshot;
+package org.apache.cloudstack.storage.helper;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -29,8 +29,8 @@ import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory;
 import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
-import org.apache.cloudstack.storage.snapshot.VMSnapshotHelper;
 import org.apache.cloudstack.storage.to.VolumeObjectTO;
+import org.apache.cloudstack.storage.vmsnapshot.VMSnapshotHelper;
 
 import com.cloud.agent.api.VMSnapshotTO;
 import com.cloud.exception.InvalidParameterValueException;
diff --git a/engine/storage/src/org/apache/cloudstack/storage/snapshot/VMSnapshotHelper.java b/engine/storage/src/org/apache/cloudstack/storage/vmsnapshot/VMSnapshotHelper.java
similarity index 96%
rename from engine/storage/src/org/apache/cloudstack/storage/snapshot/VMSnapshotHelper.java
rename to engine/storage/src/org/apache/cloudstack/storage/vmsnapshot/VMSnapshotHelper.java
index 262ec7742f9..9ee2f85dd3e 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/snapshot/VMSnapshotHelper.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/vmsnapshot/VMSnapshotHelper.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cloudstack.storage.snapshot;
+package org.apache.cloudstack.storage.vmsnapshot;
 
 import java.util.List;