diff --git a/api/src/com/cloud/configuration/ConfigurationService.java b/api/src/com/cloud/configuration/ConfigurationService.java index f807297206d..be509811c8b 100644 --- a/api/src/com/cloud/configuration/ConfigurationService.java +++ b/api/src/com/cloud/configuration/ConfigurationService.java @@ -34,7 +34,7 @@ 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.UpdateCfgCmd; +import org.apache.cloudstack.api.admin.config.command.UpdateCfgCmd; import com.cloud.api.commands.UpdateDiskOfferingCmd; import org.apache.cloudstack.api.admin.network.command.UpdateNetworkOfferingCmd; import com.cloud.api.commands.UpdatePodCmd; diff --git a/api/src/com/cloud/server/ManagementService.java b/api/src/com/cloud/server/ManagementService.java index e77fe15c078..8b20f31f15e 100755 --- a/api/src/com/cloud/server/ManagementService.java +++ b/api/src/com/cloud/server/ManagementService.java @@ -28,7 +28,7 @@ import org.apache.cloudstack.api.admin.host.command.ListHostsCmd; import org.apache.cloudstack.api.admin.host.command.UpdateHostPasswordCmd; import org.apache.cloudstack.api.admin.router.command.ListRoutersCmd; import org.apache.cloudstack.api.user.address.command.ListPublicIpAddressesCmd; -import org.apache.cloudstack.api.user.resource.command.ListCapabilitiesCmd; +import org.apache.cloudstack.api.user.config.command.ListCapabilitiesCmd; import org.apache.cloudstack.api.user.guest.command.ListGuestOsCmd; import org.apache.cloudstack.api.user.offering.command.ListDiskOfferingsCmd; import org.apache.cloudstack.api.user.offering.command.ListServiceOfferingsCmd; @@ -42,7 +42,7 @@ import org.apache.cloudstack.api.user.vm.command.GetVMPasswordCmd; import com.cloud.api.commands.ListAlertsCmd; import org.apache.cloudstack.api.user.job.command.ListAsyncJobsCmd; import com.cloud.api.commands.ListCapacityCmd; -import com.cloud.api.commands.ListCfgsByCmd; +import org.apache.cloudstack.api.admin.config.command.ListCfgsByCmd; import com.cloud.api.commands.ListClustersCmd; import org.apache.cloudstack.api.user.event.command.ListEventsCmd; import org.apache.cloudstack.api.user.guest.command.ListGuestOsCategoriesCmd; diff --git a/api/src/com/cloud/api/commands/ListCfgsByCmd.java b/api/src/org/apache/cloudstack/api/admin/config/command/ListCfgsByCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/ListCfgsByCmd.java rename to api/src/org/apache/cloudstack/api/admin/config/command/ListCfgsByCmd.java index e539338fff3..70990ba8179 100644 --- a/api/src/com/cloud/api/commands/ListCfgsByCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/config/command/ListCfgsByCmd.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.config.command; import java.util.ArrayList; import java.util.List; diff --git a/api/src/com/cloud/api/commands/ListHypervisorCapabilitiesCmd.java b/api/src/org/apache/cloudstack/api/admin/config/command/ListHypervisorCapabilitiesCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/ListHypervisorCapabilitiesCmd.java rename to api/src/org/apache/cloudstack/api/admin/config/command/ListHypervisorCapabilitiesCmd.java index 29a56a3fa07..e0cd04f8350 100644 --- a/api/src/com/cloud/api/commands/ListHypervisorCapabilitiesCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/config/command/ListHypervisorCapabilitiesCmd.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.config.command; import java.util.ArrayList; import java.util.List; diff --git a/api/src/com/cloud/api/commands/UpdateCfgCmd.java b/api/src/org/apache/cloudstack/api/admin/config/command/UpdateCfgCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/UpdateCfgCmd.java rename to api/src/org/apache/cloudstack/api/admin/config/command/UpdateCfgCmd.java index ea5e8773f6e..62d401146a7 100644 --- a/api/src/com/cloud/api/commands/UpdateCfgCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/config/command/UpdateCfgCmd.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.config.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/UpdateHypervisorCapabilitiesCmd.java b/api/src/org/apache/cloudstack/api/admin/config/command/UpdateHypervisorCapabilitiesCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/UpdateHypervisorCapabilitiesCmd.java rename to api/src/org/apache/cloudstack/api/admin/config/command/UpdateHypervisorCapabilitiesCmd.java index 4f47f48c617..47a99809b1d 100644 --- a/api/src/com/cloud/api/commands/UpdateHypervisorCapabilitiesCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/config/command/UpdateHypervisorCapabilitiesCmd.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.config.command; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/resource/command/ListCapabilitiesCmd.java b/api/src/org/apache/cloudstack/api/user/config/command/ListCapabilitiesCmd.java similarity index 97% rename from api/src/org/apache/cloudstack/api/user/resource/command/ListCapabilitiesCmd.java rename to api/src/org/apache/cloudstack/api/user/config/command/ListCapabilitiesCmd.java index 7fd69c78024..3b235ee38c0 100644 --- a/api/src/org/apache/cloudstack/api/user/resource/command/ListCapabilitiesCmd.java +++ b/api/src/org/apache/cloudstack/api/user/config/command/ListCapabilitiesCmd.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 org.apache.cloudstack.api.user.resource.command; +package org.apache.cloudstack.api.user.config.command; import java.util.Map; diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index 822d344bc83..a00118e1ee5 100755 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -196,11 +196,11 @@ migrateSystemVm=org.apache.cloudstack.api.admin.systemvm.command.MigrateSystemVM changeServiceForSystemVm=org.apache.cloudstack.api.admin.systemvm.command.UpgradeSystemVMCmd;1 #### configuration commands -updateConfiguration=com.cloud.api.commands.UpdateCfgCmd;1 -listConfigurations=com.cloud.api.commands.ListCfgsByCmd;1 +updateConfiguration=org.apache.cloudstack.api.admin.config.command.UpdateCfgCmd;1 +listConfigurations=org.apache.cloudstack.api.admin.config.command.ListCfgsByCmd;1 ldapConfig=com.cloud.api.commands.LDAPConfigCmd;1 ldapRemove=com.cloud.api.commands.LDAPRemoveCmd;1 -listCapabilities=org.apache.cloudstack.api.user.resource.command.ListCapabilitiesCmd;15 +listCapabilities=org.apache.cloudstack.api.user.config.command.ListCapabilitiesCmd;15 #### pod commands createPod=com.cloud.api.commands.CreatePodCmd;1 @@ -341,8 +341,8 @@ deleteFirewallRule=org.apache.cloudstack.api.user.firewall.command.DeleteFirewal listFirewallRules=org.apache.cloudstack.api.user.firewall.command.ListFirewallRulesCmd;15 #### hypervisor capabilities commands -updateHypervisorCapabilities=com.cloud.api.commands.UpdateHypervisorCapabilitiesCmd;1 -listHypervisorCapabilities=com.cloud.api.commands.ListHypervisorCapabilitiesCmd;1 +updateHypervisorCapabilities=org.apache.cloudstack.api.admin.config.command.UpdateHypervisorCapabilitiesCmd;1 +listHypervisorCapabilities=org.apache.cloudstack.api.admin.config.command.ListHypervisorCapabilitiesCmd;1 #### Physical Network commands createPhysicalNetwork=org.apache.cloudstack.api.admin.network.command.CreatePhysicalNetworkCmd;1 diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index f3b1e2fbb9a..ac5ac68bc5c 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -38,6 +38,7 @@ import javax.naming.NamingException; import javax.naming.directory.DirContext; 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.zone.command.CreateZoneCmd; @@ -60,7 +61,6 @@ 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.UpdateCfgCmd; import com.cloud.api.commands.UpdateDiskOfferingCmd; import com.cloud.api.commands.UpdatePodCmd; import com.cloud.api.commands.UpdateServiceOfferingCmd; diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index ecaa8cb2b69..ec4b5804e97 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -42,8 +42,9 @@ import java.util.concurrent.TimeUnit; import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; +import org.apache.cloudstack.api.admin.config.command.ListCfgsByCmd; import org.apache.cloudstack.api.admin.router.command.ListRoutersCmd; -import org.apache.cloudstack.api.user.resource.command.ListCapabilitiesCmd; +import org.apache.cloudstack.api.user.config.command.ListCapabilitiesCmd; 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; @@ -78,7 +79,6 @@ 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; -import com.cloud.api.commands.ListCfgsByCmd; import com.cloud.api.commands.ListClustersCmd; import org.apache.cloudstack.api.user.event.command.ListEventsCmd; import org.apache.cloudstack.api.admin.host.command.ListHostsCmd; diff --git a/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java b/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java index 1fd10d04582..e77536ec9c2 100644 --- a/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java +++ b/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java @@ -25,6 +25,7 @@ import javax.naming.ConfigurationException; import javax.naming.NamingException; import com.cloud.api.commands.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 com.cloud.api.commands.CreateVlanIpRangeCmd; @@ -39,7 +40,6 @@ 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.UpdateCfgCmd; import com.cloud.api.commands.UpdateDiskOfferingCmd; import org.apache.cloudstack.api.admin.network.command.UpdateNetworkOfferingCmd; import com.cloud.api.commands.UpdatePodCmd;