summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Bentele2021-05-19 09:48:37 +0200
committerManuel Bentele2021-05-19 09:48:37 +0200
commit2cdee4f4023ec003fe65cfa85ebb654f1446ff59 (patch)
tree39c025839c6fa2b1e58e12cd9dc29df71dec5cc5
parentMerge branch 'feature/qemu-integration' (diff)
downloadmaster-sync-shared-2cdee4f4023ec003fe65cfa85ebb654f1446ff59.tar.gz
master-sync-shared-2cdee4f4023ec003fe65cfa85ebb654f1446ff59.tar.xz
master-sync-shared-2cdee4f4023ec003fe65cfa85ebb654f1446ff59.zip
Rename 'vm.disk' package to 'virtualization.disk'
-rw-r--r--src/main/java/org/openslx/virtualization/disk/DiskImage.java (renamed from src/main/java/org/openslx/vm/disk/DiskImage.java)2
-rw-r--r--src/main/java/org/openslx/virtualization/disk/DiskImageException.java (renamed from src/main/java/org/openslx/vm/disk/DiskImageException.java)2
-rw-r--r--src/main/java/org/openslx/virtualization/disk/DiskImageQcow2.java (renamed from src/main/java/org/openslx/vm/disk/DiskImageQcow2.java)2
-rw-r--r--src/main/java/org/openslx/virtualization/disk/DiskImageUtils.java (renamed from src/main/java/org/openslx/vm/disk/DiskImageUtils.java)2
-rw-r--r--src/main/java/org/openslx/virtualization/disk/DiskImageVdi.java (renamed from src/main/java/org/openslx/vm/disk/DiskImageVdi.java)2
-rw-r--r--src/main/java/org/openslx/virtualization/disk/DiskImageVmdk.java (renamed from src/main/java/org/openslx/vm/disk/DiskImageVmdk.java)2
-rw-r--r--src/main/java/org/openslx/virtualization/virtualizer/Virtualizer.java2
-rw-r--r--src/main/java/org/openslx/virtualization/virtualizer/VirtualizerDocker.java4
-rw-r--r--src/main/java/org/openslx/virtualization/virtualizer/VirtualizerQemu.java4
-rw-r--r--src/main/java/org/openslx/virtualization/virtualizer/VirtualizerVirtualBox.java4
-rw-r--r--src/main/java/org/openslx/virtualization/virtualizer/VirtualizerVmware.java4
-rw-r--r--src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemuTest.java6
-rw-r--r--src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBoxTest.java2
-rw-r--r--src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClientTest.java2
-rw-r--r--src/test/java/org/openslx/virtualization/disk/DiskImageQcow2Test.java (renamed from src/test/java/org/openslx/vm/disk/DiskImageQcow2Test.java)4
-rw-r--r--src/test/java/org/openslx/virtualization/disk/DiskImageTest.java (renamed from src/test/java/org/openslx/vm/disk/DiskImageTest.java)2
-rw-r--r--src/test/java/org/openslx/virtualization/disk/DiskImageTestResources.java (renamed from src/test/java/org/openslx/vm/disk/DiskImageTestResources.java)2
-rw-r--r--src/test/java/org/openslx/virtualization/disk/DiskImageVdiTest.java (renamed from src/test/java/org/openslx/vm/disk/DiskImageVdiTest.java)4
-rw-r--r--src/test/java/org/openslx/virtualization/disk/DiskImageVmdkTest.java (renamed from src/test/java/org/openslx/vm/disk/DiskImageVmdkTest.java)4
19 files changed, 28 insertions, 28 deletions
diff --git a/src/main/java/org/openslx/vm/disk/DiskImage.java b/src/main/java/org/openslx/virtualization/disk/DiskImage.java
index cf7df83..5271e6e 100644
--- a/src/main/java/org/openslx/vm/disk/DiskImage.java
+++ b/src/main/java/org/openslx/virtualization/disk/DiskImage.java
@@ -1,4 +1,4 @@
-package org.openslx.vm.disk;
+package org.openslx.virtualization.disk;
import java.io.Closeable;
import java.io.File;
diff --git a/src/main/java/org/openslx/vm/disk/DiskImageException.java b/src/main/java/org/openslx/virtualization/disk/DiskImageException.java
index a98f963..db62917 100644
--- a/src/main/java/org/openslx/vm/disk/DiskImageException.java
+++ b/src/main/java/org/openslx/virtualization/disk/DiskImageException.java
@@ -1,4 +1,4 @@
-package org.openslx.vm.disk;
+package org.openslx.virtualization.disk;
/**
* An exception for faulty disk image handling.
diff --git a/src/main/java/org/openslx/vm/disk/DiskImageQcow2.java b/src/main/java/org/openslx/virtualization/disk/DiskImageQcow2.java
index e569708..a007e1c 100644
--- a/src/main/java/org/openslx/vm/disk/DiskImageQcow2.java
+++ b/src/main/java/org/openslx/virtualization/disk/DiskImageQcow2.java
@@ -1,4 +1,4 @@
-package org.openslx.vm.disk;
+package org.openslx.virtualization.disk;
import java.io.RandomAccessFile;
diff --git a/src/main/java/org/openslx/vm/disk/DiskImageUtils.java b/src/main/java/org/openslx/virtualization/disk/DiskImageUtils.java
index ccb053f..dc67548 100644
--- a/src/main/java/org/openslx/vm/disk/DiskImageUtils.java
+++ b/src/main/java/org/openslx/virtualization/disk/DiskImageUtils.java
@@ -1,4 +1,4 @@
-package org.openslx.vm.disk;
+package org.openslx.virtualization.disk;
import java.io.IOException;
import java.io.RandomAccessFile;
diff --git a/src/main/java/org/openslx/vm/disk/DiskImageVdi.java b/src/main/java/org/openslx/virtualization/disk/DiskImageVdi.java
index 37e45c1..c564112 100644
--- a/src/main/java/org/openslx/vm/disk/DiskImageVdi.java
+++ b/src/main/java/org/openslx/virtualization/disk/DiskImageVdi.java
@@ -1,4 +1,4 @@
-package org.openslx.vm.disk;
+package org.openslx.virtualization.disk;
import java.io.RandomAccessFile;
diff --git a/src/main/java/org/openslx/vm/disk/DiskImageVmdk.java b/src/main/java/org/openslx/virtualization/disk/DiskImageVmdk.java
index 75a2bac..720ec37 100644
--- a/src/main/java/org/openslx/vm/disk/DiskImageVmdk.java
+++ b/src/main/java/org/openslx/virtualization/disk/DiskImageVmdk.java
@@ -1,4 +1,4 @@
-package org.openslx.vm.disk;
+package org.openslx.virtualization.disk;
import java.io.RandomAccessFile;
diff --git a/src/main/java/org/openslx/virtualization/virtualizer/Virtualizer.java b/src/main/java/org/openslx/virtualization/virtualizer/Virtualizer.java
index ac3a4ec..ff24862 100644
--- a/src/main/java/org/openslx/virtualization/virtualizer/Virtualizer.java
+++ b/src/main/java/org/openslx/virtualization/virtualizer/Virtualizer.java
@@ -3,7 +3,7 @@ package org.openslx.virtualization.virtualizer;
import java.util.List;
import org.openslx.virtualization.Version;
-import org.openslx.vm.disk.DiskImage.ImageFormat;
+import org.openslx.virtualization.disk.DiskImage.ImageFormat;
/**
* Representation of a virtualization system.
diff --git a/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerDocker.java b/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerDocker.java
index 673447b..06ac24e 100644
--- a/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerDocker.java
+++ b/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerDocker.java
@@ -6,8 +6,8 @@ import java.util.List;
import org.openslx.thrifthelper.TConst;
import org.openslx.virtualization.Version;
-import org.openslx.vm.disk.DiskImage;
-import org.openslx.vm.disk.DiskImage.ImageFormat;
+import org.openslx.virtualization.disk.DiskImage;
+import org.openslx.virtualization.disk.DiskImage.ImageFormat;
/**
* Representation of the Docker virtualizer for application containers.
diff --git a/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerQemu.java b/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerQemu.java
index fcce392..d950111 100644
--- a/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerQemu.java
+++ b/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerQemu.java
@@ -6,8 +6,8 @@ import java.util.List;
import org.openslx.thrifthelper.TConst;
import org.openslx.virtualization.Version;
-import org.openslx.vm.disk.DiskImage;
-import org.openslx.vm.disk.DiskImage.ImageFormat;
+import org.openslx.virtualization.disk.DiskImage;
+import org.openslx.virtualization.disk.DiskImage.ImageFormat;
/**
* Representation of the QEMU virtualizer for virtual machines.
diff --git a/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerVirtualBox.java b/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerVirtualBox.java
index 6be7cbf..ebb3b3f 100644
--- a/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerVirtualBox.java
+++ b/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerVirtualBox.java
@@ -6,8 +6,8 @@ import java.util.List;
import org.openslx.thrifthelper.TConst;
import org.openslx.virtualization.Version;
-import org.openslx.vm.disk.DiskImage;
-import org.openslx.vm.disk.DiskImage.ImageFormat;
+import org.openslx.virtualization.disk.DiskImage;
+import org.openslx.virtualization.disk.DiskImage.ImageFormat;
/**
* Representation of the VirtualBox virtualizer for virtual machines.
diff --git a/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerVmware.java b/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerVmware.java
index 6e676f3..9fe31a5 100644
--- a/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerVmware.java
+++ b/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerVmware.java
@@ -6,8 +6,8 @@ import java.util.List;
import org.openslx.thrifthelper.TConst;
import org.openslx.virtualization.Version;
-import org.openslx.vm.disk.DiskImage;
-import org.openslx.vm.disk.DiskImage.ImageFormat;
+import org.openslx.virtualization.disk.DiskImage;
+import org.openslx.virtualization.disk.DiskImage.ImageFormat;
/**
* Representation of the VMware virtualizer for virtual machines.
diff --git a/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemuTest.java b/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemuTest.java
index 1cc7841..fa2ed13 100644
--- a/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemuTest.java
+++ b/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemuTest.java
@@ -40,9 +40,9 @@ import org.openslx.virtualization.configuration.VirtualizationConfiguration.Ethe
import org.openslx.virtualization.configuration.VirtualizationConfiguration.SoundCardType;
import org.openslx.virtualization.configuration.VirtualizationConfiguration.UsbSpeed;
import org.openslx.virtualization.configuration.logic.ConfigurationLogicTestUtils;
-import org.openslx.vm.disk.DiskImage;
-import org.openslx.vm.disk.DiskImageTestResources;
-import org.openslx.vm.disk.DiskImage.ImageFormat;
+import org.openslx.virtualization.disk.DiskImage;
+import org.openslx.virtualization.disk.DiskImageTestResources;
+import org.openslx.virtualization.disk.DiskImage.ImageFormat;
public class VirtualizationConfigurationQemuTest
{
diff --git a/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBoxTest.java b/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBoxTest.java
index 597fffb..1689007 100644
--- a/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBoxTest.java
+++ b/src/test/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBoxTest.java
@@ -20,7 +20,7 @@ import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.openslx.virtualization.Version;
-import org.openslx.vm.disk.DiskImage.ImageFormat;
+import org.openslx.virtualization.disk.DiskImage.ImageFormat;
public class VirtualizationConfigurationVirtualBoxTest
{
diff --git a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClientTest.java b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClientTest.java
index 96180ed..cb5cbb3 100644
--- a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClientTest.java
+++ b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClientTest.java
@@ -15,7 +15,7 @@ import org.openslx.libvirt.xml.LibvirtXmlTestResources;
import org.openslx.virtualization.configuration.VirtualizationConfiguration;
import org.openslx.virtualization.configuration.data.ConfigurationDataDozModServerToDozModClient;
import org.openslx.virtualization.configuration.transformation.TransformationException;
-import org.openslx.vm.disk.DiskImageTestResources;
+import org.openslx.virtualization.disk.DiskImageTestResources;
public class ConfigurationLogicDozModServerToDozModClientTest
{
diff --git a/src/test/java/org/openslx/vm/disk/DiskImageQcow2Test.java b/src/test/java/org/openslx/virtualization/disk/DiskImageQcow2Test.java
index 7804d7d..c6a294c 100644
--- a/src/test/java/org/openslx/vm/disk/DiskImageQcow2Test.java
+++ b/src/test/java/org/openslx/virtualization/disk/DiskImageQcow2Test.java
@@ -1,4 +1,4 @@
-package org.openslx.vm.disk;
+package org.openslx.virtualization.disk;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -8,7 +8,7 @@ import java.io.IOException;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.openslx.virtualization.Version;
-import org.openslx.vm.disk.DiskImage.ImageFormat;
+import org.openslx.virtualization.disk.DiskImage.ImageFormat;
public class DiskImageQcow2Test
{
diff --git a/src/test/java/org/openslx/vm/disk/DiskImageTest.java b/src/test/java/org/openslx/virtualization/disk/DiskImageTest.java
index 2572c58..9293a90 100644
--- a/src/test/java/org/openslx/vm/disk/DiskImageTest.java
+++ b/src/test/java/org/openslx/virtualization/disk/DiskImageTest.java
@@ -1,4 +1,4 @@
-package org.openslx.vm.disk;
+package org.openslx.virtualization.disk;
import java.io.IOException;
diff --git a/src/test/java/org/openslx/vm/disk/DiskImageTestResources.java b/src/test/java/org/openslx/virtualization/disk/DiskImageTestResources.java
index 2ec2e05..ab97bbd 100644
--- a/src/test/java/org/openslx/vm/disk/DiskImageTestResources.java
+++ b/src/test/java/org/openslx/virtualization/disk/DiskImageTestResources.java
@@ -1,4 +1,4 @@
-package org.openslx.vm.disk;
+package org.openslx.virtualization.disk;
import java.io.File;
import java.net.URL;
diff --git a/src/test/java/org/openslx/vm/disk/DiskImageVdiTest.java b/src/test/java/org/openslx/virtualization/disk/DiskImageVdiTest.java
index 85112cc..06307fa 100644
--- a/src/test/java/org/openslx/vm/disk/DiskImageVdiTest.java
+++ b/src/test/java/org/openslx/virtualization/disk/DiskImageVdiTest.java
@@ -1,4 +1,4 @@
-package org.openslx.vm.disk;
+package org.openslx.virtualization.disk;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -8,7 +8,7 @@ import java.io.IOException;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.openslx.virtualization.Version;
-import org.openslx.vm.disk.DiskImage.ImageFormat;
+import org.openslx.virtualization.disk.DiskImage.ImageFormat;
public class DiskImageVdiTest
{
diff --git a/src/test/java/org/openslx/vm/disk/DiskImageVmdkTest.java b/src/test/java/org/openslx/virtualization/disk/DiskImageVmdkTest.java
index 4c8be82..5b3cccf 100644
--- a/src/test/java/org/openslx/vm/disk/DiskImageVmdkTest.java
+++ b/src/test/java/org/openslx/virtualization/disk/DiskImageVmdkTest.java
@@ -1,4 +1,4 @@
-package org.openslx.vm.disk;
+package org.openslx.virtualization.disk;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -9,7 +9,7 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.openslx.virtualization.Version;
-import org.openslx.vm.disk.DiskImage.ImageFormat;
+import org.openslx.virtualization.disk.DiskImage.ImageFormat;
public class DiskImageVmdkTest
{