From 28df57ec7564a1004c392ff1a70bbc497df6da63 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Tue, 4 Dec 2012 00:27:19 -0800 Subject: [PATCH] api_refactor: refactor serviceoffering apis - Fix refactored apis, mappings in commands*.in - Fix comments etc. Signed-off-by: Rohit Yadav --- api/src/com/cloud/api/commands/ListClustersCmd.java | 1 + api/src/com/cloud/server/ManagementService.java | 2 +- .../user/serviceoffering/command}/ListServiceOfferingsCmd.java | 2 +- client/tomcatconf/commands.properties.in | 2 +- .../src/com/cloud/api/commands/ListExternalFirewallsCmd.java | 1 + server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java | 1 + server/src/com/cloud/server/ManagementServerImpl.java | 2 +- 7 files changed, 7 insertions(+), 4 deletions(-) rename api/src/{com/cloud/api/commands => org/apache/cloudstack/api/user/serviceoffering/command}/ListServiceOfferingsCmd.java (98%) diff --git a/api/src/com/cloud/api/commands/ListClustersCmd.java b/api/src/com/cloud/api/commands/ListClustersCmd.java index a6bd54940c8..a3f55068fb7 100755 --- a/api/src/com/cloud/api/commands/ListClustersCmd.java +++ b/api/src/com/cloud/api/commands/ListClustersCmd.java @@ -19,6 +19,7 @@ package com.cloud.api.commands; import java.util.ArrayList; import java.util.List; +import org.apache.cloudstack.api.user.serviceoffering.command.ListServiceOfferingsCmd; import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; diff --git a/api/src/com/cloud/server/ManagementService.java b/api/src/com/cloud/server/ManagementService.java index a6a36ff22e3..dded41ea59e 100755 --- a/api/src/com/cloud/server/ManagementService.java +++ b/api/src/com/cloud/server/ManagementService.java @@ -47,7 +47,7 @@ import com.cloud.api.commands.ListPodsByCmd; import com.cloud.api.commands.ListPublicIpAddressesCmd; import com.cloud.api.commands.ListRoutersCmd; import org.apache.cloudstack.api.user.ssh.command.ListSSHKeyPairsCmd; -import com.cloud.api.commands.ListServiceOfferingsCmd; +import org.apache.cloudstack.api.user.serviceoffering.command.ListServiceOfferingsCmd; import com.cloud.api.commands.ListStoragePoolsCmd; import com.cloud.api.commands.ListSystemVMsCmd; import org.apache.cloudstack.api.user.vmgroup.command.ListVMGroupsCmd; diff --git a/api/src/com/cloud/api/commands/ListServiceOfferingsCmd.java b/api/src/org/apache/cloudstack/api/user/serviceoffering/command/ListServiceOfferingsCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/ListServiceOfferingsCmd.java rename to api/src/org/apache/cloudstack/api/user/serviceoffering/command/ListServiceOfferingsCmd.java index 69763b984b7..89334aa3dfe 100644 --- a/api/src/com/cloud/api/commands/ListServiceOfferingsCmd.java +++ b/api/src/org/apache/cloudstack/api/user/serviceoffering/command/ListServiceOfferingsCmd.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.serviceoffering.command; import java.util.ArrayList; import java.util.List; diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index f7ce43b2dc5..d9d5ed02c48 100755 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -110,7 +110,7 @@ listOsCategories=org.apache.cloudstack.api.user.guest.command.ListGuestOsCategor createServiceOffering=com.cloud.api.commands.CreateServiceOfferingCmd;1 deleteServiceOffering=com.cloud.api.commands.DeleteServiceOfferingCmd;1 updateServiceOffering=com.cloud.api.commands.UpdateServiceOfferingCmd;1 -listServiceOfferings=com.cloud.api.commands.ListServiceOfferingsCmd;15 +listServiceOfferings=org.apache.cloudstack.api.user.serviceoffering.command.ListServiceOfferingsCmd;15 #### disk offering commands createDiskOffering=com.cloud.api.commands.CreateDiskOfferingCmd;1 diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListExternalFirewallsCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListExternalFirewallsCmd.java index 29bf3d26e64..63a9ebd48f7 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListExternalFirewallsCmd.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListExternalFirewallsCmd.java @@ -19,6 +19,7 @@ package com.cloud.api.commands; import java.util.ArrayList; import java.util.List; +import org.apache.cloudstack.api.user.serviceoffering.command.ListServiceOfferingsCmd; import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; diff --git a/server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java b/server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java index 59683dce3aa..a6ea5b35a30 100644 --- a/server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java +++ b/server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java @@ -19,6 +19,7 @@ package com.cloud.api.commands; import java.util.ArrayList; import java.util.List; +import org.apache.cloudstack.api.user.serviceoffering.command.ListServiceOfferingsCmd; import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 6a895e35168..859354a6460 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -46,6 +46,7 @@ import org.apache.cloudstack.api.user.guest.command.ListGuestOsCategoriesCmd; import org.apache.cloudstack.api.user.guest.command.ListGuestOsCmd; import org.apache.cloudstack.api.user.iso.command.ListIsosCmd; import org.apache.cloudstack.api.user.job.command.ListAsyncJobsCmd; +import org.apache.cloudstack.api.user.serviceoffering.command.ListServiceOfferingsCmd; import org.apache.cloudstack.api.user.ssh.command.DeleteSSHKeyPairCmd; import org.apache.cloudstack.api.user.ssh.command.RegisterSSHKeyPairCmd; import org.apache.cloudstack.api.user.template.command.ListTemplatesCmd; @@ -83,7 +84,6 @@ import com.cloud.api.commands.ListPodsByCmd; import com.cloud.api.commands.ListPublicIpAddressesCmd; import com.cloud.api.commands.ListRoutersCmd; import org.apache.cloudstack.api.user.ssh.command.ListSSHKeyPairsCmd; -import com.cloud.api.commands.ListServiceOfferingsCmd; import com.cloud.api.commands.ListStoragePoolsCmd; import com.cloud.api.commands.ListSystemVMsCmd; import com.cloud.api.commands.ListVlanIpRangesCmd;