From 1f1ac79a6c91c562ffcfff1279a5cdbf4b171b4c Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Thu, 6 Dec 2012 10:53:42 -0800 Subject: [PATCH] api_refactor: move disk and service offering to admin pkg Signed-off-by: Rohit Yadav --- .../cloud/configuration/ConfigurationService.java | 11 +++++------ .../offering/command}/CreateDiskOfferingCmd.java | 2 +- .../offering/command}/CreateServiceOfferingCmd.java | 2 +- .../offering/command}/DeleteDiskOfferingCmd.java | 2 +- .../offering/command}/DeleteServiceOfferingCmd.java | 2 +- .../offering/command}/UpdateDiskOfferingCmd.java | 2 +- .../offering/command}/UpdateServiceOfferingCmd.java | 2 +- client/tomcatconf/commands.properties.in | 12 ++++++------ .../configuration/ConfigurationManagerImpl.java | 12 ++++++------ .../com/cloud/vpc/MockConfigurationManagerImpl.java | 12 ++++++------ 10 files changed, 29 insertions(+), 30 deletions(-) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/offering/command}/CreateDiskOfferingCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/offering/command}/CreateServiceOfferingCmd.java (99%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/offering/command}/DeleteDiskOfferingCmd.java (97%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/offering/command}/DeleteServiceOfferingCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/offering/command}/UpdateDiskOfferingCmd.java (98%) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/admin/offering/command}/UpdateServiceOfferingCmd.java (98%) diff --git a/api/src/com/cloud/configuration/ConfigurationService.java b/api/src/com/cloud/configuration/ConfigurationService.java index be509811c8b..1218146f583 100644 --- a/api/src/com/cloud/configuration/ConfigurationService.java +++ b/api/src/com/cloud/configuration/ConfigurationService.java @@ -20,25 +20,24 @@ import java.util.List; import javax.naming.NamingException; -import com.cloud.api.commands.CreateDiskOfferingCmd; +import org.apache.cloudstack.api.admin.offering.command.*; import org.apache.cloudstack.api.admin.network.command.CreateNetworkOfferingCmd; -import com.cloud.api.commands.CreateServiceOfferingCmd; +import org.apache.cloudstack.api.admin.offering.command.CreateServiceOfferingCmd; import com.cloud.api.commands.CreateVlanIpRangeCmd; +import org.apache.cloudstack.api.admin.offering.command.CreateDiskOfferingCmd; import org.apache.cloudstack.api.admin.zone.command.CreateZoneCmd; -import com.cloud.api.commands.DeleteDiskOfferingCmd; +import org.apache.cloudstack.api.admin.offering.command.DeleteDiskOfferingCmd; import org.apache.cloudstack.api.admin.network.command.DeleteNetworkOfferingCmd; import com.cloud.api.commands.DeletePodCmd; -import com.cloud.api.commands.DeleteServiceOfferingCmd; import com.cloud.api.commands.DeleteVlanIpRangeCmd; import org.apache.cloudstack.api.admin.zone.command.DeleteZoneCmd; import com.cloud.api.commands.LDAPConfigCmd; import com.cloud.api.commands.LDAPRemoveCmd; import org.apache.cloudstack.api.user.network.command.ListNetworkOfferingsCmd; import org.apache.cloudstack.api.admin.config.command.UpdateCfgCmd; -import com.cloud.api.commands.UpdateDiskOfferingCmd; +import org.apache.cloudstack.api.admin.offering.command.UpdateDiskOfferingCmd; import org.apache.cloudstack.api.admin.network.command.UpdateNetworkOfferingCmd; import com.cloud.api.commands.UpdatePodCmd; -import com.cloud.api.commands.UpdateServiceOfferingCmd; import org.apache.cloudstack.api.admin.zone.command.UpdateZoneCmd; import com.cloud.dc.DataCenter; import com.cloud.dc.Pod; diff --git a/api/src/com/cloud/api/commands/CreateDiskOfferingCmd.java b/api/src/org/apache/cloudstack/api/admin/offering/command/CreateDiskOfferingCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/CreateDiskOfferingCmd.java rename to api/src/org/apache/cloudstack/api/admin/offering/command/CreateDiskOfferingCmd.java index 74789332be0..d79c916a388 100755 --- a/api/src/com/cloud/api/commands/CreateDiskOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/offering/command/CreateDiskOfferingCmd.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.offering.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/CreateServiceOfferingCmd.java b/api/src/org/apache/cloudstack/api/admin/offering/command/CreateServiceOfferingCmd.java similarity index 99% rename from api/src/com/cloud/api/commands/CreateServiceOfferingCmd.java rename to api/src/org/apache/cloudstack/api/admin/offering/command/CreateServiceOfferingCmd.java index 5e499123c10..57954ec821d 100644 --- a/api/src/com/cloud/api/commands/CreateServiceOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/offering/command/CreateServiceOfferingCmd.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.offering.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/DeleteDiskOfferingCmd.java b/api/src/org/apache/cloudstack/api/admin/offering/command/DeleteDiskOfferingCmd.java similarity index 97% rename from api/src/com/cloud/api/commands/DeleteDiskOfferingCmd.java rename to api/src/org/apache/cloudstack/api/admin/offering/command/DeleteDiskOfferingCmd.java index ee17f5fdc5c..39e8804aa8a 100644 --- a/api/src/com/cloud/api/commands/DeleteDiskOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/offering/command/DeleteDiskOfferingCmd.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.offering.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/DeleteServiceOfferingCmd.java b/api/src/org/apache/cloudstack/api/admin/offering/command/DeleteServiceOfferingCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/DeleteServiceOfferingCmd.java rename to api/src/org/apache/cloudstack/api/admin/offering/command/DeleteServiceOfferingCmd.java index e2d0d510177..643f8a26894 100644 --- a/api/src/com/cloud/api/commands/DeleteServiceOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/offering/command/DeleteServiceOfferingCmd.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.offering.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/UpdateDiskOfferingCmd.java b/api/src/org/apache/cloudstack/api/admin/offering/command/UpdateDiskOfferingCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/UpdateDiskOfferingCmd.java rename to api/src/org/apache/cloudstack/api/admin/offering/command/UpdateDiskOfferingCmd.java index 6e104950b91..66438142612 100755 --- a/api/src/com/cloud/api/commands/UpdateDiskOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/offering/command/UpdateDiskOfferingCmd.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.offering.command; import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; diff --git a/api/src/com/cloud/api/commands/UpdateServiceOfferingCmd.java b/api/src/org/apache/cloudstack/api/admin/offering/command/UpdateServiceOfferingCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/UpdateServiceOfferingCmd.java rename to api/src/org/apache/cloudstack/api/admin/offering/command/UpdateServiceOfferingCmd.java index 44487fba9e4..909ad7d3a4a 100755 --- a/api/src/com/cloud/api/commands/UpdateServiceOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/offering/command/UpdateServiceOfferingCmd.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.offering.command; import org.apache.log4j.Logger; diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index a00118e1ee5..e95458177f8 100755 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -107,15 +107,15 @@ listOsTypes=org.apache.cloudstack.api.user.guest.command.ListGuestOsCmd;15 listOsCategories=org.apache.cloudstack.api.user.guest.command.ListGuestOsCategoriesCmd;15 #### service offering commands -createServiceOffering=com.cloud.api.commands.CreateServiceOfferingCmd;1 -deleteServiceOffering=com.cloud.api.commands.DeleteServiceOfferingCmd;1 -updateServiceOffering=com.cloud.api.commands.UpdateServiceOfferingCmd;1 +createServiceOffering=org.apache.cloudstack.api.admin.offering.command.CreateServiceOfferingCmd;1 +deleteServiceOffering=org.apache.cloudstack.api.admin.offering.command.DeleteServiceOfferingCmd;1 +updateServiceOffering=org.apache.cloudstack.api.admin.offering.command.UpdateServiceOfferingCmd;1 listServiceOfferings=org.apache.cloudstack.api.user.offering.command.ListServiceOfferingsCmd;15 #### disk offering commands -createDiskOffering=com.cloud.api.commands.CreateDiskOfferingCmd;1 -updateDiskOffering=com.cloud.api.commands.UpdateDiskOfferingCmd;1 -deleteDiskOffering=com.cloud.api.commands.DeleteDiskOfferingCmd;1 +createDiskOffering=org.apache.cloudstack.api.admin.offering.command.CreateDiskOfferingCmd;1 +updateDiskOffering=org.apache.cloudstack.api.admin.offering.command.UpdateDiskOfferingCmd;1 +deleteDiskOffering=org.apache.cloudstack.api.admin.offering.command.DeleteDiskOfferingCmd;1 listDiskOfferings=org.apache.cloudstack.api.user.offering.command.ListDiskOfferingsCmd;15 #### vlan commands diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index ac5ac68bc5c..a4fd640e47f 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -41,6 +41,8 @@ import javax.naming.directory.InitialDirContext; import org.apache.cloudstack.api.admin.config.command.UpdateCfgCmd; import org.apache.cloudstack.api.admin.network.command.DeleteNetworkOfferingCmd; import org.apache.cloudstack.api.admin.network.command.UpdateNetworkOfferingCmd; +import org.apache.cloudstack.api.admin.offering.command.CreateDiskOfferingCmd; +import org.apache.cloudstack.api.admin.offering.command.CreateServiceOfferingCmd; import org.apache.cloudstack.api.admin.zone.command.CreateZoneCmd; import org.apache.cloudstack.api.admin.zone.command.UpdateZoneCmd; import org.apache.log4j.Logger; @@ -49,21 +51,19 @@ import com.cloud.acl.SecurityChecker; import com.cloud.alert.AlertManager; import org.apache.cloudstack.api.ApiConstants.LDAPParams; import com.cloud.api.ApiDBUtils; -import com.cloud.api.commands.CreateDiskOfferingCmd; import org.apache.cloudstack.api.admin.network.command.CreateNetworkOfferingCmd; -import com.cloud.api.commands.CreateServiceOfferingCmd; import com.cloud.api.commands.CreateVlanIpRangeCmd; -import com.cloud.api.commands.DeleteDiskOfferingCmd; +import org.apache.cloudstack.api.admin.offering.command.DeleteDiskOfferingCmd; import com.cloud.api.commands.DeletePodCmd; -import com.cloud.api.commands.DeleteServiceOfferingCmd; +import org.apache.cloudstack.api.admin.offering.command.DeleteServiceOfferingCmd; import com.cloud.api.commands.DeleteVlanIpRangeCmd; import org.apache.cloudstack.api.admin.zone.command.DeleteZoneCmd; import com.cloud.api.commands.LDAPConfigCmd; import com.cloud.api.commands.LDAPRemoveCmd; import org.apache.cloudstack.api.user.network.command.ListNetworkOfferingsCmd; -import com.cloud.api.commands.UpdateDiskOfferingCmd; +import org.apache.cloudstack.api.admin.offering.command.UpdateDiskOfferingCmd; import com.cloud.api.commands.UpdatePodCmd; -import com.cloud.api.commands.UpdateServiceOfferingCmd; +import org.apache.cloudstack.api.admin.offering.command.UpdateServiceOfferingCmd; import com.cloud.capacity.dao.CapacityDao; import com.cloud.configuration.Resource.ResourceType; import com.cloud.configuration.dao.ConfigurationDao; diff --git a/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java b/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java index e77536ec9c2..5277660cc8e 100644 --- a/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java +++ b/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java @@ -24,26 +24,26 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import javax.naming.NamingException; -import com.cloud.api.commands.CreateDiskOfferingCmd; +import org.apache.cloudstack.api.admin.offering.command.CreateDiskOfferingCmd; import org.apache.cloudstack.api.admin.config.command.UpdateCfgCmd; import org.apache.cloudstack.api.admin.network.command.CreateNetworkOfferingCmd; -import com.cloud.api.commands.CreateServiceOfferingCmd; +import org.apache.cloudstack.api.admin.offering.command.CreateServiceOfferingCmd; import com.cloud.api.commands.CreateVlanIpRangeCmd; +import org.apache.cloudstack.api.admin.offering.command.DeleteDiskOfferingCmd; +import org.apache.cloudstack.api.admin.offering.command.UpdateServiceOfferingCmd; import org.apache.cloudstack.api.admin.zone.command.CreateZoneCmd; -import com.cloud.api.commands.DeleteDiskOfferingCmd; import org.apache.cloudstack.api.admin.network.command.DeleteNetworkOfferingCmd; import com.cloud.api.commands.DeletePodCmd; -import com.cloud.api.commands.DeleteServiceOfferingCmd; +import org.apache.cloudstack.api.admin.offering.command.DeleteServiceOfferingCmd; import com.cloud.api.commands.DeleteVlanIpRangeCmd; import org.apache.cloudstack.api.admin.zone.command.DeleteZoneCmd; import com.cloud.api.commands.LDAPConfigCmd; import com.cloud.api.commands.LDAPRemoveCmd; import org.apache.cloudstack.api.admin.zone.command.UpdateZoneCmd; import org.apache.cloudstack.api.user.network.command.ListNetworkOfferingsCmd; -import com.cloud.api.commands.UpdateDiskOfferingCmd; +import org.apache.cloudstack.api.admin.offering.command.UpdateDiskOfferingCmd; import org.apache.cloudstack.api.admin.network.command.UpdateNetworkOfferingCmd; import com.cloud.api.commands.UpdatePodCmd; -import com.cloud.api.commands.UpdateServiceOfferingCmd; import com.cloud.configuration.Configuration; import com.cloud.configuration.ConfigurationManager; import com.cloud.configuration.ConfigurationService;