diff --git a/api/src/com/cloud/configuration/ConfigurationService.java b/api/src/com/cloud/configuration/ConfigurationService.java index 10138fab2c1..56f036e8911 100644 --- a/api/src/com/cloud/configuration/ConfigurationService.java +++ b/api/src/com/cloud/configuration/ConfigurationService.java @@ -20,19 +20,19 @@ import java.util.List; import javax.naming.NamingException; +import org.apache.cloudstack.api.admin.ldap.command.LDAPRemoveCmd; import org.apache.cloudstack.api.admin.offering.command.*; import org.apache.cloudstack.api.admin.network.command.CreateNetworkOfferingCmd; import org.apache.cloudstack.api.admin.offering.command.CreateServiceOfferingCmd; -import com.cloud.api.commands.CreateVlanIpRangeCmd; +import org.apache.cloudstack.api.admin.vlan.command.CreateVlanIpRangeCmd; import org.apache.cloudstack.api.admin.offering.command.CreateDiskOfferingCmd; import org.apache.cloudstack.api.admin.pod.command.DeletePodCmd; +import org.apache.cloudstack.api.admin.vlan.command.DeleteVlanIpRangeCmd; import org.apache.cloudstack.api.admin.zone.command.CreateZoneCmd; import org.apache.cloudstack.api.admin.offering.command.DeleteDiskOfferingCmd; import org.apache.cloudstack.api.admin.network.command.DeleteNetworkOfferingCmd; -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.ldap.command.LDAPConfigCmd; import org.apache.cloudstack.api.user.network.command.ListNetworkOfferingsCmd; import org.apache.cloudstack.api.admin.config.command.UpdateCfgCmd; import org.apache.cloudstack.api.admin.offering.command.UpdateDiskOfferingCmd; diff --git a/api/src/com/cloud/resource/ResourceService.java b/api/src/com/cloud/resource/ResourceService.java index d342787f061..a7ee1de50e0 100755 --- a/api/src/com/cloud/resource/ResourceService.java +++ b/api/src/com/cloud/resource/ResourceService.java @@ -22,9 +22,9 @@ import org.apache.cloudstack.api.admin.cluster.command.AddClusterCmd; import org.apache.cloudstack.api.admin.cluster.command.DeleteClusterCmd; import org.apache.cloudstack.api.admin.host.command.AddHostCmd; import org.apache.cloudstack.api.admin.host.command.AddSecondaryStorageCmd; -import com.cloud.api.commands.AddSwiftCmd; +import org.apache.cloudstack.api.admin.swift.command.AddSwiftCmd; import org.apache.cloudstack.api.admin.host.command.CancelMaintenanceCmd; -import com.cloud.api.commands.ListSwiftsCmd; +import org.apache.cloudstack.api.admin.swift.command.ListSwiftsCmd; import org.apache.cloudstack.api.admin.host.command.PrepareForMaintenanceCmd; import org.apache.cloudstack.api.admin.host.command.*; import org.apache.cloudstack.api.admin.host.command.UpdateHostCmd; diff --git a/api/src/com/cloud/server/ManagementService.java b/api/src/com/cloud/server/ManagementService.java index ab8e5dbf314..db5f8bac138 100755 --- a/api/src/com/cloud/server/ManagementService.java +++ b/api/src/com/cloud/server/ManagementService.java @@ -52,7 +52,7 @@ import org.apache.cloudstack.api.user.ssh.command.ListSSHKeyPairsCmd; 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; +import org.apache.cloudstack.api.admin.vlan.command.ListVlanIpRangesCmd; import org.apache.cloudstack.api.user.zone.command.ListZonesByCmd; import org.apache.cloudstack.api.admin.systemvm.command.RebootSystemVmCmd; import org.apache.cloudstack.api.user.ssh.command.RegisterSSHKeyPairCmd; diff --git a/api/src/com/cloud/api/commands/LDAPConfigCmd.java b/api/src/org/apache/cloudstack/api/admin/ldap/command/LDAPConfigCmd.java similarity index 99% rename from api/src/com/cloud/api/commands/LDAPConfigCmd.java rename to api/src/org/apache/cloudstack/api/admin/ldap/command/LDAPConfigCmd.java index 5b4572b3b8c..763455ceb14 100644 --- a/api/src/com/cloud/api/commands/LDAPConfigCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/ldap/command/LDAPConfigCmd.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.ldap.command; import javax.naming.NamingException; diff --git a/api/src/com/cloud/api/commands/LDAPRemoveCmd.java b/api/src/org/apache/cloudstack/api/admin/ldap/command/LDAPRemoveCmd.java similarity index 97% rename from api/src/com/cloud/api/commands/LDAPRemoveCmd.java rename to api/src/org/apache/cloudstack/api/admin/ldap/command/LDAPRemoveCmd.java index f56c24def3f..5c53debe3f4 100644 --- a/api/src/com/cloud/api/commands/LDAPRemoveCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/ldap/command/LDAPRemoveCmd.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.ldap.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/AddSwiftCmd.java b/api/src/org/apache/cloudstack/api/admin/swift/command/AddSwiftCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/AddSwiftCmd.java rename to api/src/org/apache/cloudstack/api/admin/swift/command/AddSwiftCmd.java index e0882c763f8..185024065d5 100644 --- a/api/src/com/cloud/api/commands/AddSwiftCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/swift/command/AddSwiftCmd.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.swift.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/ListSwiftsCmd.java b/api/src/org/apache/cloudstack/api/admin/swift/command/ListSwiftsCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/ListSwiftsCmd.java rename to api/src/org/apache/cloudstack/api/admin/swift/command/ListSwiftsCmd.java index 5c4563a3bdb..3a2202a9920 100644 --- a/api/src/com/cloud/api/commands/ListSwiftsCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/swift/command/ListSwiftsCmd.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.swift.command; import java.util.ArrayList; import java.util.List; diff --git a/api/src/com/cloud/api/commands/CreateVlanIpRangeCmd.java b/api/src/org/apache/cloudstack/api/admin/vlan/command/CreateVlanIpRangeCmd.java similarity index 99% rename from api/src/com/cloud/api/commands/CreateVlanIpRangeCmd.java rename to api/src/org/apache/cloudstack/api/admin/vlan/command/CreateVlanIpRangeCmd.java index f1e913670b2..27dd604199e 100644 --- a/api/src/com/cloud/api/commands/CreateVlanIpRangeCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/vlan/command/CreateVlanIpRangeCmd.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.vlan.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/DeleteVlanIpRangeCmd.java b/api/src/org/apache/cloudstack/api/admin/vlan/command/DeleteVlanIpRangeCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/DeleteVlanIpRangeCmd.java rename to api/src/org/apache/cloudstack/api/admin/vlan/command/DeleteVlanIpRangeCmd.java index 9f58e3917e6..9ae10c60cba 100644 --- a/api/src/com/cloud/api/commands/DeleteVlanIpRangeCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/vlan/command/DeleteVlanIpRangeCmd.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.vlan.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/ListVlanIpRangesCmd.java b/api/src/org/apache/cloudstack/api/admin/vlan/command/ListVlanIpRangesCmd.java similarity index 99% rename from api/src/com/cloud/api/commands/ListVlanIpRangesCmd.java rename to api/src/org/apache/cloudstack/api/admin/vlan/command/ListVlanIpRangesCmd.java index 05044710065..7de9016287b 100644 --- a/api/src/com/cloud/api/commands/ListVlanIpRangesCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/vlan/command/ListVlanIpRangesCmd.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.vlan.command; import java.util.ArrayList; import java.util.List; diff --git a/api/test/src/com/cloud/api/commands/test/AddSwiftCmdTest.java b/api/test/src/com/cloud/api/commands/test/AddSwiftCmdTest.java index fe553bbbd1f..59ffc39678e 100644 --- a/api/test/src/com/cloud/api/commands/test/AddSwiftCmdTest.java +++ b/api/test/src/com/cloud/api/commands/test/AddSwiftCmdTest.java @@ -19,6 +19,7 @@ package src.com.cloud.api.commands.test; import junit.framework.Assert; import junit.framework.TestCase; +import org.apache.cloudstack.api.admin.swift.command.AddSwiftCmd; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -27,7 +28,6 @@ import org.mockito.Mockito; import org.apache.cloudstack.api.ResponseGenerator; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.commands.AddSwiftCmd; import com.cloud.api.response.SwiftResponse; import com.cloud.exception.DiscoveryException; import com.cloud.resource.ResourceService; diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index 48bd39c786a..d825505bd78 100755 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -119,9 +119,9 @@ deleteDiskOffering=org.apache.cloudstack.api.admin.offering.command.DeleteDiskOf listDiskOfferings=org.apache.cloudstack.api.user.offering.command.ListDiskOfferingsCmd;15 #### vlan commands -createVlanIpRange=com.cloud.api.commands.CreateVlanIpRangeCmd;1 -deleteVlanIpRange=com.cloud.api.commands.DeleteVlanIpRangeCmd;1 -listVlanIpRanges=com.cloud.api.commands.ListVlanIpRangesCmd;1 +createVlanIpRange=org.apache.cloudstack.api.admin.vlan.command.CreateVlanIpRangeCmd;1 +deleteVlanIpRange=org.apache.cloudstack.api.admin.vlan.command.DeleteVlanIpRangeCmd;1 +listVlanIpRanges=org.apache.cloudstack.api.admin.vlan.command.ListVlanIpRangesCmd;1 #### address commands associateIpAddress=org.apache.cloudstack.api.user.address.command.AssociateIPAddrCmd;15 @@ -198,8 +198,8 @@ changeServiceForSystemVm=org.apache.cloudstack.api.admin.systemvm.command.Upgrad #### configuration commands 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 +ldapConfig=org.apache.cloudstack.api.admin.ldap.command.LDAPConfigCmd;1 +ldapRemove=org.apache.cloudstack.api.admin.ldap.command.LDAPRemoveCmd;1 listCapabilities=org.apache.cloudstack.api.user.config.command.ListCapabilitiesCmd;15 #### pod commands @@ -225,8 +225,8 @@ listAlerts=com.cloud.api.commands.ListAlertsCmd;3 listCapacity=com.cloud.api.commands.ListCapacityCmd;3 #### swift commands^M -addSwift=com.cloud.api.commands.AddSwiftCmd;1 -listSwifts=com.cloud.api.commands.ListSwiftsCmd;1 +addSwift=org.apache.cloudstack.api.admin.swift.command.AddSwiftCmd;1 +listSwifts=org.apache.cloudstack.api.admin.swift.command.ListSwiftsCmd;1 #### host commands addHost=org.apache.cloudstack.api.admin.host.command.AddHostCmd;3 diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index eeff5066204..f5dea7ed09b 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -39,12 +39,15 @@ 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.ldap.command.LDAPConfigCmd; +import org.apache.cloudstack.api.admin.ldap.command.LDAPRemoveCmd; 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.pod.command.DeletePodCmd; import org.apache.cloudstack.api.admin.pod.command.UpdatePodCmd; +import org.apache.cloudstack.api.admin.vlan.command.CreateVlanIpRangeCmd; import org.apache.cloudstack.api.admin.zone.command.CreateZoneCmd; import org.apache.cloudstack.api.admin.zone.command.UpdateZoneCmd; import org.apache.log4j.Logger; @@ -54,13 +57,10 @@ import com.cloud.alert.AlertManager; import org.apache.cloudstack.api.ApiConstants.LDAPParams; import com.cloud.api.ApiDBUtils; import org.apache.cloudstack.api.admin.network.command.CreateNetworkOfferingCmd; -import com.cloud.api.commands.CreateVlanIpRangeCmd; import org.apache.cloudstack.api.admin.offering.command.DeleteDiskOfferingCmd; import org.apache.cloudstack.api.admin.offering.command.DeleteServiceOfferingCmd; -import com.cloud.api.commands.DeleteVlanIpRangeCmd; +import org.apache.cloudstack.api.admin.vlan.command.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.offering.command.UpdateDiskOfferingCmd; import org.apache.cloudstack.api.admin.offering.command.UpdateServiceOfferingCmd; diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java index 7a4c3dbad59..10f0ea962c0 100755 --- a/server/src/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/com/cloud/resource/ResourceManagerImpl.java @@ -32,6 +32,7 @@ import javax.naming.ConfigurationException; import org.apache.cloudstack.api.admin.cluster.command.AddClusterCmd; import org.apache.cloudstack.api.admin.host.command.*; +import org.apache.cloudstack.api.admin.swift.command.AddSwiftCmd; import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; @@ -52,10 +53,9 @@ import org.apache.cloudstack.api.ApiConstants; import com.cloud.api.ApiDBUtils; import org.apache.cloudstack.api.admin.host.command.AddHostCmd; import org.apache.cloudstack.api.admin.host.command.AddSecondaryStorageCmd; -import com.cloud.api.commands.AddSwiftCmd; import org.apache.cloudstack.api.admin.host.command.CancelMaintenanceCmd; import org.apache.cloudstack.api.admin.cluster.command.DeleteClusterCmd; -import com.cloud.api.commands.ListSwiftsCmd; +import org.apache.cloudstack.api.admin.swift.command.ListSwiftsCmd; import org.apache.cloudstack.api.admin.host.command.PrepareForMaintenanceCmd; import org.apache.cloudstack.api.admin.host.command.UpdateHostCmd; import com.cloud.capacity.Capacity; diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 44458b13ddd..1d7c486656a 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -87,7 +87,7 @@ import org.apache.cloudstack.api.user.address.command.ListPublicIpAddressesCmd; import org.apache.cloudstack.api.user.ssh.command.ListSSHKeyPairsCmd; 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.admin.vlan.command.ListVlanIpRangesCmd; import org.apache.cloudstack.api.admin.systemvm.command.RebootSystemVmCmd; import org.apache.cloudstack.api.admin.systemvm.command.StopSystemVmCmd; import org.apache.cloudstack.api.admin.domain.command.UpdateDomainCmd; diff --git a/server/src/com/cloud/storage/swift/SwiftManager.java b/server/src/com/cloud/storage/swift/SwiftManager.java index a1bd42df611..075c985defa 100644 --- a/server/src/com/cloud/storage/swift/SwiftManager.java +++ b/server/src/com/cloud/storage/swift/SwiftManager.java @@ -19,10 +19,10 @@ package com.cloud.storage.swift; import java.util.List; import com.cloud.agent.api.to.SwiftTO; -import com.cloud.api.commands.AddSwiftCmd; +import org.apache.cloudstack.api.admin.swift.command.AddSwiftCmd; +import org.apache.cloudstack.api.admin.swift.command.ListSwiftsCmd; import org.apache.cloudstack.api.user.iso.command.DeleteIsoCmd; import org.apache.cloudstack.api.user.template.command.DeleteTemplateCmd; -import com.cloud.api.commands.ListSwiftsCmd; import com.cloud.exception.DiscoveryException; import com.cloud.storage.Swift; import com.cloud.storage.SwiftVO; diff --git a/server/src/com/cloud/storage/swift/SwiftManagerImpl.java b/server/src/com/cloud/storage/swift/SwiftManagerImpl.java index 1708193bd0b..e83d6cbb017 100644 --- a/server/src/com/cloud/storage/swift/SwiftManagerImpl.java +++ b/server/src/com/cloud/storage/swift/SwiftManagerImpl.java @@ -25,6 +25,7 @@ import java.util.Map; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.apache.cloudstack.api.admin.swift.command.ListSwiftsCmd; import org.apache.cloudstack.api.user.iso.command.DeleteIsoCmd; import org.apache.cloudstack.api.user.template.command.DeleteTemplateCmd; import org.apache.log4j.Logger; @@ -33,8 +34,7 @@ import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; import com.cloud.agent.api.DeleteObjectFromSwiftCommand; import com.cloud.agent.api.to.SwiftTO; -import com.cloud.api.commands.AddSwiftCmd; -import com.cloud.api.commands.ListSwiftsCmd; +import org.apache.cloudstack.api.admin.swift.command.AddSwiftCmd; import com.cloud.configuration.Config; import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.dc.DataCenterVO; diff --git a/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java b/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java index 291d08ed834..c303cfb5435 100644 --- a/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java +++ b/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java @@ -28,18 +28,18 @@ 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 org.apache.cloudstack.api.admin.offering.command.CreateServiceOfferingCmd; -import com.cloud.api.commands.CreateVlanIpRangeCmd; +import org.apache.cloudstack.api.admin.vlan.command.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.pod.command.UpdatePodCmd; +import org.apache.cloudstack.api.admin.vlan.command.DeleteVlanIpRangeCmd; import org.apache.cloudstack.api.admin.zone.command.CreateZoneCmd; import org.apache.cloudstack.api.admin.network.command.DeleteNetworkOfferingCmd; import org.apache.cloudstack.api.admin.pod.command.DeletePodCmd; 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.ldap.command.LDAPConfigCmd; +import org.apache.cloudstack.api.admin.ldap.command.LDAPRemoveCmd; import org.apache.cloudstack.api.admin.zone.command.UpdateZoneCmd; import org.apache.cloudstack.api.user.network.command.ListNetworkOfferingsCmd; import org.apache.cloudstack.api.admin.offering.command.UpdateDiskOfferingCmd;