[client,server] Move VmMetaData classes to new virtualization config directories

9 files changed, 29 insertions, 29 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtConfigEditorWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtConfigEditorWindow.java
index 3a29e3b3..be47acce 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtConfigEditorWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtConfigEditorWindow.java
@@ -24,9 +24,9 @@ import org.openslx.dozmod.thrift.ImageDetailsActions;
 import org.openslx.dozmod.thrift.ImageDetailsActions.VirtConfCallback;
 import org.openslx.dozmod.thrift.cache.MetaDataCache;
 import org.openslx.util.XmlHelper;
-import org.openslx.vm.VboxMetaData;
-import org.openslx.vm.VmMetaData;
-import org.openslx.vm.VmwareConfig;
+import org.openslx.virtualization.configuration.VmMetaData;
+import org.openslx.virtualization.configuration.machine.VboxMetaData;
+import org.openslx.virtualization.configuration.machine.VmwareConfig;
 
 public class VirtConfigEditorWindow extends VirtConfigEditorWindowLayout implements UiFeedback {
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtDropDownConfigEditorWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtDropDownConfigEditorWindow.java
index b44cc764..5a768a4e 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtDropDownConfigEditorWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtDropDownConfigEditorWindow.java
@@ -20,13 +20,13 @@ import org.openslx.dozmod.thrift.cache.MetaDataCache;
 import org.openslx.sat.thrift.version.Feature;
 import org.openslx.util.ThriftUtil;
 import org.openslx.util.XmlHelper;
-import org.openslx.vm.VboxMetaData;
-import org.openslx.vm.VmMetaData;
-import org.openslx.vm.VmMetaData.DDAcceleration;
-import org.openslx.vm.VmMetaData.EthernetDevType;
-import org.openslx.vm.VmMetaData.HWVersion;
-import org.openslx.vm.VmMetaData.SoundCardType;
-import org.openslx.vm.VmMetaData.UsbSpeed;
+import org.openslx.virtualization.configuration.VmMetaData;
+import org.openslx.virtualization.configuration.VmMetaData.DDAcceleration;
+import org.openslx.virtualization.configuration.VmMetaData.EthernetDevType;
+import org.openslx.virtualization.configuration.VmMetaData.HWVersion;
+import org.openslx.virtualization.configuration.VmMetaData.SoundCardType;
+import org.openslx.virtualization.configuration.VmMetaData.UsbSpeed;
+import org.openslx.virtualization.configuration.machine.VboxMetaData;
 
 public class VirtDropDownConfigEditorWindow extends VirtDropDownConfigEditorWindowLayout
 		implements UiFeedback {
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtDropDownConfigEditorWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtDropDownConfigEditorWindowLayout.java
index a566f158..43139fa6 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtDropDownConfigEditorWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtDropDownConfigEditorWindowLayout.java
@@ -25,11 +25,11 @@ import org.openslx.dozmod.gui.helper.GridManager;
 import org.openslx.dozmod.gui.helper.I18n;
 import org.openslx.dozmod.thrift.Session;
 import org.openslx.sat.thrift.version.Feature;
-import org.openslx.vm.VmMetaData.DDAcceleration;
-import org.openslx.vm.VmMetaData.EthernetDevType;
-import org.openslx.vm.VmMetaData.HWVersion;
-import org.openslx.vm.VmMetaData.SoundCardType;
-import org.openslx.vm.VmMetaData.UsbSpeed;
+import org.openslx.virtualization.configuration.VmMetaData.DDAcceleration;
+import org.openslx.virtualization.configuration.VmMetaData.EthernetDevType;
+import org.openslx.virtualization.configuration.VmMetaData.HWVersion;
+import org.openslx.virtualization.configuration.VmMetaData.SoundCardType;
+import org.openslx.virtualization.configuration.VmMetaData.UsbSpeed;
 
 public class VirtDropDownConfigEditorWindowLayout extends JDialog {
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java
index b16a9785..4598a43c 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java
@@ -20,7 +20,7 @@ import org.openslx.dozmod.thrift.ThriftError;
 import org.openslx.dozmod.thrift.UploadInitiator;
 import org.openslx.dozmod.thrift.WrappedException;
 import org.openslx.dozmod.thrift.cache.MetaDataCache;
-import org.openslx.vm.DockerMetaDataDummy;
+import org.openslx.virtualization.configuration.container.DockerMetaDataDummy;
 
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
index b767cbd4..c869f27b 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
@@ -13,8 +13,8 @@ import org.openslx.dozmod.thrift.cache.MetaDataCache;
 import org.openslx.thrifthelper.Comparators;
 import org.openslx.util.QuickTimer;
 import org.openslx.util.QuickTimer.Task;
-import org.openslx.vm.DockerMetaDataDummy;
-import org.openslx.vm.QemuMetaData;
+import org.openslx.virtualization.configuration.container.DockerMetaDataDummy;
+import org.openslx.virtualization.configuration.machine.QemuMetaData;
 
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
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 4f64f1e9..07b01702 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
@@ -35,9 +35,9 @@ import org.openslx.dozmod.thrift.WrappedException;
 import org.openslx.dozmod.thrift.cache.MetaDataCache;
 import org.openslx.sat.thrift.version.Feature;
 import org.openslx.thrifthelper.TConst;
-import org.openslx.vm.VmMetaData;
-import org.openslx.vm.VmwareMetaData;
-import org.openslx.vm.VmMetaData.HardDisk;
+import org.openslx.virtualization.configuration.VmMetaData;
+import org.openslx.virtualization.configuration.VmMetaData.HardDisk;
+import org.openslx.virtualization.configuration.machine.VmwareMetaData;
 import org.openslx.vm.disk.DiskImage;
 import org.openslx.vm.disk.DiskImage.ImageFormat;
 import org.openslx.vm.disk.DiskImageException;
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/model/ContainerDefinition.java b/dozentenmodul/src/main/java/org/openslx/dozmod/model/ContainerDefinition.java
index 80019440..6c951b68 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/model/ContainerDefinition.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/model/ContainerDefinition.java
@@ -9,8 +9,8 @@ import org.kamranzafar.jtar.TarInputStream;
 import org.kamranzafar.jtar.TarOutputStream;
 import org.openslx.dozmod.thrift.cache.MetaDataCache;
 import org.openslx.dozmod.util.TarArchiveUtil;
-import org.openslx.vm.DockerMetaDataDummy;
-import org.openslx.vm.UnsupportedVirtualizerFormatException;
+import org.openslx.virtualization.configuration.UnsupportedVirtualizerFormatException;
+import org.openslx.virtualization.configuration.container.DockerMetaDataDummy;
 
 import java.io.*;
 import java.nio.ByteBuffer;
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/state/UploadWizardState.java b/dozentenmodul/src/main/java/org/openslx/dozmod/state/UploadWizardState.java
index 4e1dbcdf..88bfc899 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/state/UploadWizardState.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/state/UploadWizardState.java
@@ -10,7 +10,7 @@ import org.openslx.bwlp.thrift.iface.ShareMode;
 import org.openslx.dozmod.gui.wizard.WizardPage;
 import org.openslx.dozmod.thrift.Session;
 import org.openslx.dozmod.thrift.UploadInitiator;
-import org.openslx.vm.VmMetaData;
+import org.openslx.virtualization.configuration.VmMetaData;
 
 public class UploadWizardState {
 	// -- Objects of the GUI itself --
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 d36384bc..9b04518a 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/VmWrapper.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/VmWrapper.java
@@ -24,11 +24,11 @@ import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.helper.MessageType;
 import org.openslx.dozmod.thrift.cache.MetaDataCache;
 import org.openslx.thrifthelper.TConst;
-import org.openslx.vm.QemuMetaData;
-import org.openslx.vm.VboxMetaData;
-import org.openslx.vm.VmMetaData;
-import org.openslx.vm.VmwareMetaData;
-import org.openslx.vm.VmMetaData.UsbSpeed;
+import org.openslx.virtualization.configuration.VmMetaData;
+import org.openslx.virtualization.configuration.VmMetaData.UsbSpeed;
+import org.openslx.virtualization.configuration.machine.QemuMetaData;
+import org.openslx.virtualization.configuration.machine.VboxMetaData;
+import org.openslx.virtualization.configuration.machine.VmwareMetaData;
 import org.openslx.vm.disk.DiskImage;
 import org.openslx.vm.disk.DiskImageException;
 import org.openslx.vm.disk.DiskImageVmdk;