From cc386b791b725252bd6cbd1ec28a5cb14594f5b6 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Thu, 6 Dec 2012 10:32:58 -0800 Subject: [PATCH] api_refactor: move storagepool api to admin pkg Signed-off-by: Rohit Yadav --- api/src/com/cloud/server/ManagementService.java | 2 +- api/src/com/cloud/storage/StorageService.java | 8 ++++---- .../command}/CancelPrimaryStorageMaintenanceCmd.java | 2 +- .../storagepool/command}/CreateStoragePoolCmd.java | 2 +- .../admin/storagepool/command}/DeletePoolCmd.java | 2 +- .../storagepool/command}/ListStoragePoolsCmd.java | 2 +- .../PreparePrimaryStorageForMaintenanceCmd.java | 2 +- .../storagepool/command}/UpdateStoragePoolCmd.java | 2 +- client/tomcatconf/commands.properties.in | 12 ++++++------ .../src/com/cloud/server/ManagementServerImpl.java | 2 +- server/src/com/cloud/storage/StorageManagerImpl.java | 8 ++++---- 11 files changed, 22 insertions(+), 22 deletions(-) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/storagepool/command}/CancelPrimaryStorageMaintenanceCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/storagepool/command}/CreateStoragePoolCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/storagepool/command}/DeletePoolCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/storagepool/command}/ListStoragePoolsCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/storagepool/command}/PreparePrimaryStorageForMaintenanceCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/storagepool/command}/UpdateStoragePoolCmd.java (98%) diff --git a/api/src/com/cloud/server/ManagementService.java b/api/src/com/cloud/server/ManagementService.java index 3bf39f58480..00f5abd4b36 100755 --- a/api/src/com/cloud/server/ManagementService.java +++ b/api/src/com/cloud/server/ManagementService.java @@ -49,7 +49,7 @@ import org.apache.cloudstack.api.user.guest.command.ListGuestOsCategoriesCmd; import org.apache.cloudstack.api.user.iso.command.ListIsosCmd; import com.cloud.api.commands.ListPodsByCmd; import org.apache.cloudstack.api.user.ssh.command.ListSSHKeyPairsCmd; -import com.cloud.api.commands.ListStoragePoolsCmd; +import org.apache.cloudstack.api.admin.storagepool.command.ListStoragePoolsCmd; import org.apache.cloudstack.api.admin.systemvm.command.ListSystemVMsCmd; import org.apache.cloudstack.api.user.vmgroup.command.ListVMGroupsCmd; import com.cloud.api.commands.ListVlanIpRangesCmd; diff --git a/api/src/com/cloud/storage/StorageService.java b/api/src/com/cloud/storage/StorageService.java index 9197bf24b59..bca617def0f 100644 --- a/api/src/com/cloud/storage/StorageService.java +++ b/api/src/com/cloud/storage/StorageService.java @@ -19,12 +19,12 @@ package com.cloud.storage; import java.net.UnknownHostException; import java.util.List; -import com.cloud.api.commands.CancelPrimaryStorageMaintenanceCmd; -import com.cloud.api.commands.CreateStoragePoolCmd; +import org.apache.cloudstack.api.admin.storagepool.command.CancelPrimaryStorageMaintenanceCmd; +import org.apache.cloudstack.api.admin.storagepool.command.CreateStoragePoolCmd; +import org.apache.cloudstack.api.admin.storagepool.command.UpdateStoragePoolCmd; import org.apache.cloudstack.api.user.volume.command.CreateVolumeCmd; -import com.cloud.api.commands.DeletePoolCmd; +import org.apache.cloudstack.api.admin.storagepool.command.DeletePoolCmd; import org.apache.cloudstack.api.user.volume.command.ListVolumesCmd; -import com.cloud.api.commands.UpdateStoragePoolCmd; import org.apache.cloudstack.api.user.volume.command.UploadVolumeCmd; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; diff --git a/api/src/com/cloud/api/commands/CancelPrimaryStorageMaintenanceCmd.java b/api/src/org/apache/cloudstack/api/admin/storagepool/command/CancelPrimaryStorageMaintenanceCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/CancelPrimaryStorageMaintenanceCmd.java rename to api/src/org/apache/cloudstack/api/admin/storagepool/command/CancelPrimaryStorageMaintenanceCmd.java index 400aa9c10e5..d87259b301c 100644 --- a/api/src/com/cloud/api/commands/CancelPrimaryStorageMaintenanceCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/storagepool/command/CancelPrimaryStorageMaintenanceCmd.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.admin.storagepool.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/CreateStoragePoolCmd.java b/api/src/org/apache/cloudstack/api/admin/storagepool/command/CreateStoragePoolCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/CreateStoragePoolCmd.java rename to api/src/org/apache/cloudstack/api/admin/storagepool/command/CreateStoragePoolCmd.java index 36094620896..fd3ca397766 100644 --- a/api/src/com/cloud/api/commands/CreateStoragePoolCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/storagepool/command/CreateStoragePoolCmd.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.admin.storagepool.command; import java.net.UnknownHostException; import java.util.Map; diff --git a/api/src/com/cloud/api/commands/DeletePoolCmd.java b/api/src/org/apache/cloudstack/api/admin/storagepool/command/DeletePoolCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/DeletePoolCmd.java rename to api/src/org/apache/cloudstack/api/admin/storagepool/command/DeletePoolCmd.java index b257bbdc577..473d35e4070 100644 --- a/api/src/com/cloud/api/commands/DeletePoolCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/storagepool/command/DeletePoolCmd.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.admin.storagepool.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/ListStoragePoolsCmd.java b/api/src/org/apache/cloudstack/api/admin/storagepool/command/ListStoragePoolsCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/ListStoragePoolsCmd.java rename to api/src/org/apache/cloudstack/api/admin/storagepool/command/ListStoragePoolsCmd.java index 3787f9289b9..b9879624440 100644 --- a/api/src/com/cloud/api/commands/ListStoragePoolsCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/storagepool/command/ListStoragePoolsCmd.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.admin.storagepool.command; import java.util.ArrayList; import java.util.List; diff --git a/api/src/com/cloud/api/commands/PreparePrimaryStorageForMaintenanceCmd.java b/api/src/org/apache/cloudstack/api/admin/storagepool/command/PreparePrimaryStorageForMaintenanceCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/PreparePrimaryStorageForMaintenanceCmd.java rename to api/src/org/apache/cloudstack/api/admin/storagepool/command/PreparePrimaryStorageForMaintenanceCmd.java index 4d7342cc73e..3f7f80d8df0 100644 --- a/api/src/com/cloud/api/commands/PreparePrimaryStorageForMaintenanceCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/storagepool/command/PreparePrimaryStorageForMaintenanceCmd.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.admin.storagepool.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/UpdateStoragePoolCmd.java b/api/src/org/apache/cloudstack/api/admin/storagepool/command/UpdateStoragePoolCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/UpdateStoragePoolCmd.java rename to api/src/org/apache/cloudstack/api/admin/storagepool/command/UpdateStoragePoolCmd.java index 605c668be59..c027224d3bf 100644 --- a/api/src/com/cloud/api/commands/UpdateStoragePoolCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/storagepool/command/UpdateStoragePoolCmd.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.admin.storagepool.command; import java.util.List; diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index e00c68d1a0d..2964ae161d0 100755 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -264,13 +264,13 @@ queryAsyncJobResult=org.apache.cloudstack.api.user.job.command.QueryAsyncJobResu listAsyncJobs=org.apache.cloudstack.api.user.job.command.ListAsyncJobsCmd;15 #### storage pools commands -listStoragePools=com.cloud.api.commands.ListStoragePoolsCmd;3 -createStoragePool=com.cloud.api.commands.CreateStoragePoolCmd;1 -updateStoragePool=com.cloud.api.commands.UpdateStoragePoolCmd;1 -deleteStoragePool=com.cloud.api.commands.DeletePoolCmd;1 +listStoragePools=org.apache.cloudstack.api.admin.storagepool.command.ListStoragePoolsCmd;3 +createStoragePool=org.apache.cloudstack.api.admin.storagepool.command.CreateStoragePoolCmd;1 +updateStoragePool=org.apache.cloudstack.api.admin.storagepool.command.UpdateStoragePoolCmd;1 +deleteStoragePool=org.apache.cloudstack.api.admin.storagepool.command.DeletePoolCmd;1 listClusters=com.cloud.api.commands.ListClustersCmd;3 -enableStorageMaintenance=com.cloud.api.commands.PreparePrimaryStorageForMaintenanceCmd;1 -cancelStorageMaintenance=com.cloud.api.commands.CancelPrimaryStorageMaintenanceCmd;1 +enableStorageMaintenance=org.apache.cloudstack.api.admin.storagepool.command.PreparePrimaryStorageForMaintenanceCmd;1 +cancelStorageMaintenance=org.apache.cloudstack.api.admin.storagepool.command.CancelPrimaryStorageMaintenanceCmd;1 #### security group commands createSecurityGroup=org.apache.cloudstack.api.user.securitygroup.command.CreateSecurityGroupCmd;15 diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index fd94733f8ca..dd91d606524 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -84,7 +84,7 @@ import org.apache.cloudstack.api.admin.host.command.ListHostsCmd; import com.cloud.api.commands.ListPodsByCmd; import org.apache.cloudstack.api.user.address.command.ListPublicIpAddressesCmd; import org.apache.cloudstack.api.user.ssh.command.ListSSHKeyPairsCmd; -import com.cloud.api.commands.ListStoragePoolsCmd; +import org.apache.cloudstack.api.admin.storagepool.command.ListStoragePoolsCmd; import org.apache.cloudstack.api.admin.systemvm.command.ListSystemVMsCmd; import com.cloud.api.commands.ListVlanIpRangesCmd; import org.apache.cloudstack.api.user.datacenter.command.ListZonesByCmd; diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index 882e798fe9d..330d41eee9a 100755 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/com/cloud/storage/StorageManagerImpl.java @@ -72,11 +72,11 @@ import com.cloud.agent.api.to.VolumeTO; import com.cloud.agent.manager.Commands; 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.DeletePoolCmd; +import org.apache.cloudstack.api.admin.storagepool.command.CancelPrimaryStorageMaintenanceCmd; +import org.apache.cloudstack.api.admin.storagepool.command.CreateStoragePoolCmd; +import org.apache.cloudstack.api.admin.storagepool.command.DeletePoolCmd; import org.apache.cloudstack.api.user.volume.command.ListVolumesCmd; -import com.cloud.api.commands.UpdateStoragePoolCmd; +import org.apache.cloudstack.api.admin.storagepool.command.UpdateStoragePoolCmd; import org.apache.cloudstack.api.user.volume.command.UploadVolumeCmd; import com.cloud.async.AsyncJobManager; import com.cloud.capacity.Capacity;