From b155129ae8fb9e9fe17dc558cd1b292f097d527e Mon Sep 17 00:00:00 2001 From: wilderrodrigues Date: Tue, 26 May 2015 10:43:38 +0200 Subject: [PATCH] Fixing the packaging of the Xen resource tests - The package declaration of all Test classes was point to a package that was not represented as a directory - For example: Class A had "package b.c.d;" as declaration, but the class A was under directory "c" Maven was bulding the project and executing the tests just fine because it uses "-sourcepath". However, with IDEs and javac it would fail. Signed-off-by: wilderrodrigues This closes #317 --- .../hypervisor/xenserver/resource/CitrixResourceBase.java | 2 +- .../{citrix => xenbase}/CitrixAttachIsoCommandWrapper.java | 2 +- .../{citrix => xenbase}/CitrixAttachVolumeCommandWrapper.java | 2 +- .../CitrixCheckConsoleProxyLoadCommandWrapper.java | 2 +- .../{citrix => xenbase}/CitrixCheckHealthCommandWrapper.java | 2 +- .../{citrix => xenbase}/CitrixCheckNetworkCommandWrapper.java | 2 +- .../{citrix => xenbase}/CitrixCheckOnHostCommandWrapper.java | 2 +- .../{citrix => xenbase}/CitrixCheckSshCommandWrapper.java | 2 +- .../CitrixCheckVirtualMachineCommandWrapper.java | 2 +- .../CitrixCleanupNetworkRulesCmdWrapper.java | 2 +- .../CitrixClusterVMMetaDataSyncCommandWrapper.java | 2 +- .../CitrixConsoleProxyLoadCommandWrapper.java | 2 +- .../{citrix => xenbase}/CitrixCreateCommandWrapper.java | 2 +- .../CitrixCreateStoragePoolCommandWrapper.java | 2 +- .../CitrixCreateVMSnapshotCommandWrapper.java | 2 +- .../CitrixDeleteStoragePoolCommandWrapper.java | 2 +- .../CitrixDeleteVMSnapshotCommandWrapper.java | 2 +- .../{citrix => xenbase}/CitrixDestroyCommandWrapper.java | 2 +- .../{citrix => xenbase}/CitrixGetHostStatsCommandWrapper.java | 2 +- .../CitrixGetStorageStatsCommandWrapper.java | 2 +- .../CitrixGetVmDiskStatsCommandWrapper.java | 2 +- .../{citrix => xenbase}/CitrixGetVmStatsCommandWrapper.java | 2 +- .../{citrix => xenbase}/CitrixGetVncPortCommandWrapper.java | 2 +- .../{citrix => xenbase}/CitrixMaintainCommandWrapper.java | 2 +- .../{citrix => xenbase}/CitrixMigrateCommandWrapper.java | 2 +- .../CitrixModifySshKeysCommandWrapper.java | 2 +- .../CitrixModifyStoragePoolCommandWrapper.java | 2 +- .../CitrixNetworkElementCommandWrapper.java | 2 +- .../CitrixNetworkRulesSystemVmCommandWrapper.java | 2 +- .../CitrixNetworkRulesVmSecondaryIpCommandWrapper.java | 2 +- .../CitrixOvsCreateGreTunnelCommandWrapper.java | 2 +- .../CitrixOvsCreateTunnelCommandWrapper.java | 2 +- .../CitrixOvsDeleteFlowCommandWrapper.java | 2 +- .../CitrixOvsDestroyBridgeCommandWrapper.java | 2 +- .../CitrixOvsDestroyTunnelCommandWrapper.java | 2 +- .../CitrixOvsFetchInterfaceCommandWrapper.java | 2 +- .../CitrixOvsSetTagAndFlowCommandWrapper.java | 2 +- .../CitrixOvsSetupBridgeCommandWrapper.java | 2 +- .../CitrixOvsVpcPhysicalTopologyConfigCommandWrapper.java | 2 +- .../CitrixOvsVpcRoutingPolicyConfigCommandWrapper.java | 2 +- .../CitrixPerformanceMonitorCommandWrapper.java | 2 +- .../{citrix => xenbase}/CitrixPingTestCommandWrapper.java | 2 +- .../{citrix => xenbase}/CitrixPlugNicCommandWrapper.java | 2 +- .../CitrixPrepareForMigrationCommandWrapper.java | 2 +- .../CitrixPrimaryStorageDownloadCommandWrapper.java | 2 +- .../{citrix => xenbase}/CitrixPvlanSetupCommandWrapper.java | 2 +- .../{citrix => xenbase}/CitrixReadyCommandWrapper.java | 2 +- .../{citrix => xenbase}/CitrixRebootCommandWrapper.java | 2 +- .../{citrix => xenbase}/CitrixRebootRouterCommandWrapper.java | 2 +- .../wrapper/{citrix => xenbase}/CitrixRequestWrapper.java | 4 ++-- .../{citrix => xenbase}/CitrixResizeVolumeCommandWrapper.java | 2 +- .../CitrixRevertToVMSnapshotCommandWrapper.java | 2 +- .../{citrix => xenbase}/CitrixScaleVmCommandWrapper.java | 2 +- .../CitrixSecurityGroupRulesCommandWrapper.java | 2 +- .../{citrix => xenbase}/CitrixSetupCommandWrapper.java | 2 +- .../{citrix => xenbase}/CitrixStartCommandWrapper.java | 2 +- .../wrapper/{citrix => xenbase}/CitrixStopCommandWrapper.java | 2 +- .../CitrixStorageSubSystemCommandWrapper.java | 2 +- .../{citrix => xenbase}/CitrixUnPlugNicCommandWrapper.java | 2 +- .../CitrixUpdateHostPasswordCommandWrapper.java | 2 +- .../CitrixUpgradeSnapshotCommandWrapper.java | 2 +- .../CitrixWatchConsoleProxyLoadCommandWrapper.java | 2 +- .../wrapper/{ => xenbase}/CitrixRequestWrapperTest.java | 2 +- .../resource/wrapper/{ => xenbase}/XcpServerWrapperTest.java | 2 +- .../wrapper/{ => xenbase}/XenServer56FP1WrapperTest.java | 2 +- .../wrapper/{ => xenbase}/XenServer56WrapperTest.java | 2 +- .../wrapper/{ => xenbase}/XenServer610WrapperTest.java | 2 +- .../wrapper/{ => xenbase}/XenServer620SP1WrapperTest.java | 2 +- .../wrapper/{ => xenbase}/XenServer620WrapperTest.java | 2 +- 69 files changed, 70 insertions(+), 70 deletions(-) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixAttachIsoCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixAttachVolumeCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixCheckConsoleProxyLoadCommandWrapper.java (96%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixCheckHealthCommandWrapper.java (95%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixCheckNetworkCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixCheckOnHostCommandWrapper.java (95%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixCheckSshCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixCheckVirtualMachineCommandWrapper.java (96%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixCleanupNetworkRulesCmdWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixClusterVMMetaDataSyncCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixConsoleProxyLoadCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixCreateCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixCreateStoragePoolCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixCreateVMSnapshotCommandWrapper.java (99%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixDeleteStoragePoolCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixDeleteVMSnapshotCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixDestroyCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixGetHostStatsCommandWrapper.java (96%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixGetStorageStatsCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixGetVmDiskStatsCommandWrapper.java (95%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixGetVmStatsCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixGetVncPortCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixMaintainCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixMigrateCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixModifySshKeysCommandWrapper.java (95%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixModifyStoragePoolCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixNetworkElementCommandWrapper.java (96%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixNetworkRulesSystemVmCommandWrapper.java (96%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixNetworkRulesVmSecondaryIpCommandWrapper.java (96%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixOvsCreateGreTunnelCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixOvsCreateTunnelCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixOvsDeleteFlowCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixOvsDestroyBridgeCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixOvsDestroyTunnelCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixOvsFetchInterfaceCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixOvsSetTagAndFlowCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixOvsSetupBridgeCommandWrapper.java (96%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixOvsVpcPhysicalTopologyConfigCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixOvsVpcRoutingPolicyConfigCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixPerformanceMonitorCommandWrapper.java (96%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixPingTestCommandWrapper.java (96%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixPlugNicCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixPrepareForMigrationCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixPrimaryStorageDownloadCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixPvlanSetupCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixReadyCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixRebootCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixRebootRouterCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixRequestWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixResizeVolumeCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixRevertToVMSnapshotCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixScaleVmCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixSecurityGroupRulesCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixSetupCommandWrapper.java (99%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixStartCommandWrapper.java (99%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixStopCommandWrapper.java (99%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixStorageSubSystemCommandWrapper.java (96%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixUnPlugNicCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixUpdateHostPasswordCommandWrapper.java (95%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixUpgradeSnapshotCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{citrix => xenbase}/CitrixWatchConsoleProxyLoadCommandWrapper.java (96%) rename plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/{ => xenbase}/CitrixRequestWrapperTest.java (99%) rename plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/{ => xenbase}/XcpServerWrapperTest.java (98%) rename plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/{ => xenbase}/XenServer56FP1WrapperTest.java (97%) rename plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/{ => xenbase}/XenServer56WrapperTest.java (99%) rename plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/{ => xenbase}/XenServer610WrapperTest.java (99%) rename plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/{ => xenbase}/XenServer620SP1WrapperTest.java (98%) rename plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/{ => xenbase}/XenServer620WrapperTest.java (96%) diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java index 720fca27433..ef0631e180b 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java @@ -98,7 +98,7 @@ import com.cloud.agent.resource.virtualnetwork.VirtualRoutingResource; import com.cloud.exception.InternalErrorException; import com.cloud.host.Host.Type; import com.cloud.hypervisor.Hypervisor.HypervisorType; -import com.cloud.hypervisor.xenserver.resource.wrapper.citrix.CitrixRequestWrapper; +import com.cloud.hypervisor.xenserver.resource.wrapper.xenbase.CitrixRequestWrapper; import com.cloud.network.Networks; import com.cloud.network.Networks.BroadcastDomainType; import com.cloud.network.Networks.TrafficType; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixAttachIsoCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixAttachIsoCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixAttachIsoCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixAttachIsoCommandWrapper.java index aa84b837ebd..287096fea16 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixAttachIsoCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixAttachIsoCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import java.util.Set; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixAttachVolumeCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixAttachVolumeCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixAttachVolumeCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixAttachVolumeCommandWrapper.java index 9a1afa0bc16..436419e75f0 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixAttachVolumeCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixAttachVolumeCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import java.util.Set; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckConsoleProxyLoadCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckConsoleProxyLoadCommandWrapper.java similarity index 96% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckConsoleProxyLoadCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckConsoleProxyLoadCommandWrapper.java index f48f8785f50..f70cbc5feb9 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckConsoleProxyLoadCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckConsoleProxyLoadCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import com.cloud.agent.api.Answer; import com.cloud.agent.api.Command; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckHealthCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckHealthCommandWrapper.java similarity index 95% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckHealthCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckHealthCommandWrapper.java index 577fbc19a73..214d3454b81 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckHealthCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckHealthCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import com.cloud.agent.api.Answer; import com.cloud.agent.api.CheckHealthAnswer; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckNetworkCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckNetworkCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckNetworkCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckNetworkCommandWrapper.java index 04189b5b5b8..2fce2fe2a41 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckNetworkCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckNetworkCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import java.util.List; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckOnHostCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckOnHostCommandWrapper.java similarity index 95% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckOnHostCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckOnHostCommandWrapper.java index e8a0affbcab..d9372bb0716 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckOnHostCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckOnHostCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import com.cloud.agent.api.Answer; import com.cloud.agent.api.CheckOnHostAnswer; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckSshCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckSshCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckSshCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckSshCommandWrapper.java index 605340f0854..cf34a8fb30c 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckSshCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckSshCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import org.apache.log4j.Logger; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckVirtualMachineCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckVirtualMachineCommandWrapper.java similarity index 96% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckVirtualMachineCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckVirtualMachineCommandWrapper.java index 4fbd15ba3c2..04a560681ec 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckVirtualMachineCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCheckVirtualMachineCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import org.apache.log4j.Logger; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCleanupNetworkRulesCmdWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCleanupNetworkRulesCmdWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCleanupNetworkRulesCmdWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCleanupNetworkRulesCmdWrapper.java index 8be398932d0..32f8cf16dc8 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCleanupNetworkRulesCmdWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCleanupNetworkRulesCmdWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import org.apache.log4j.Logger; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixClusterVMMetaDataSyncCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixClusterVMMetaDataSyncCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixClusterVMMetaDataSyncCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixClusterVMMetaDataSyncCommandWrapper.java index e601bb6ad54..05f6eb67b7a 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixClusterVMMetaDataSyncCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixClusterVMMetaDataSyncCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import java.util.HashMap; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixConsoleProxyLoadCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixConsoleProxyLoadCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixConsoleProxyLoadCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixConsoleProxyLoadCommandWrapper.java index d3f694aae3c..4b863a28fcb 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixConsoleProxyLoadCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixConsoleProxyLoadCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import java.io.BufferedReader; import java.io.IOException; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCreateCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCreateCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCreateCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCreateCommandWrapper.java index 81dabffcd30..38150ce4656 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCreateCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCreateCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import java.util.HashMap; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCreateStoragePoolCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCreateStoragePoolCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCreateStoragePoolCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCreateStoragePoolCommandWrapper.java index c74cb1a67d0..bed417f35e3 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCreateStoragePoolCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCreateStoragePoolCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import org.apache.log4j.Logger; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCreateVMSnapshotCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCreateVMSnapshotCommandWrapper.java similarity index 99% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCreateVMSnapshotCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCreateVMSnapshotCommandWrapper.java index 0456686b452..4550cf8b637 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCreateVMSnapshotCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCreateVMSnapshotCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import java.util.LinkedHashSet; import java.util.List; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixDeleteStoragePoolCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixDeleteStoragePoolCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixDeleteStoragePoolCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixDeleteStoragePoolCommandWrapper.java index 83d518e3195..a9ae680029f 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixDeleteStoragePoolCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixDeleteStoragePoolCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import org.apache.log4j.Logger; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixDeleteVMSnapshotCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixDeleteVMSnapshotCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixDeleteVMSnapshotCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixDeleteVMSnapshotCommandWrapper.java index fb00205d7fd..a341c76b057 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixDeleteVMSnapshotCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixDeleteVMSnapshotCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import java.util.ArrayList; import java.util.List; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixDestroyCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixDestroyCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixDestroyCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixDestroyCommandWrapper.java index 2b7df86789e..c542744c60d 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixDestroyCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixDestroyCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import java.util.Set; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetHostStatsCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetHostStatsCommandWrapper.java similarity index 96% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetHostStatsCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetHostStatsCommandWrapper.java index a50737f37ff..78a06a0c2bf 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetHostStatsCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetHostStatsCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import org.apache.log4j.Logger; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetStorageStatsCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetStorageStatsCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetStorageStatsCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetStorageStatsCommandWrapper.java index 404531a1d17..016cce4b208 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetStorageStatsCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetStorageStatsCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import java.util.Set; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetVmDiskStatsCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVmDiskStatsCommandWrapper.java similarity index 95% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetVmDiskStatsCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVmDiskStatsCommandWrapper.java index 958d48fc7ec..04090ce7436 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetVmDiskStatsCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVmDiskStatsCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import com.cloud.agent.api.Answer; import com.cloud.agent.api.GetVmDiskStatsAnswer; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetVmStatsCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVmStatsCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetVmStatsCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVmStatsCommandWrapper.java index 43aefb8f8c8..700c04a3197 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetVmStatsCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVmStatsCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import java.util.ArrayList; import java.util.HashMap; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetVncPortCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVncPortCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetVncPortCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVncPortCommandWrapper.java index a432088a7d7..6b2bf7ad31c 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetVncPortCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixGetVncPortCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import java.util.Set; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixMaintainCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixMaintainCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixMaintainCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixMaintainCommandWrapper.java index 86f05eec5e0..cb4a1ab5c52 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixMaintainCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixMaintainCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import java.util.Iterator; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixMigrateCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixMigrateCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixMigrateCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixMigrateCommandWrapper.java index a8d2d22c889..07f7cc61188 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixMigrateCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixMigrateCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import java.util.Set; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixModifySshKeysCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixModifySshKeysCommandWrapper.java similarity index 95% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixModifySshKeysCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixModifySshKeysCommandWrapper.java index 012e8b7c0a0..1b95dd7b07b 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixModifySshKeysCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixModifySshKeysCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import com.cloud.agent.api.Answer; import com.cloud.agent.api.ModifySshKeysCommand; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixModifyStoragePoolCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixModifyStoragePoolCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixModifyStoragePoolCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixModifyStoragePoolCommandWrapper.java index 3d51493512e..67d456ff3c2 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixModifyStoragePoolCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixModifyStoragePoolCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import java.util.HashMap; import java.util.Map; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixNetworkElementCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixNetworkElementCommandWrapper.java similarity index 96% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixNetworkElementCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixNetworkElementCommandWrapper.java index c06124cbb84..da2bf1e126e 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixNetworkElementCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixNetworkElementCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import com.cloud.agent.api.Answer; import com.cloud.agent.api.routing.NetworkElementCommand; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixNetworkRulesSystemVmCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixNetworkRulesSystemVmCommandWrapper.java similarity index 96% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixNetworkRulesSystemVmCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixNetworkRulesSystemVmCommandWrapper.java index 462dbfead74..17fcc475657 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixNetworkRulesSystemVmCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixNetworkRulesSystemVmCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import com.cloud.agent.api.Answer; import com.cloud.agent.api.NetworkRulesSystemVmCommand; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixNetworkRulesVmSecondaryIpCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixNetworkRulesVmSecondaryIpCommandWrapper.java similarity index 96% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixNetworkRulesVmSecondaryIpCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixNetworkRulesVmSecondaryIpCommandWrapper.java index 4ebc8210378..19a9fcb4ecd 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixNetworkRulesVmSecondaryIpCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixNetworkRulesVmSecondaryIpCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import com.cloud.agent.api.Answer; import com.cloud.agent.api.NetworkRulesVmSecondaryIpCommand; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsCreateGreTunnelCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsCreateGreTunnelCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsCreateGreTunnelCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsCreateGreTunnelCommandWrapper.java index 31c1a9b64d9..e9b0035da1d 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsCreateGreTunnelCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsCreateGreTunnelCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import org.apache.log4j.Logger; import org.apache.xmlrpc.XmlRpcException; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsCreateTunnelCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsCreateTunnelCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsCreateTunnelCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsCreateTunnelCommandWrapper.java index 2929bb468c3..d03daa22ebb 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsCreateTunnelCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsCreateTunnelCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import org.apache.log4j.Logger; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsDeleteFlowCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsDeleteFlowCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsDeleteFlowCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsDeleteFlowCommandWrapper.java index c2037319d1a..ec7d23c7e73 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsDeleteFlowCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsDeleteFlowCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import org.apache.log4j.Logger; import org.apache.xmlrpc.XmlRpcException; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsDestroyBridgeCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsDestroyBridgeCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsDestroyBridgeCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsDestroyBridgeCommandWrapper.java index 09067ba72f5..22d2a4ebc24 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsDestroyBridgeCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsDestroyBridgeCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import org.apache.log4j.Logger; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsDestroyTunnelCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsDestroyTunnelCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsDestroyTunnelCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsDestroyTunnelCommandWrapper.java index 391f31b870a..dd4c1e4c244 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsDestroyTunnelCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsDestroyTunnelCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import org.apache.log4j.Logger; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsFetchInterfaceCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsFetchInterfaceCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsFetchInterfaceCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsFetchInterfaceCommandWrapper.java index ff42c5de30d..f00b8e2a07d 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsFetchInterfaceCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsFetchInterfaceCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import org.apache.log4j.Logger; import org.apache.xmlrpc.XmlRpcException; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsSetTagAndFlowCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsSetTagAndFlowCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsSetTagAndFlowCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsSetTagAndFlowCommandWrapper.java index 5e47c76a428..858d3f5b512 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsSetTagAndFlowCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsSetTagAndFlowCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import org.apache.log4j.Logger; import org.apache.xmlrpc.XmlRpcException; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsSetupBridgeCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsSetupBridgeCommandWrapper.java similarity index 96% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsSetupBridgeCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsSetupBridgeCommandWrapper.java index 89b0d92edf1..d3145d19cc7 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsSetupBridgeCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsSetupBridgeCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import org.apache.log4j.Logger; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsVpcPhysicalTopologyConfigCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsVpcPhysicalTopologyConfigCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsVpcPhysicalTopologyConfigCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsVpcPhysicalTopologyConfigCommandWrapper.java index 3d2b986a913..b0eba5933a7 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsVpcPhysicalTopologyConfigCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsVpcPhysicalTopologyConfigCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import org.apache.log4j.Logger; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsVpcRoutingPolicyConfigCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsVpcRoutingPolicyConfigCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsVpcRoutingPolicyConfigCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsVpcRoutingPolicyConfigCommandWrapper.java index ea854562d67..49f35c5ae6e 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsVpcRoutingPolicyConfigCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixOvsVpcRoutingPolicyConfigCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import org.apache.log4j.Logger; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPerformanceMonitorCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPerformanceMonitorCommandWrapper.java similarity index 96% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPerformanceMonitorCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPerformanceMonitorCommandWrapper.java index 58abeb5652c..92f319e82ed 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPerformanceMonitorCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPerformanceMonitorCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import com.cloud.agent.api.Answer; import com.cloud.agent.api.PerformanceMonitorAnswer; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPingTestCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPingTestCommandWrapper.java similarity index 96% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPingTestCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPingTestCommandWrapper.java index 9cd2dff3f58..6e19a925d2b 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPingTestCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPingTestCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import com.cloud.agent.api.Answer; import com.cloud.agent.api.PingTestCommand; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPlugNicCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPlugNicCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPlugNicCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPlugNicCommandWrapper.java index a75b4e5bd1b..a9850c7bcff 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPlugNicCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPlugNicCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import java.util.Set; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPrepareForMigrationCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPrepareForMigrationCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPrepareForMigrationCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPrepareForMigrationCommandWrapper.java index eb89c1135ab..ffe875c8e19 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPrepareForMigrationCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPrepareForMigrationCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import org.apache.log4j.Logger; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPrimaryStorageDownloadCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPrimaryStorageDownloadCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPrimaryStorageDownloadCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPrimaryStorageDownloadCommandWrapper.java index 39ea92cf347..07c50aa0e88 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPrimaryStorageDownloadCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPrimaryStorageDownloadCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import java.net.URI; import java.util.HashMap; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPvlanSetupCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPvlanSetupCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPvlanSetupCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPvlanSetupCommandWrapper.java index 198c6fb37c3..d861bae3a92 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPvlanSetupCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPvlanSetupCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import org.apache.log4j.Logger; import org.apache.xmlrpc.XmlRpcException; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixReadyCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixReadyCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixReadyCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixReadyCommandWrapper.java index d2bc4ffef69..4079f92c26e 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixReadyCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixReadyCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import java.util.Set; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixRebootCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRebootCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixRebootCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRebootCommandWrapper.java index 2e408eef214..5e5dad895d2 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixRebootCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRebootCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import java.util.Set; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixRebootRouterCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRebootRouterCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixRebootRouterCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRebootRouterCommandWrapper.java index 11a382ddb9a..966df43ed93 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixRebootRouterCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRebootRouterCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import com.cloud.agent.api.Answer; import com.cloud.agent.api.RebootCommand; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixRequestWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRequestWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixRequestWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRequestWrapper.java index a26ea67fce0..1e8bc9bf38a 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixRequestWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRequestWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import java.util.Hashtable; import java.util.Set; @@ -44,7 +44,7 @@ public class CitrixRequestWrapper extends RequestWrapper { instance = new CitrixRequestWrapper(); } - Reflections baseWrappers = new Reflections("com.cloud.hypervisor.xenserver.resource.wrapper.citrix"); + Reflections baseWrappers = new Reflections("com.cloud.hypervisor.xenserver.resource.wrapper.xenbase"); @SuppressWarnings("rawtypes") Set> baseSet = baseWrappers.getSubTypesOf(CommandWrapper.class); diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixResizeVolumeCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixResizeVolumeCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixResizeVolumeCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixResizeVolumeCommandWrapper.java index e7a54261eee..02069397255 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixResizeVolumeCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixResizeVolumeCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import org.apache.log4j.Logger; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixRevertToVMSnapshotCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRevertToVMSnapshotCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixRevertToVMSnapshotCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRevertToVMSnapshotCommandWrapper.java index 4522d85c57b..8da038e991a 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixRevertToVMSnapshotCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRevertToVMSnapshotCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import java.util.HashMap; import java.util.List; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixScaleVmCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixScaleVmCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixScaleVmCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixScaleVmCommandWrapper.java index 989857034c0..8692357ffc1 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixScaleVmCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixScaleVmCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import java.util.Iterator; import java.util.Set; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixSecurityGroupRulesCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixSecurityGroupRulesCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixSecurityGroupRulesCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixSecurityGroupRulesCommandWrapper.java index ce39ecfc818..0f8e6b5ba89 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixSecurityGroupRulesCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixSecurityGroupRulesCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import org.apache.log4j.Logger; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixSetupCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixSetupCommandWrapper.java similarity index 99% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixSetupCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixSetupCommandWrapper.java index 63416ed03f5..76f0e2a767a 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixSetupCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixSetupCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import java.util.Map; import java.util.Set; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixStartCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStartCommandWrapper.java similarity index 99% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixStartCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStartCommandWrapper.java index 62c3f562184..c0e4d0a6410 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixStartCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStartCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import java.util.HashMap; import java.util.List; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixStopCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStopCommandWrapper.java similarity index 99% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixStopCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStopCommandWrapper.java index 41aad8306f7..af94d83858a 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixStopCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStopCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import java.util.ArrayList; import java.util.HashMap; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixStorageSubSystemCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStorageSubSystemCommandWrapper.java similarity index 96% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixStorageSubSystemCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStorageSubSystemCommandWrapper.java index 21700121dfc..09f74ae17ef 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixStorageSubSystemCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStorageSubSystemCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import org.apache.cloudstack.storage.command.StorageSubSystemCommand; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixUnPlugNicCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixUnPlugNicCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixUnPlugNicCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixUnPlugNicCommandWrapper.java index 5fbd7705088..2d6000b342a 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixUnPlugNicCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixUnPlugNicCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import java.util.Set; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixUpdateHostPasswordCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixUpdateHostPasswordCommandWrapper.java similarity index 95% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixUpdateHostPasswordCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixUpdateHostPasswordCommandWrapper.java index 6c11a187398..d95ba7a57ad 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixUpdateHostPasswordCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixUpdateHostPasswordCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import com.cloud.agent.api.Answer; import com.cloud.agent.api.UpdateHostPasswordCommand; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixUpgradeSnapshotCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixUpgradeSnapshotCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixUpgradeSnapshotCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixUpgradeSnapshotCommandWrapper.java index a15893870b1..370cfcf1500 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixUpgradeSnapshotCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixUpgradeSnapshotCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import java.net.URI; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixWatchConsoleProxyLoadCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixWatchConsoleProxyLoadCommandWrapper.java similarity index 96% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixWatchConsoleProxyLoadCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixWatchConsoleProxyLoadCommandWrapper.java index eb2790ddb2a..32a76d68c7c 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixWatchConsoleProxyLoadCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixWatchConsoleProxyLoadCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import com.cloud.agent.api.Answer; import com.cloud.agent.api.Command; diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixRequestWrapperTest.java b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRequestWrapperTest.java similarity index 99% rename from plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixRequestWrapperTest.java rename to plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRequestWrapperTest.java index b40e42bd20b..1071485a2d8 100644 --- a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixRequestWrapperTest.java +++ b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRequestWrapperTest.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XcpServerWrapperTest.java b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XcpServerWrapperTest.java similarity index 98% rename from plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XcpServerWrapperTest.java rename to plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XcpServerWrapperTest.java index 304d4cd4960..6b9f9a9ba39 100644 --- a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XcpServerWrapperTest.java +++ b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XcpServerWrapperTest.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer56FP1WrapperTest.java b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer56FP1WrapperTest.java similarity index 97% rename from plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer56FP1WrapperTest.java rename to plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer56FP1WrapperTest.java index 8333f3c9fee..09012755e0c 100644 --- a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer56FP1WrapperTest.java +++ b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer56FP1WrapperTest.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer56WrapperTest.java b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer56WrapperTest.java similarity index 99% rename from plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer56WrapperTest.java rename to plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer56WrapperTest.java index 57f4d825543..d69e265e386 100644 --- a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer56WrapperTest.java +++ b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer56WrapperTest.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer610WrapperTest.java b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer610WrapperTest.java similarity index 99% rename from plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer610WrapperTest.java rename to plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer610WrapperTest.java index bf8099b154d..f308ea39a3f 100644 --- a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer610WrapperTest.java +++ b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer610WrapperTest.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer620SP1WrapperTest.java b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer620SP1WrapperTest.java similarity index 98% rename from plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer620SP1WrapperTest.java rename to plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer620SP1WrapperTest.java index 48d97177066..7d815e8f643 100644 --- a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer620SP1WrapperTest.java +++ b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer620SP1WrapperTest.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer620WrapperTest.java b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer620WrapperTest.java similarity index 96% rename from plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer620WrapperTest.java rename to plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer620WrapperTest.java index 60435581ba1..6153f650916 100644 --- a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer620WrapperTest.java +++ b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer620WrapperTest.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; +package com.cloud.hypervisor.xenserver.resource.wrapper.xenbase; import static org.junit.Assert.assertTrue;