diff --git a/api/src/com/cloud/server/ManagementService.java b/api/src/com/cloud/server/ManagementService.java index 52ba29c994e..e2bc4844d4e 100755 --- a/api/src/com/cloud/server/ManagementService.java +++ b/api/src/com/cloud/server/ManagementService.java @@ -32,7 +32,7 @@ import org.apache.cloudstack.api.user.offering.command.ListServiceOfferingsCmd; import org.apache.cloudstack.api.user.ssh.command.CreateSSHKeyPairCmd; import org.apache.cloudstack.api.user.ssh.command.DeleteSSHKeyPairCmd; import com.cloud.api.commands.DestroySystemVmCmd; -import com.cloud.api.commands.ExtractVolumeCmd; +import org.apache.cloudstack.api.user.volume.command.ExtractVolumeCmd; import org.apache.cloudstack.api.user.template.command.ListTemplatesCmd; import org.apache.cloudstack.api.user.template.command.UpdateTemplateCmd; import org.apache.cloudstack.api.user.vm.command.GetVMPasswordCmd; diff --git a/api/src/com/cloud/storage/StorageService.java b/api/src/com/cloud/storage/StorageService.java index b05bc15441a..9197bf24b59 100644 --- a/api/src/com/cloud/storage/StorageService.java +++ b/api/src/com/cloud/storage/StorageService.java @@ -21,11 +21,11 @@ import java.util.List; import com.cloud.api.commands.CancelPrimaryStorageMaintenanceCmd; import com.cloud.api.commands.CreateStoragePoolCmd; -import com.cloud.api.commands.CreateVolumeCmd; +import org.apache.cloudstack.api.user.volume.command.CreateVolumeCmd; import com.cloud.api.commands.DeletePoolCmd; -import com.cloud.api.commands.ListVolumesCmd; +import org.apache.cloudstack.api.user.volume.command.ListVolumesCmd; import com.cloud.api.commands.UpdateStoragePoolCmd; -import com.cloud.api.commands.UploadVolumeCmd; +import org.apache.cloudstack.api.user.volume.command.UploadVolumeCmd; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.PermissionDeniedException; diff --git a/api/src/com/cloud/vm/UserVmService.java b/api/src/com/cloud/vm/UserVmService.java index 8c897d3f241..04fa6007f09 100755 --- a/api/src/com/cloud/vm/UserVmService.java +++ b/api/src/com/cloud/vm/UserVmService.java @@ -22,13 +22,13 @@ import java.util.Map; import javax.naming.InsufficientResourcesException; import org.apache.cloudstack.api.admin.vm.command.AssignVMCmd; -import com.cloud.api.commands.AttachVolumeCmd; +import org.apache.cloudstack.api.user.volume.command.AttachVolumeCmd; import org.apache.cloudstack.api.user.template.command.CreateTemplateCmd; import org.apache.cloudstack.api.user.vmgroup.command.CreateVMGroupCmd; import org.apache.cloudstack.api.user.vmgroup.command.DeleteVMGroupCmd; import org.apache.cloudstack.api.user.vm.command.DeployVMCmd; import org.apache.cloudstack.api.user.vm.command.DestroyVMCmd; -import com.cloud.api.commands.DetachVolumeCmd; +import org.apache.cloudstack.api.user.volume.command.DetachVolumeCmd; import org.apache.cloudstack.api.user.vm.command.ListVMsCmd; import org.apache.cloudstack.api.user.vm.command.RebootVMCmd; import org.apache.cloudstack.api.admin.vm.command.RecoverVMCmd; diff --git a/api/src/com/cloud/api/commands/AttachVolumeCmd.java b/api/src/org/apache/cloudstack/api/user/volume/command/AttachVolumeCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/AttachVolumeCmd.java rename to api/src/org/apache/cloudstack/api/user/volume/command/AttachVolumeCmd.java index 752935b53df..5dcd9168fbe 100755 --- a/api/src/com/cloud/api/commands/AttachVolumeCmd.java +++ b/api/src/org/apache/cloudstack/api/user/volume/command/AttachVolumeCmd.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.api.commands; +package org.apache.cloudstack.api.user.volume.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/CreateVolumeCmd.java b/api/src/org/apache/cloudstack/api/user/volume/command/CreateVolumeCmd.java similarity index 99% rename from api/src/com/cloud/api/commands/CreateVolumeCmd.java rename to api/src/org/apache/cloudstack/api/user/volume/command/CreateVolumeCmd.java index 86e10ddc3e0..acc4598c4cd 100644 --- a/api/src/com/cloud/api/commands/CreateVolumeCmd.java +++ b/api/src/org/apache/cloudstack/api/user/volume/command/CreateVolumeCmd.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.api.commands; +package org.apache.cloudstack.api.user.volume.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/DeleteVolumeCmd.java b/api/src/org/apache/cloudstack/api/user/volume/command/DeleteVolumeCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/DeleteVolumeCmd.java rename to api/src/org/apache/cloudstack/api/user/volume/command/DeleteVolumeCmd.java index 7692cae1e2d..d6e44c39d98 100644 --- a/api/src/com/cloud/api/commands/DeleteVolumeCmd.java +++ b/api/src/org/apache/cloudstack/api/user/volume/command/DeleteVolumeCmd.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.api.commands; +package org.apache.cloudstack.api.user.volume.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/DetachVolumeCmd.java b/api/src/org/apache/cloudstack/api/user/volume/command/DetachVolumeCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/DetachVolumeCmd.java rename to api/src/org/apache/cloudstack/api/user/volume/command/DetachVolumeCmd.java index 377bc0e7f97..03ffe14fdb5 100755 --- a/api/src/com/cloud/api/commands/DetachVolumeCmd.java +++ b/api/src/org/apache/cloudstack/api/user/volume/command/DetachVolumeCmd.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.api.commands; +package org.apache.cloudstack.api.user.volume.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/ExtractVolumeCmd.java b/api/src/org/apache/cloudstack/api/user/volume/command/ExtractVolumeCmd.java similarity index 99% rename from api/src/com/cloud/api/commands/ExtractVolumeCmd.java rename to api/src/org/apache/cloudstack/api/user/volume/command/ExtractVolumeCmd.java index 4de217508c3..469b4861391 100755 --- a/api/src/com/cloud/api/commands/ExtractVolumeCmd.java +++ b/api/src/org/apache/cloudstack/api/user/volume/command/ExtractVolumeCmd.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.api.commands; +package org.apache.cloudstack.api.user.volume.command; import java.net.URISyntaxException; diff --git a/api/src/com/cloud/api/commands/ListVolumesCmd.java b/api/src/org/apache/cloudstack/api/user/volume/command/ListVolumesCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/ListVolumesCmd.java rename to api/src/org/apache/cloudstack/api/user/volume/command/ListVolumesCmd.java index fc1f8a10949..1d6aac8c297 100755 --- a/api/src/com/cloud/api/commands/ListVolumesCmd.java +++ b/api/src/org/apache/cloudstack/api/user/volume/command/ListVolumesCmd.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.api.commands; +package org.apache.cloudstack.api.user.volume.command; import java.util.ArrayList; import java.util.List; diff --git a/api/src/com/cloud/api/commands/MigrateVolumeCmd.java b/api/src/org/apache/cloudstack/api/user/volume/command/MigrateVolumeCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/MigrateVolumeCmd.java rename to api/src/org/apache/cloudstack/api/user/volume/command/MigrateVolumeCmd.java index 7ad8448c997..947e89a09e7 100644 --- a/api/src/com/cloud/api/commands/MigrateVolumeCmd.java +++ b/api/src/org/apache/cloudstack/api/user/volume/command/MigrateVolumeCmd.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.api.commands; +package org.apache.cloudstack.api.user.volume.command; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseAsyncCmd; diff --git a/api/src/com/cloud/api/commands/UploadVolumeCmd.java b/api/src/org/apache/cloudstack/api/user/volume/command/UploadVolumeCmd.java similarity index 99% rename from api/src/com/cloud/api/commands/UploadVolumeCmd.java rename to api/src/org/apache/cloudstack/api/user/volume/command/UploadVolumeCmd.java index 600dfa06b44..164a4bb7f85 100755 --- a/api/src/com/cloud/api/commands/UploadVolumeCmd.java +++ b/api/src/org/apache/cloudstack/api/user/volume/command/UploadVolumeCmd.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.api.commands; +package org.apache.cloudstack.api.user.volume.command; import org.apache.log4j.Logger; diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index 9dbad2bf3ae..14c79db7e16 100755 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -242,14 +242,14 @@ addSecondaryStorage=com.cloud.api.commands.AddSecondaryStorageCmd;1 updateHostPassword=com.cloud.api.commands.UpdateHostPasswordCmd;1 #### volume commands -attachVolume=com.cloud.api.commands.AttachVolumeCmd;15 -uploadVolume=com.cloud.api.commands.UploadVolumeCmd;15 -detachVolume=com.cloud.api.commands.DetachVolumeCmd;15 -createVolume=com.cloud.api.commands.CreateVolumeCmd;15 -deleteVolume=com.cloud.api.commands.DeleteVolumeCmd;15 -listVolumes=com.cloud.api.commands.ListVolumesCmd;15 -extractVolume=com.cloud.api.commands.ExtractVolumeCmd;15 -migrateVolume=com.cloud.api.commands.MigrateVolumeCmd;15 +attachVolume=org.apache.cloudstack.api.user.volume.command.AttachVolumeCmd;15 +uploadVolume=org.apache.cloudstack.api.user.volume.command.UploadVolumeCmd;15 +detachVolume=org.apache.cloudstack.api.user.volume.command.DetachVolumeCmd;15 +createVolume=org.apache.cloudstack.api.user.volume.command.CreateVolumeCmd;15 +deleteVolume=org.apache.cloudstack.api.user.volume.command.DeleteVolumeCmd;15 +listVolumes=org.apache.cloudstack.api.user.volume.command.ListVolumesCmd;15 +extractVolume=org.apache.cloudstack.api.user.volume.command.ExtractVolumeCmd;15 +migrateVolume=org.apache.cloudstack.api.user.volume.command.MigrateVolumeCmd;15 #### registration command: FIXME -- this really should be something in management server that #### generates a new key for the user and they just have to diff --git a/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java b/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java index e0ce531d7b5..b5abd82af7b 100755 --- a/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java +++ b/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java @@ -26,6 +26,8 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.cloudstack.api.user.template.command.CreateTemplateCmd; +import org.apache.cloudstack.api.user.volume.command.AttachVolumeCmd; +import org.apache.cloudstack.api.user.volume.command.DetachVolumeCmd; import org.apache.log4j.Logger; import com.cloud.agent.api.Answer; @@ -33,9 +35,7 @@ import com.cloud.agent.api.StopAnswer; import com.cloud.agent.api.baremetal.IpmISetBootDevCommand; import com.cloud.agent.api.baremetal.IpmiBootorResetCommand; import com.cloud.agent.manager.Commands; -import com.cloud.api.commands.AttachVolumeCmd; import org.apache.cloudstack.api.user.vm.command.DeployVMCmd; -import com.cloud.api.commands.DetachVolumeCmd; import org.apache.cloudstack.api.user.vm.command.StartVMCmd; import org.apache.cloudstack.api.user.vm.command.UpgradeVMCmd; import com.cloud.baremetal.PxeServerManager.PxeServerType; diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 6b3deceb674..f6e9207940f 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -72,7 +72,7 @@ import org.apache.cloudstack.api.ApiConstants; import com.cloud.api.ApiDBUtils; import org.apache.cloudstack.api.user.ssh.command.CreateSSHKeyPairCmd; import com.cloud.api.commands.DestroySystemVmCmd; -import com.cloud.api.commands.ExtractVolumeCmd; +import org.apache.cloudstack.api.user.volume.command.ExtractVolumeCmd; import org.apache.cloudstack.api.user.vm.command.GetVMPasswordCmd; import com.cloud.api.commands.ListAlertsCmd; import com.cloud.api.commands.ListCapacityCmd; diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index e252633f8e3..882e798fe9d 100755 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/com/cloud/storage/StorageManagerImpl.java @@ -44,6 +44,7 @@ import java.util.concurrent.TimeUnit; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.apache.cloudstack.api.user.volume.command.CreateVolumeCmd; import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; @@ -73,11 +74,10 @@ import com.cloud.alert.AlertManager; import com.cloud.api.ApiDBUtils; import com.cloud.api.commands.CancelPrimaryStorageMaintenanceCmd; import com.cloud.api.commands.CreateStoragePoolCmd; -import com.cloud.api.commands.CreateVolumeCmd; import com.cloud.api.commands.DeletePoolCmd; -import com.cloud.api.commands.ListVolumesCmd; +import org.apache.cloudstack.api.user.volume.command.ListVolumesCmd; import com.cloud.api.commands.UpdateStoragePoolCmd; -import com.cloud.api.commands.UploadVolumeCmd; +import org.apache.cloudstack.api.user.volume.command.UploadVolumeCmd; import com.cloud.async.AsyncJobManager; import com.cloud.capacity.Capacity; import com.cloud.capacity.CapacityManager; diff --git a/server/src/com/cloud/storage/upload/UploadListener.java b/server/src/com/cloud/storage/upload/UploadListener.java index aab798b49e9..35bf732c2b1 100755 --- a/server/src/com/cloud/storage/upload/UploadListener.java +++ b/server/src/com/cloud/storage/upload/UploadListener.java @@ -25,6 +25,7 @@ import java.util.Timer; import java.util.TimerTask; import org.apache.cloudstack.api.user.iso.command.ExtractIsoCmd; +import org.apache.cloudstack.api.user.volume.command.ExtractVolumeCmd; import org.apache.log4j.Level; import org.apache.log4j.Logger; @@ -40,7 +41,6 @@ import com.cloud.agent.api.storage.UploadCommand; import com.cloud.agent.api.storage.UploadProgressCommand; import com.cloud.agent.api.storage.UploadProgressCommand.RequestType; import org.apache.cloudstack.api.user.template.command.ExtractTemplateCmd; -import com.cloud.api.commands.ExtractVolumeCmd; import com.cloud.api.response.ExtractResponse; import com.cloud.async.AsyncJobManager; import com.cloud.async.AsyncJobResult; diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index c8c6b516d03..eacf7f4ce51 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -33,6 +33,8 @@ import javax.naming.ConfigurationException; import org.apache.cloudstack.api.user.template.command.CreateTemplateCmd; import org.apache.cloudstack.api.user.vmgroup.command.DeleteVMGroupCmd; +import org.apache.cloudstack.api.user.volume.command.AttachVolumeCmd; +import org.apache.cloudstack.api.user.volume.command.DetachVolumeCmd; import org.apache.commons.codec.binary.Base64; import org.apache.log4j.Logger; @@ -61,11 +63,9 @@ import com.cloud.alert.AlertManager; import com.cloud.api.ApiDBUtils; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.admin.vm.command.AssignVMCmd; -import com.cloud.api.commands.AttachVolumeCmd; import org.apache.cloudstack.api.user.vmgroup.command.CreateVMGroupCmd; import org.apache.cloudstack.api.user.vm.command.DeployVMCmd; import org.apache.cloudstack.api.user.vm.command.DestroyVMCmd; -import com.cloud.api.commands.DetachVolumeCmd; import org.apache.cloudstack.api.user.vm.command.ListVMsCmd; import org.apache.cloudstack.api.user.vm.command.RebootVMCmd; import org.apache.cloudstack.api.admin.vm.command.RecoverVMCmd; diff --git a/server/test/com/cloud/vm/MockUserVmManagerImpl.java b/server/test/com/cloud/vm/MockUserVmManagerImpl.java index 4573948bc7f..71e38715158 100644 --- a/server/test/com/cloud/vm/MockUserVmManagerImpl.java +++ b/server/test/com/cloud/vm/MockUserVmManagerImpl.java @@ -29,13 +29,13 @@ import com.cloud.agent.api.to.NicTO; import com.cloud.agent.api.to.VirtualMachineTO; import com.cloud.agent.manager.Commands; import org.apache.cloudstack.api.admin.vm.command.AssignVMCmd; -import com.cloud.api.commands.AttachVolumeCmd; +import org.apache.cloudstack.api.user.volume.command.AttachVolumeCmd; import org.apache.cloudstack.api.user.template.command.CreateTemplateCmd; import org.apache.cloudstack.api.user.vmgroup.command.CreateVMGroupCmd; import org.apache.cloudstack.api.user.vmgroup.command.DeleteVMGroupCmd; import org.apache.cloudstack.api.user.vm.command.DeployVMCmd; import org.apache.cloudstack.api.user.vm.command.DestroyVMCmd; -import com.cloud.api.commands.DetachVolumeCmd; +import org.apache.cloudstack.api.user.volume.command.DetachVolumeCmd; import org.apache.cloudstack.api.user.vm.command.ListVMsCmd; import org.apache.cloudstack.api.user.vm.command.RebootVMCmd; import org.apache.cloudstack.api.admin.vm.command.RecoverVMCmd;