apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-15 10:02:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix compile

Browse Source
This commit is contained in:
Edison Su 2013-11-01 16:16:03 -07:00
parent 143fbc37a6
commit 918bc74050
7 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/storage/resources/META-INF/cloudstack/core/spring-engine-storage-core-context.xml
View File

@ -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" />

2
engine/storage/snapshot/resources/META-INF/cloudstack/storage/spring-engine-storage-snapshot-storage-context.xml
View File

@ -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>

1
engine/storage/snapshot/src/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java
View File

@ -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;

2
engine/storage/snapshot/test/src/VMSnapshotStrategyTest.java
View File

@ -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;

2
engine/storage/src/org/apache/cloudstack/storage/helper/HypervisorHelperImpl.java
View File

@ -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;

4
engine/storage/snapshot/src/org/apache/cloudstack/storage/vmsnapshot/VMSnapshotHelperImpl.java → engine/storage/src/org/apache/cloudstack/storage/helper/VMSnapshotHelperImpl.java
View File

@ -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;

2
engine/storage/src/org/apache/cloudstack/storage/snapshot/VMSnapshotHelper.java → engine/storage/src/org/apache/cloudstack/storage/vmsnapshot/VMSnapshotHelper.java
View File

@ -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;