diff options
author | Manuel Bentele | 2021-05-19 09:49:31 +0200 |
---|---|---|
committer | Manuel Bentele | 2021-05-19 09:49:31 +0200 |
commit | 14cb1af32eeff4abc8288662c61d48d7c8c0f536 (patch) | |
tree | 151af0b16cc9d9d765c1d76d72f10d43badbb31c | |
parent | Merge branch 'refactor/vm-config-transformation-logic' (diff) | |
download | tutor-module-14cb1af3.tar.gz tutor-module-14cb1af3.tar.xz tutor-module-14cb1af3.zip |
[client,server] Rename 'vm.disk' package to 'virtualization.disk'
4 files changed, 10 insertions, 10 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java index 9ade4587..1d7f5821 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java @@ -40,13 +40,13 @@ import org.openslx.virtualization.configuration.VirtualizationConfigurationVmwar import org.openslx.virtualization.configuration.data.ConfigurationDataDozModClientToDozModServer; import org.openslx.virtualization.configuration.logic.ConfigurationLogicDozModClientToDozModServer; import org.openslx.virtualization.configuration.transformation.TransformationException; +import org.openslx.virtualization.disk.DiskImage; +import org.openslx.virtualization.disk.DiskImageException; +import org.openslx.virtualization.disk.DiskImage.ImageFormat; import org.openslx.virtualization.configuration.VirtualizationConfiguration; import org.openslx.virtualization.configuration.VirtualizationConfiguration.HardDisk; import org.openslx.virtualization.configuration.VirtualizationConfigurationQemu; import org.openslx.virtualization.configuration.VirtualizationConfigurationVirtualBox; -import org.openslx.vm.disk.DiskImage; -import org.openslx.vm.disk.DiskImage.ImageFormat; -import org.openslx.vm.disk.DiskImageException; /** * Page for uploading a new image. diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ImageWrapper.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ImageWrapper.java index f6dfc852..a6281df1 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ImageWrapper.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ImageWrapper.java @@ -8,8 +8,8 @@ import org.openslx.dozmod.gui.helper.MessageType; import org.openslx.dozmod.model.ContainerDefinition; import org.openslx.thrifthelper.TConst; import org.openslx.virtualization.configuration.VirtualizationConfigurationException; -import org.openslx.vm.disk.DiskImage; -import org.openslx.vm.disk.DiskImageException; +import org.openslx.virtualization.disk.DiskImage; +import org.openslx.virtualization.disk.DiskImageException; import java.io.File; import java.io.IOException; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/VmWrapper.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/VmWrapper.java index 0cce4c45..71c39f16 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/VmWrapper.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/VmWrapper.java @@ -27,12 +27,12 @@ import org.openslx.thrifthelper.TConst; import org.openslx.virtualization.configuration.VirtualizationConfigurationVmware; import org.openslx.virtualization.configuration.logic.ConfigurationLogicDozModServerToDozModClient; import org.openslx.virtualization.configuration.transformation.TransformationException; +import org.openslx.virtualization.disk.DiskImage; +import org.openslx.virtualization.disk.DiskImageException; +import org.openslx.virtualization.disk.DiskImageVmdk; import org.openslx.virtualization.configuration.VirtualizationConfiguration; import org.openslx.virtualization.configuration.VirtualizationConfigurationException; import org.openslx.virtualization.configuration.data.ConfigurationDataDozModServerToDozModClient; -import org.openslx.vm.disk.DiskImage; -import org.openslx.vm.disk.DiskImageException; -import org.openslx.vm.disk.DiskImageVmdk; public class VmWrapper { diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java index e5a9cd09..e29d2ac8 100644 --- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java +++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java @@ -39,8 +39,8 @@ import org.openslx.filetransfer.util.FileChunk; import org.openslx.filetransfer.util.HashChecker; import org.openslx.filetransfer.util.IncomingTransferBase; import org.openslx.util.ThriftUtil; -import org.openslx.vm.disk.DiskImage; -import org.openslx.vm.disk.DiskImageException; +import org.openslx.virtualization.disk.DiskImage; +import org.openslx.virtualization.disk.DiskImageException; public class IncomingDataTransfer extends IncomingTransferBase { |