From af28c06998d7983fd703e7e4c4cadc1aa2d827ea Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Fri, 7 Dec 2012 18:30:54 -0800 Subject: [PATCH] api: move and group all under command, org.apache.cloudstack.command.* Signed-off-by: Rohit Yadav --- .../api/commands/UpdateTemplateOrIsoCmd.java | 2 +- .../configuration/ConfigurationService.java | 37 +- api/src/com/cloud/network/NetworkService.java | 8 +- .../cloud/network/StorageNetworkService.java | 8 +- .../VirtualNetworkApplianceService.java | 2 +- .../cloud/network/as/AutoScaleService.java | 15 +- .../element/VirtualRouterElementService.java | 4 +- .../network/firewall/FirewallService.java | 2 +- .../network/firewall/NetworkACLService.java | 2 +- .../network/lb/LoadBalancingRulesService.java | 7 +- .../com/cloud/network/rules/RulesService.java | 2 +- .../security/SecurityGroupService.java | 5 +- .../network/vpn/RemoteAccessVpnService.java | 2 +- .../com/cloud/resource/ResourceService.java | 18 +- .../com/cloud/server/ManagementService.java | 67 ++- .../cloud/server/TaggedResourceService.java | 2 +- api/src/com/cloud/storage/StorageService.java | 8 +- .../storage/snapshot/SnapshotService.java | 8 +- .../com/cloud/template/TemplateService.java | 14 +- api/src/com/cloud/user/AccountService.java | 12 +- api/src/com/cloud/user/DomainService.java | 4 +- api/src/com/cloud/vm/UserVmService.java | 6 +- .../cloudstack/api/ResponseGenerator.java | 4 +- .../admin/account}/CreateAccountCmd.java | 2 +- .../admin/account}/DeleteAccountCmd.java | 2 +- .../admin/account}/DisableAccountCmd.java | 2 +- .../admin/account}/EnableAccountCmd.java | 2 +- .../admin/account}/LockAccountCmd.java | 2 +- .../admin/account}/UpdateAccountCmd.java | 2 +- .../admin/autoscale}/CreateCounterCmd.java | 2 +- .../admin/autoscale}/DeleteCounterCmd.java | 2 +- .../admin/cluster}/AddClusterCmd.java | 2 +- .../admin/cluster}/DeleteClusterCmd.java | 2 +- .../admin/cluster}/ListClustersCmd.java | 4 +- .../admin/cluster}/UpdateClusterCmd.java | 2 +- .../admin/config}/ListCfgsByCmd.java | 2 +- .../ListHypervisorCapabilitiesCmd.java | 2 +- .../admin/config}/UpdateCfgCmd.java | 2 +- .../UpdateHypervisorCapabilitiesCmd.java | 2 +- .../admin/domain}/CreateDomainCmd.java | 2 +- .../admin/domain}/DeleteDomainCmd.java | 2 +- .../admin/domain}/ListDomainChildrenCmd.java | 2 +- .../admin/domain}/ListDomainsCmd.java | 2 +- .../admin/domain}/UpdateDomainCmd.java | 2 +- .../admin/host}/AddHostCmd.java | 2 +- .../admin/host}/AddSecondaryStorageCmd.java | 2 +- .../admin/host}/CancelMaintenanceCmd.java | 2 +- .../admin/host}/DeleteHostCmd.java | 2 +- .../admin/host}/ListHostsCmd.java | 2 +- .../admin/host}/PrepareForMaintenanceCmd.java | 2 +- .../admin/host}/ReconnectHostCmd.java | 2 +- .../admin/host}/UpdateHostCmd.java | 2 +- .../admin/host}/UpdateHostPasswordCmd.java | 2 +- .../admin/ldap}/LDAPConfigCmd.java | 2 +- .../admin/ldap}/LDAPRemoveCmd.java | 2 +- .../admin/network}/AddNetworkDeviceCmd.java | 4 +- .../AddNetworkServiceProviderCmd.java | 2 +- .../network}/CreateNetworkOfferingCmd.java | 2 +- .../network}/CreatePhysicalNetworkCmd.java | 2 +- .../CreateStorageNetworkIpRangeCmd.java | 2 +- .../network}/DeleteNetworkDeviceCmd.java | 2 +- .../network}/DeleteNetworkOfferingCmd.java | 2 +- .../DeleteNetworkServiceProviderCmd.java | 2 +- .../network}/DeletePhysicalNetworkCmd.java | 2 +- .../DeleteStorageNetworkIpRangeCmd.java | 2 +- .../admin/network}/ListNetworkDeviceCmd.java | 4 +- .../ListNetworkServiceProvidersCmd.java | 2 +- .../network}/ListPhysicalNetworksCmd.java | 2 +- .../ListStorageNetworkIpRangeCmd.java | 2 +- .../ListSupportedNetworkServicesCmd.java | 2 +- .../network}/UpdateNetworkOfferingCmd.java | 2 +- .../UpdateNetworkServiceProviderCmd.java | 2 +- .../network}/UpdatePhysicalNetworkCmd.java | 2 +- .../UpdateStorageNetworkIpRangeCmd.java | 2 +- .../offering}/CreateDiskOfferingCmd.java | 2 +- .../offering}/CreateServiceOfferingCmd.java | 2 +- .../offering}/DeleteDiskOfferingCmd.java | 2 +- .../offering}/DeleteServiceOfferingCmd.java | 2 +- .../offering}/UpdateDiskOfferingCmd.java | 2 +- .../offering}/UpdateServiceOfferingCmd.java | 2 +- .../admin/pod}/CreatePodCmd.java | 2 +- .../admin/pod}/DeletePodCmd.java | 2 +- .../admin/pod}/ListPodsByCmd.java | 2 +- .../admin/pod}/UpdatePodCmd.java | 2 +- .../admin/resource}/ListAlertsCmd.java | 2 +- .../admin/resource}/ListCapacityCmd.java | 2 +- .../resource}/UploadCustomCertificateCmd.java | 2 +- .../ConfigureVirtualRouterElementCmd.java | 2 +- .../CreateVirtualRouterElementCmd.java | 2 +- .../admin/router}/DestroyRouterCmd.java | 2 +- .../admin/router}/ListRoutersCmd.java | 11 +- .../router}/ListVirtualRouterElementsCmd.java | 4 +- .../admin/router}/RebootRouterCmd.java | 2 +- .../admin/router}/StartRouterCmd.java | 2 +- .../admin/router}/StopRouterCmd.java | 2 +- .../admin/router}/UpgradeRouterCmd.java | 2 +- .../CancelPrimaryStorageMaintenanceCmd.java | 2 +- .../storagepool}/CreateStoragePoolCmd.java | 2 +- .../admin/storagepool}/DeletePoolCmd.java | 2 +- .../storagepool}/ListStoragePoolsCmd.java | 2 +- ...reparePrimaryStorageForMaintenanceCmd.java | 2 +- .../storagepool}/UpdateStoragePoolCmd.java | 2 +- .../admin/swift}/AddSwiftCmd.java | 2 +- .../admin/swift}/ListSwiftsCmd.java | 2 +- .../admin/systemvm}/DestroySystemVmCmd.java | 2 +- .../admin/systemvm}/ListSystemVMsCmd.java | 2 +- .../admin/systemvm}/MigrateSystemVMCmd.java | 2 +- .../admin/systemvm}/RebootSystemVmCmd.java | 2 +- .../admin/systemvm}/StartSystemVMCmd.java | 2 +- .../admin/systemvm}/StopSystemVmCmd.java | 2 +- .../admin/systemvm}/UpgradeSystemVMCmd.java | 2 +- .../admin/template}/PrepareTemplateCmd.java | 2 +- .../admin/usage}/AddTrafficTypeCmd.java | 2 +- .../admin/usage}/DeleteTrafficTypeCmd.java | 2 +- .../ListTrafficTypeImplementorsCmd.java | 2 +- .../admin/usage}/ListTrafficTypesCmd.java | 2 +- .../admin/usage}/UpdateTrafficTypeCmd.java | 2 +- .../admin/user}/CreateUserCmd.java | 2 +- .../admin/user}/DeleteUserCmd.java | 2 +- .../admin/user}/DisableUserCmd.java | 2 +- .../admin/user}/EnableUserCmd.java | 2 +- .../admin/user}/GetUserCmd.java | 2 +- .../admin/user}/ListUsersCmd.java | 2 +- .../admin/user}/LockUserCmd.java | 2 +- .../admin/user}/RegisterCmd.java | 2 +- .../admin/user}/UpdateUserCmd.java | 2 +- .../admin/vlan}/CreateVlanIpRangeCmd.java | 2 +- .../admin/vlan}/DeleteVlanIpRangeCmd.java | 2 +- .../admin/vlan}/ListVlanIpRangesCmd.java | 2 +- .../admin/vm}/AssignVMCmd.java | 3 +- .../admin/vm}/MigrateVMCmd.java | 2 +- .../admin/vm}/RecoverVMCmd.java | 3 +- .../admin/vpc}/CreatePrivateGatewayCmd.java | 2 +- .../admin/vpc}/CreateVPCOfferingCmd.java | 2 +- .../admin/vpc}/DeletePrivateGatewayCmd.java | 2 +- .../admin/vpc}/DeleteVPCOfferingCmd.java | 2 +- .../admin/vpc}/UpdateVPCOfferingCmd.java | 2 +- .../admin/zone}/CreateZoneCmd.java | 3 +- .../admin/zone}/DeleteZoneCmd.java | 3 +- .../zone}/MarkDefaultZoneForAccountCmd.java | 3 +- .../admin/zone}/UpdateZoneCmd.java | 3 +- .../user/account}/AddAccountToProjectCmd.java | 2 +- .../account}/DeleteAccountFromProjectCmd.java | 4 +- .../user/account}/ListAccountsCmd.java | 2 +- .../user/account}/ListProjectAccountsCmd.java | 2 +- .../user/address}/AssociateIPAddrCmd.java | 2 +- .../user/address}/DisassociateIPAddrCmd.java | 2 +- .../address}/ListPublicIpAddressesCmd.java | 2 +- .../autoscale}/CreateAutoScalePolicyCmd.java | 2 +- .../autoscale}/CreateAutoScaleVmGroupCmd.java | 2 +- .../CreateAutoScaleVmProfileCmd.java | 2 +- .../user/autoscale}/CreateConditionCmd.java | 2 +- .../autoscale}/DeleteAutoScalePolicyCmd.java | 2 +- .../autoscale}/DeleteAutoScaleVmGroupCmd.java | 2 +- .../DeleteAutoScaleVmProfileCmd.java | 2 +- .../user/autoscale}/DeleteConditionCmd.java | 2 +- .../DisableAutoScaleVmGroupCmd.java | 2 +- .../autoscale}/EnableAutoScaleVmGroupCmd.java | 2 +- .../autoscale}/ListAutoScalePoliciesCmd.java | 2 +- .../autoscale}/ListAutoScaleVmGroupsCmd.java | 2 +- .../ListAutoScaleVmProfilesCmd.java | 2 +- .../user/autoscale}/ListConditionsCmd.java | 2 +- .../user/autoscale}/ListCountersCmd.java | 2 +- .../autoscale}/UpdateAutoScalePolicyCmd.java | 2 +- .../autoscale}/UpdateAutoScaleVmGroupCmd.java | 2 +- .../UpdateAutoScaleVmProfileCmd.java | 2 +- .../user/config}/ListCapabilitiesCmd.java | 2 +- .../user/event}/ListEventTypesCmd.java | 2 +- .../user/event}/ListEventsCmd.java | 6 +- .../user/firewall}/CreateFirewallRuleCmd.java | 2 +- .../CreatePortForwardingRuleCmd.java | 2 +- .../user/firewall}/DeleteFirewallRuleCmd.java | 2 +- .../DeletePortForwardingRuleCmd.java | 2 +- .../user/firewall}/ListFirewallRulesCmd.java | 2 +- .../firewall}/ListPortForwardingRulesCmd.java | 2 +- .../UpdatePortForwardingRuleCmd.java | 2 +- .../user/guest}/ListGuestOsCategoriesCmd.java | 4 +- .../user/guest}/ListGuestOsCmd.java | 4 +- .../user/iso}/AttachIsoCmd.java | 2 +- .../user/iso}/DeleteIsoCmd.java | 2 +- .../user/iso}/DetachIsoCmd.java | 2 +- .../user/iso}/ExtractIsoCmd.java | 2 +- .../user/iso}/ListIsoPermissionsCmd.java | 2 +- .../user/iso}/ListIsosCmd.java | 2 +- .../user/iso}/RegisterIsoCmd.java | 2 +- .../user/iso}/UpdateIsoCmd.java | 2 +- .../user/iso}/UpdateIsoPermissionsCmd.java | 2 +- .../user/job}/ListAsyncJobsCmd.java | 2 +- .../user/job}/QueryAsyncJobResultCmd.java | 2 +- .../AssignToLoadBalancerRuleCmd.java | 2 +- .../CreateLBStickinessPolicyCmd.java | 2 +- .../CreateLoadBalancerRuleCmd.java | 2 +- .../DeleteLBStickinessPolicyCmd.java | 2 +- .../DeleteLoadBalancerRuleCmd.java | 2 +- .../ListLBStickinessPoliciesCmd.java | 2 +- .../ListLoadBalancerRuleInstancesCmd.java | 2 +- .../ListLoadBalancerRulesCmd.java | 2 +- .../RemoveFromLoadBalancerRuleCmd.java | 2 +- .../UpdateLoadBalancerRuleCmd.java | 2 +- .../user/nat}/CreateIpForwardingRuleCmd.java | 2 +- .../user/nat}/DeleteIpForwardingRuleCmd.java | 2 +- .../user/nat}/DisableStaticNatCmd.java | 4 +- .../user/nat}/EnableStaticNatCmd.java | 3 +- .../user/nat}/ListIpForwardingRulesCmd.java | 2 +- .../user/network}/CreateNetworkACLCmd.java | 2 +- .../user/network}/CreateNetworkCmd.java | 2 +- .../user/network}/DeleteNetworkACLCmd.java | 2 +- .../user/network}/DeleteNetworkCmd.java | 4 +- .../user/network}/ListNetworkACLsCmd.java | 2 +- .../network}/ListNetworkOfferingsCmd.java | 2 +- .../user/network}/ListNetworksCmd.java | 2 +- .../user/network}/RestartNetworkCmd.java | 2 +- .../user/network}/UpdateNetworkCmd.java | 2 +- .../user/offering}/ListDiskOfferingsCmd.java | 2 +- .../offering}/ListServiceOfferingsCmd.java | 2 +- .../user/project}/ActivateProjectCmd.java | 2 +- .../user/project}/CreateProjectCmd.java | 2 +- .../user/project}/DeleteProjectCmd.java | 2 +- .../project}/DeleteProjectInvitationCmd.java | 2 +- .../project}/ListProjectInvitationsCmd.java | 2 +- .../user/project}/ListProjectsCmd.java | 2 +- .../user/project}/SuspendProjectCmd.java | 2 +- .../user/project}/UpdateProjectCmd.java | 2 +- .../project}/UpdateProjectInvitationCmd.java | 2 +- .../user/resource}/GetCloudIdentifierCmd.java | 2 +- .../user/resource}/ListHypervisorsCmd.java | 4 +- .../user/resource}/ListResourceLimitsCmd.java | 2 +- .../resource}/UpdateResourceCountCmd.java | 2 +- .../resource}/UpdateResourceLimitCmd.java | 2 +- .../AuthorizeSecurityGroupEgressCmd.java | 2 +- .../AuthorizeSecurityGroupIngressCmd.java | 2 +- .../CreateSecurityGroupCmd.java | 2 +- .../DeleteSecurityGroupCmd.java | 2 +- .../securitygroup}/ListSecurityGroupsCmd.java | 5 +- .../RevokeSecurityGroupEgressCmd.java | 2 +- .../RevokeSecurityGroupIngressCmd.java | 2 +- .../user/snapshot}/CreateSnapshotCmd.java | 2 +- .../snapshot}/CreateSnapshotPolicyCmd.java | 2 +- .../user/snapshot}/DeleteSnapshotCmd.java | 2 +- .../snapshot}/DeleteSnapshotPoliciesCmd.java | 2 +- .../snapshot}/ListSnapshotPoliciesCmd.java | 2 +- .../user/snapshot}/ListSnapshotsCmd.java | 2 +- .../user/ssh}/CreateSSHKeyPairCmd.java | 2 +- .../user/ssh}/DeleteSSHKeyPairCmd.java | 2 +- .../user/ssh}/ListSSHKeyPairsCmd.java | 2 +- .../user/ssh}/RegisterSSHKeyPairCmd.java | 2 +- .../user/tag}/CreateTagsCmd.java | 2 +- .../user/tag}/DeleteTagsCmd.java | 2 +- .../user/tag}/ListTagsCmd.java | 2 +- .../user/template}/CopyTemplateCmd.java | 2 +- .../user/template}/CreateTemplateCmd.java | 2 +- .../user/template}/DeleteTemplateCmd.java | 2 +- .../user/template}/ExtractTemplateCmd.java | 2 +- .../template}/ListTemplatePermissionsCmd.java | 2 +- .../user/template}/ListTemplatesCmd.java | 2 +- .../user/template}/RegisterTemplateCmd.java | 2 +- .../user/template}/UpdateTemplateCmd.java | 2 +- .../UpdateTemplatePermissionsCmd.java | 2 +- .../user/user}/AddVpnUserCmd.java | 2 +- .../user/user}/ListVpnUsersCmd.java | 2 +- .../user/user}/RemoveVpnUserCmd.java | 2 +- .../response/NetworkDeviceResponse.java | 2 +- .../network/ExternalNetworkDeviceManager.java | 8 +- .../commands/test/ActivateProjectCmdTest.java | 2 +- .../test/AddAccountToProjectCmdTest.java | 2 +- .../api/commands/test/AddClusterCmdTest.java | 2 +- .../api/commands/test/AddHostCmdTest.java | 2 +- .../AddNetworkServiceProviderCmdTest.java | 2 +- .../test/AddSecondaryStorageCmdTest.java | 2 +- .../api/commands/test/AddSwiftCmdTest.java | 2 +- .../api/commands/test/AddVpnUserCmdTest.java | 2 +- .../api/commands/test/ListRoutersCmdTest.java | 3 +- client/tomcatconf/commands.properties.in | 478 +++++++++--------- .../virtualrouter_commands.properties.in | 6 +- .../lb/ElasticLoadBalancerManager.java | 2 +- .../lb/ElasticLoadBalancerManagerImpl.java | 2 +- .../commands/ListExternalFirewallsCmd.java | 2 +- server/src/com/cloud/api/ApiDispatcher.java | 2 +- .../src/com/cloud/api/ApiResponseHelper.java | 14 +- server/src/com/cloud/api/ApiServer.java | 8 +- .../api/commands/ListTrafficMonitorsCmd.java | 2 +- .../src/com/cloud/async/AsyncJobManager.java | 2 +- .../com/cloud/async/AsyncJobManagerImpl.java | 2 +- .../baremetal/BareMetalTemplateAdapter.java | 6 +- .../baremetal/BareMetalVmManagerImpl.java | 2 +- .../ConfigurationManagerImpl.java | 38 +- .../ExternalNetworkDeviceManagerImpl.java | 8 +- .../com/cloud/network/NetworkManagerImpl.java | 8 +- .../network/StorageNetworkManagerImpl.java | 8 +- .../network/as/AutoScaleManagerImpl.java | 21 +- .../network/element/VirtualRouterElement.java | 4 +- .../network/firewall/FirewallManagerImpl.java | 2 +- .../network/lb/LoadBalancingRulesManager.java | 2 +- .../lb/LoadBalancingRulesManagerImpl.java | 8 +- .../VirtualNetworkApplianceManagerImpl.java | 2 +- .../cloud/network/rules/RulesManagerImpl.java | 2 +- .../security/SecurityGroupManagerImpl.java | 8 +- .../network/vpc/NetworkACLManagerImpl.java | 2 +- .../vpn/RemoteAccessVpnManagerImpl.java | 2 +- .../cloud/resource/ResourceManagerImpl.java | 19 +- .../cloud/server/ManagementServerImpl.java | 66 +-- .../response/ExternalFirewallResponse.java | 2 +- .../ExternalLoadBalancerResponse.java | 2 +- .../api/response/NwDeviceDhcpResponse.java | 2 +- .../response/NwDevicePxeServerResponse.java | 2 +- .../com/cloud/storage/StorageManagerImpl.java | 8 +- .../storage/snapshot/SnapshotManagerImpl.java | 7 +- .../snapshot/SnapshotSchedulerImpl.java | 2 +- .../com/cloud/storage/swift/SwiftManager.java | 8 +- .../cloud/storage/swift/SwiftManagerImpl.java | 8 +- .../cloud/storage/upload/UploadListener.java | 4 +- .../cloud/tags/TaggedResourceManagerImpl.java | 3 +- .../template/HyervisorTemplateAdapter.java | 8 +- .../com/cloud/template/TemplateAdapter.java | 8 +- .../cloud/template/TemplateAdapterBase.java | 8 +- .../cloud/template/TemplateManagerImpl.java | 8 +- .../com/cloud/user/AccountManagerImpl.java | 12 +- .../src/com/cloud/user/DomainManagerImpl.java | 4 +- .../src/com/cloud/vm/UserVmManagerImpl.java | 12 +- .../cloud/network/MockNetworkManagerImpl.java | 8 +- .../cloud/user/MockAccountManagerImpl.java | 12 +- .../com/cloud/user/MockDomainManagerImpl.java | 4 +- .../com/cloud/vm/MockUserVmManagerImpl.java | 6 +- .../vpc/MockConfigurationManagerImpl.java | 38 +- .../com/cloud/vpc/MockNetworkManagerImpl.java | 8 +- 325 files changed, 816 insertions(+), 883 deletions(-) rename api/src/org/apache/cloudstack/api/{admin/account/command => command/admin/account}/CreateAccountCmd.java (99%) rename api/src/org/apache/cloudstack/api/{admin/account/command => command/admin/account}/DeleteAccountCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/account/command => command/admin/account}/DisableAccountCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/account/command => command/admin/account}/EnableAccountCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/account/command => command/admin/account}/LockAccountCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/account/command => command/admin/account}/UpdateAccountCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/autoscale/command => command/admin/autoscale}/CreateCounterCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/autoscale/command => command/admin/autoscale}/DeleteCounterCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/cluster/command => command/admin/cluster}/AddClusterCmd.java (99%) rename api/src/org/apache/cloudstack/api/{admin/cluster/command => command/admin/cluster}/DeleteClusterCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/cluster/command => command/admin/cluster}/ListClustersCmd.java (97%) rename api/src/org/apache/cloudstack/api/{admin/cluster/command => command/admin/cluster}/UpdateClusterCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/config/command => command/admin/config}/ListCfgsByCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/config/command => command/admin/config}/ListHypervisorCapabilitiesCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/config/command => command/admin/config}/UpdateCfgCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/config/command => command/admin/config}/UpdateHypervisorCapabilitiesCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/domain/command => command/admin/domain}/CreateDomainCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/domain/command => command/admin/domain}/DeleteDomainCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/domain/command => command/admin/domain}/ListDomainChildrenCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/domain/command => command/admin/domain}/ListDomainsCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/domain/command => command/admin/domain}/UpdateDomainCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/host/command => command/admin/host}/AddHostCmd.java (99%) rename api/src/org/apache/cloudstack/api/{admin/host/command => command/admin/host}/AddSecondaryStorageCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/host/command => command/admin/host}/CancelMaintenanceCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/host/command => command/admin/host}/DeleteHostCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/host/command => command/admin/host}/ListHostsCmd.java (99%) rename api/src/org/apache/cloudstack/api/{admin/host/command => command/admin/host}/PrepareForMaintenanceCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/host/command => command/admin/host}/ReconnectHostCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/host/command => command/admin/host}/UpdateHostCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/host/command => command/admin/host}/UpdateHostPasswordCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/ldap/command => command/admin/ldap}/LDAPConfigCmd.java (99%) rename api/src/org/apache/cloudstack/api/{admin/ldap/command => command/admin/ldap}/LDAPRemoveCmd.java (97%) rename api/src/org/apache/cloudstack/api/{admin/network/command => command/admin/network}/AddNetworkDeviceCmd.java (96%) rename api/src/org/apache/cloudstack/api/{admin/network/command => command/admin/network}/AddNetworkServiceProviderCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/network/command => command/admin/network}/CreateNetworkOfferingCmd.java (99%) rename api/src/org/apache/cloudstack/api/{admin/network/command => command/admin/network}/CreatePhysicalNetworkCmd.java (99%) rename api/src/org/apache/cloudstack/api/{admin/network/command => command/admin/network}/CreateStorageNetworkIpRangeCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/network/command => command/admin/network}/DeleteNetworkDeviceCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/network/command => command/admin/network}/DeleteNetworkOfferingCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/network/command => command/admin/network}/DeleteNetworkServiceProviderCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/network/command => command/admin/network}/DeletePhysicalNetworkCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/network/command => command/admin/network}/DeleteStorageNetworkIpRangeCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/network/command => command/admin/network}/ListNetworkDeviceCmd.java (96%) rename api/src/org/apache/cloudstack/api/{admin/network/command => command/admin/network}/ListNetworkServiceProvidersCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/network/command => command/admin/network}/ListPhysicalNetworksCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/network/command => command/admin/network}/ListStorageNetworkIpRangeCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/network/command => command/admin/network}/ListSupportedNetworkServicesCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/network/command => command/admin/network}/UpdateNetworkOfferingCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/network/command => command/admin/network}/UpdateNetworkServiceProviderCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/network/command => command/admin/network}/UpdatePhysicalNetworkCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/network/command => command/admin/network}/UpdateStorageNetworkIpRangeCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/offering/command => command/admin/offering}/CreateDiskOfferingCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/offering/command => command/admin/offering}/CreateServiceOfferingCmd.java (99%) rename api/src/org/apache/cloudstack/api/{admin/offering/command => command/admin/offering}/DeleteDiskOfferingCmd.java (97%) rename api/src/org/apache/cloudstack/api/{admin/offering/command => command/admin/offering}/DeleteServiceOfferingCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/offering/command => command/admin/offering}/UpdateDiskOfferingCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/offering/command => command/admin/offering}/UpdateServiceOfferingCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/pod/command => command/admin/pod}/CreatePodCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/pod/command => command/admin/pod}/DeletePodCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/pod/command => command/admin/pod}/ListPodsByCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/pod/command => command/admin/pod}/UpdatePodCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/resource/command => command/admin/resource}/ListAlertsCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/resource/command => command/admin/resource}/ListCapacityCmd.java (99%) rename api/src/org/apache/cloudstack/api/{admin/resource/command => command/admin/resource}/UploadCustomCertificateCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/router/command => command/admin/router}/ConfigureVirtualRouterElementCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/router/command => command/admin/router}/CreateVirtualRouterElementCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/router/command => command/admin/router}/DestroyRouterCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/router/command => command/admin/router}/ListRoutersCmd.java (91%) rename api/src/org/apache/cloudstack/api/{admin/router/command => command/admin/router}/ListVirtualRouterElementsCmd.java (97%) rename api/src/org/apache/cloudstack/api/{admin/router/command => command/admin/router}/RebootRouterCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/router/command => command/admin/router}/StartRouterCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/router/command => command/admin/router}/StopRouterCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/router/command => command/admin/router}/UpgradeRouterCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/storagepool/command => command/admin/storagepool}/CancelPrimaryStorageMaintenanceCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/storagepool/command => command/admin/storagepool}/CreateStoragePoolCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/storagepool/command => command/admin/storagepool}/DeletePoolCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/storagepool/command => command/admin/storagepool}/ListStoragePoolsCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/storagepool/command => command/admin/storagepool}/PreparePrimaryStorageForMaintenanceCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/storagepool/command => command/admin/storagepool}/UpdateStoragePoolCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/swift/command => command/admin/swift}/AddSwiftCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/swift/command => command/admin/swift}/ListSwiftsCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/systemvm/command => command/admin/systemvm}/DestroySystemVmCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/systemvm/command => command/admin/systemvm}/ListSystemVMsCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/systemvm/command => command/admin/systemvm}/MigrateSystemVMCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/systemvm/command => command/admin/systemvm}/RebootSystemVmCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/systemvm/command => command/admin/systemvm}/StartSystemVMCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/systemvm/command => command/admin/systemvm}/StopSystemVmCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/systemvm/command => command/admin/systemvm}/UpgradeSystemVMCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/template/command => command/admin/template}/PrepareTemplateCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/usage/command => command/admin/usage}/AddTrafficTypeCmd.java (99%) rename api/src/org/apache/cloudstack/api/{admin/usage/command => command/admin/usage}/DeleteTrafficTypeCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/usage/command => command/admin/usage}/ListTrafficTypeImplementorsCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/usage/command => command/admin/usage}/ListTrafficTypesCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/usage/command => command/admin/usage}/UpdateTrafficTypeCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/user/command => command/admin/user}/CreateUserCmd.java (99%) rename api/src/org/apache/cloudstack/api/{admin/user/command => command/admin/user}/DeleteUserCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/user/command => command/admin/user}/DisableUserCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/user/command => command/admin/user}/EnableUserCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/user/command => command/admin/user}/GetUserCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/user/command => command/admin/user}/ListUsersCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/user/command => command/admin/user}/LockUserCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/user/command => command/admin/user}/RegisterCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/user/command => command/admin/user}/UpdateUserCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/vlan/command => command/admin/vlan}/CreateVlanIpRangeCmd.java (99%) rename api/src/org/apache/cloudstack/api/{admin/vlan/command => command/admin/vlan}/DeleteVlanIpRangeCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/vlan/command => command/admin/vlan}/ListVlanIpRangesCmd.java (99%) rename api/src/org/apache/cloudstack/api/{admin/vm/command => command/admin/vm}/AssignVMCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/vm/command => command/admin/vm}/MigrateVMCmd.java (99%) rename api/src/org/apache/cloudstack/api/{admin/vm/command => command/admin/vm}/RecoverVMCmd.java (97%) rename api/src/org/apache/cloudstack/api/{admin/vpc/command => command/admin/vpc}/CreatePrivateGatewayCmd.java (99%) rename api/src/org/apache/cloudstack/api/{admin/vpc/command => command/admin/vpc}/CreateVPCOfferingCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/vpc/command => command/admin/vpc}/DeletePrivateGatewayCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/vpc/command => command/admin/vpc}/DeleteVPCOfferingCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/vpc/command => command/admin/vpc}/UpdateVPCOfferingCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/zone/command => command/admin/zone}/CreateZoneCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/zone/command => command/admin/zone}/DeleteZoneCmd.java (96%) rename api/src/org/apache/cloudstack/api/{admin/zone/command => command/admin/zone}/MarkDefaultZoneForAccountCmd.java (97%) rename api/src/org/apache/cloudstack/api/{admin/zone/command => command/admin/zone}/UpdateZoneCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/account/command => command/user/account}/AddAccountToProjectCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/account/command => command/user/account}/DeleteAccountFromProjectCmd.java (97%) rename api/src/org/apache/cloudstack/api/{user/account/command => command/user/account}/ListAccountsCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/account/command => command/user/account}/ListProjectAccountsCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/address/command => command/user/address}/AssociateIPAddrCmd.java (99%) rename api/src/org/apache/cloudstack/api/{user/address/command => command/user/address}/DisassociateIPAddrCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/address/command => command/user/address}/ListPublicIpAddressesCmd.java (99%) rename api/src/org/apache/cloudstack/api/{user/autoscale/command => command/user/autoscale}/CreateAutoScalePolicyCmd.java (99%) rename api/src/org/apache/cloudstack/api/{user/autoscale/command => command/user/autoscale}/CreateAutoScaleVmGroupCmd.java (99%) rename api/src/org/apache/cloudstack/api/{user/autoscale/command => command/user/autoscale}/CreateAutoScaleVmProfileCmd.java (99%) rename api/src/org/apache/cloudstack/api/{user/autoscale/command => command/user/autoscale}/CreateConditionCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/autoscale/command => command/user/autoscale}/DeleteAutoScalePolicyCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/autoscale/command => command/user/autoscale}/DeleteAutoScaleVmGroupCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/autoscale/command => command/user/autoscale}/DeleteAutoScaleVmProfileCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/autoscale/command => command/user/autoscale}/DeleteConditionCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/autoscale/command => command/user/autoscale}/DisableAutoScaleVmGroupCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/autoscale/command => command/user/autoscale}/EnableAutoScaleVmGroupCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/autoscale/command => command/user/autoscale}/ListAutoScalePoliciesCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/autoscale/command => command/user/autoscale}/ListAutoScaleVmGroupsCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/autoscale/command => command/user/autoscale}/ListAutoScaleVmProfilesCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/autoscale/command => command/user/autoscale}/ListConditionsCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/autoscale/command => command/user/autoscale}/ListCountersCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/autoscale/command => command/user/autoscale}/UpdateAutoScalePolicyCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/autoscale/command => command/user/autoscale}/UpdateAutoScaleVmGroupCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/autoscale/command => command/user/autoscale}/UpdateAutoScaleVmProfileCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/config/command => command/user/config}/ListCapabilitiesCmd.java (97%) rename api/src/org/apache/cloudstack/api/{user/event/command => command/user/event}/ListEventTypesCmd.java (97%) rename api/src/org/apache/cloudstack/api/{user/event/command => command/user/event}/ListEventsCmd.java (95%) rename api/src/org/apache/cloudstack/api/{user/firewall/command => command/user/firewall}/CreateFirewallRuleCmd.java (99%) rename api/src/org/apache/cloudstack/api/{user/firewall/command => command/user/firewall}/CreatePortForwardingRuleCmd.java (99%) rename api/src/org/apache/cloudstack/api/{user/firewall/command => command/user/firewall}/DeleteFirewallRuleCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/firewall/command => command/user/firewall}/DeletePortForwardingRuleCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/firewall/command => command/user/firewall}/ListFirewallRulesCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/firewall/command => command/user/firewall}/ListPortForwardingRulesCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/firewall/command => command/user/firewall}/UpdatePortForwardingRuleCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/guest/command => command/user/guest}/ListGuestOsCategoriesCmd.java (96%) rename api/src/org/apache/cloudstack/api/{user/guest/command => command/user/guest}/ListGuestOsCmd.java (97%) rename api/src/org/apache/cloudstack/api/{user/iso/command => command/user/iso}/AttachIsoCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/iso/command => command/user/iso}/DeleteIsoCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/iso/command => command/user/iso}/DetachIsoCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/iso/command => command/user/iso}/ExtractIsoCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/iso/command => command/user/iso}/ListIsoPermissionsCmd.java (96%) rename api/src/org/apache/cloudstack/api/{user/iso/command => command/user/iso}/ListIsosCmd.java (99%) rename api/src/org/apache/cloudstack/api/{user/iso/command => command/user/iso}/RegisterIsoCmd.java (99%) rename api/src/org/apache/cloudstack/api/{user/iso/command => command/user/iso}/UpdateIsoCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/iso/command => command/user/iso}/UpdateIsoPermissionsCmd.java (97%) rename api/src/org/apache/cloudstack/api/{user/job/command => command/user/job}/ListAsyncJobsCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/job/command => command/user/job}/QueryAsyncJobResultCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/lb/command => command/user/loadbalancer}/AssignToLoadBalancerRuleCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/lb/command => command/user/loadbalancer}/CreateLBStickinessPolicyCmd.java (99%) rename api/src/org/apache/cloudstack/api/{user/lb/command => command/user/loadbalancer}/CreateLoadBalancerRuleCmd.java (99%) rename api/src/org/apache/cloudstack/api/{user/lb/command => command/user/loadbalancer}/DeleteLBStickinessPolicyCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/lb/command => command/user/loadbalancer}/DeleteLoadBalancerRuleCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/lb/command => command/user/loadbalancer}/ListLBStickinessPoliciesCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/lb/command => command/user/loadbalancer}/ListLoadBalancerRuleInstancesCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/lb/command => command/user/loadbalancer}/ListLoadBalancerRulesCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/lb/command => command/user/loadbalancer}/RemoveFromLoadBalancerRuleCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/lb/command => command/user/loadbalancer}/UpdateLoadBalancerRuleCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/nat/command => command/user/nat}/CreateIpForwardingRuleCmd.java (99%) rename api/src/org/apache/cloudstack/api/{user/nat/command => command/user/nat}/DeleteIpForwardingRuleCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/nat/command => command/user/nat}/DisableStaticNatCmd.java (97%) rename api/src/org/apache/cloudstack/api/{user/nat/command => command/user/nat}/EnableStaticNatCmd.java (97%) rename api/src/org/apache/cloudstack/api/{user/nat/command => command/user/nat}/ListIpForwardingRulesCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/network/command => command/user/network}/CreateNetworkACLCmd.java (99%) rename api/src/org/apache/cloudstack/api/{user/network/command => command/user/network}/CreateNetworkCmd.java (99%) rename api/src/org/apache/cloudstack/api/{user/network/command => command/user/network}/DeleteNetworkACLCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/network/command => command/user/network}/DeleteNetworkCmd.java (96%) rename api/src/org/apache/cloudstack/api/{user/network/command => command/user/network}/ListNetworkACLsCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/network/command => command/user/network}/ListNetworkOfferingsCmd.java (99%) rename api/src/org/apache/cloudstack/api/{user/network/command => command/user/network}/ListNetworksCmd.java (99%) rename api/src/org/apache/cloudstack/api/{user/network/command => command/user/network}/RestartNetworkCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/network/command => command/user/network}/UpdateNetworkCmd.java (99%) rename api/src/org/apache/cloudstack/api/{user/offering/command => command/user/offering}/ListDiskOfferingsCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/offering/command => command/user/offering}/ListServiceOfferingsCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/project/command => command/user/project}/ActivateProjectCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/project/command => command/user/project}/CreateProjectCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/project/command => command/user/project}/DeleteProjectCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/project/command => command/user/project}/DeleteProjectInvitationCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/project/command => command/user/project}/ListProjectInvitationsCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/project/command => command/user/project}/ListProjectsCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/project/command => command/user/project}/SuspendProjectCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/project/command => command/user/project}/UpdateProjectCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/project/command => command/user/project}/UpdateProjectInvitationCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/resource/command => command/user/resource}/GetCloudIdentifierCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/resource/command => command/user/resource}/ListHypervisorsCmd.java (96%) rename api/src/org/apache/cloudstack/api/{user/resource/command => command/user/resource}/ListResourceLimitsCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/resource/command => command/user/resource}/UpdateResourceCountCmd.java (99%) rename api/src/org/apache/cloudstack/api/{user/resource/command => command/user/resource}/UpdateResourceLimitCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/securitygroup/command => command/user/securitygroup}/AuthorizeSecurityGroupEgressCmd.java (99%) rename api/src/org/apache/cloudstack/api/{user/securitygroup/command => command/user/securitygroup}/AuthorizeSecurityGroupIngressCmd.java (99%) rename api/src/org/apache/cloudstack/api/{user/securitygroup/command => command/user/securitygroup}/CreateSecurityGroupCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/securitygroup/command => command/user/securitygroup}/DeleteSecurityGroupCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/securitygroup/command => command/user/securitygroup}/ListSecurityGroupsCmd.java (94%) rename api/src/org/apache/cloudstack/api/{user/securitygroup/command => command/user/securitygroup}/RevokeSecurityGroupEgressCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/securitygroup/command => command/user/securitygroup}/RevokeSecurityGroupIngressCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/snapshot/command => command/user/snapshot}/CreateSnapshotCmd.java (99%) rename api/src/org/apache/cloudstack/api/{user/snapshot/command => command/user/snapshot}/CreateSnapshotPolicyCmd.java (99%) rename api/src/org/apache/cloudstack/api/{user/snapshot/command => command/user/snapshot}/DeleteSnapshotCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/snapshot/command => command/user/snapshot}/DeleteSnapshotPoliciesCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/snapshot/command => command/user/snapshot}/ListSnapshotPoliciesCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/snapshot/command => command/user/snapshot}/ListSnapshotsCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/ssh/command => command/user/ssh}/CreateSSHKeyPairCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/ssh/command => command/user/ssh}/DeleteSSHKeyPairCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/ssh/command => command/user/ssh}/ListSSHKeyPairsCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/ssh/command => command/user/ssh}/RegisterSSHKeyPairCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/tag/command => command/user/tag}/CreateTagsCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/tag/command => command/user/tag}/DeleteTagsCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/tag/command => command/user/tag}/ListTagsCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/template/command => command/user/template}/CopyTemplateCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/template/command => command/user/template}/CreateTemplateCmd.java (99%) rename api/src/org/apache/cloudstack/api/{user/template/command => command/user/template}/DeleteTemplateCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/template/command => command/user/template}/ExtractTemplateCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/template/command => command/user/template}/ListTemplatePermissionsCmd.java (96%) rename api/src/org/apache/cloudstack/api/{user/template/command => command/user/template}/ListTemplatesCmd.java (99%) rename api/src/org/apache/cloudstack/api/{user/template/command => command/user/template}/RegisterTemplateCmd.java (99%) rename api/src/org/apache/cloudstack/api/{user/template/command => command/user/template}/UpdateTemplateCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/template/command => command/user/template}/UpdateTemplatePermissionsCmd.java (97%) rename api/src/org/apache/cloudstack/api/{user/user/command => command/user/user}/AddVpnUserCmd.java (99%) rename api/src/org/apache/cloudstack/api/{user/user/command => command/user/user}/ListVpnUsersCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/user/command => command/user/user}/RemoveVpnUserCmd.java (98%) rename api/src/org/apache/cloudstack/api/{admin/network => }/response/NetworkDeviceResponse.java (95%) diff --git a/api/src/com/cloud/api/commands/UpdateTemplateOrIsoCmd.java b/api/src/com/cloud/api/commands/UpdateTemplateOrIsoCmd.java index 01123e9a4f0..407b4c90058 100755 --- a/api/src/com/cloud/api/commands/UpdateTemplateOrIsoCmd.java +++ b/api/src/com/cloud/api/commands/UpdateTemplateOrIsoCmd.java @@ -16,7 +16,7 @@ // under the License. package com.cloud.api.commands; -import org.apache.cloudstack.api.user.iso.command.UpdateIsoCmd; +import org.apache.cloudstack.api.command.user.iso.UpdateIsoCmd; import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; diff --git a/api/src/com/cloud/configuration/ConfigurationService.java b/api/src/com/cloud/configuration/ConfigurationService.java index 56f036e8911..48a060719c6 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 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 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 org.apache.cloudstack.api.admin.zone.command.DeleteZoneCmd; -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; -import org.apache.cloudstack.api.admin.network.command.UpdateNetworkOfferingCmd; -import org.apache.cloudstack.api.admin.pod.command.UpdatePodCmd; -import org.apache.cloudstack.api.admin.zone.command.UpdateZoneCmd; +import org.apache.cloudstack.api.command.admin.ldap.LDAPRemoveCmd; +import org.apache.cloudstack.api.command.admin.network.CreateNetworkOfferingCmd; +import org.apache.cloudstack.api.command.admin.offering.CreateServiceOfferingCmd; +import org.apache.cloudstack.api.command.admin.vlan.CreateVlanIpRangeCmd; +import org.apache.cloudstack.api.command.admin.offering.*; +import org.apache.cloudstack.api.command.admin.pod.DeletePodCmd; +import org.apache.cloudstack.api.command.admin.vlan.DeleteVlanIpRangeCmd; +import org.apache.cloudstack.api.command.admin.zone.CreateZoneCmd; +import org.apache.cloudstack.api.command.admin.offering.DeleteDiskOfferingCmd; +import org.apache.cloudstack.api.command.admin.network.DeleteNetworkOfferingCmd; +import org.apache.cloudstack.api.command.admin.zone.DeleteZoneCmd; +import org.apache.cloudstack.api.command.admin.ldap.LDAPConfigCmd; +import org.apache.cloudstack.api.command.admin.config.UpdateCfgCmd; +import org.apache.cloudstack.api.command.admin.network.UpdateNetworkOfferingCmd; +import org.apache.cloudstack.api.command.admin.pod.UpdatePodCmd; +import org.apache.cloudstack.api.command.user.network.ListNetworkOfferingsCmd; +import org.apache.cloudstack.api.command.admin.offering.UpdateDiskOfferingCmd; +import org.apache.cloudstack.api.command.admin.zone.UpdateZoneCmd; import com.cloud.dc.DataCenter; import com.cloud.dc.Pod; import com.cloud.dc.Vlan; diff --git a/api/src/com/cloud/network/NetworkService.java b/api/src/com/cloud/network/NetworkService.java index b5ba1e3e84d..140563ec99f 100755 --- a/api/src/com/cloud/network/NetworkService.java +++ b/api/src/com/cloud/network/NetworkService.java @@ -20,10 +20,10 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.cloudstack.api.admin.usage.command.ListTrafficTypeImplementorsCmd; -import org.apache.cloudstack.api.user.network.command.CreateNetworkCmd; -import org.apache.cloudstack.api.user.network.command.ListNetworksCmd; -import org.apache.cloudstack.api.user.network.command.RestartNetworkCmd; +import org.apache.cloudstack.api.command.admin.usage.ListTrafficTypeImplementorsCmd; +import org.apache.cloudstack.api.command.user.network.RestartNetworkCmd; +import org.apache.cloudstack.api.command.user.network.CreateNetworkCmd; +import org.apache.cloudstack.api.command.user.network.ListNetworksCmd; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientAddressCapacityException; import com.cloud.exception.InsufficientCapacityException; diff --git a/api/src/com/cloud/network/StorageNetworkService.java b/api/src/com/cloud/network/StorageNetworkService.java index 7a7c5cad91d..1bda247179c 100755 --- a/api/src/com/cloud/network/StorageNetworkService.java +++ b/api/src/com/cloud/network/StorageNetworkService.java @@ -19,11 +19,11 @@ package com.cloud.network; import java.sql.SQLException; import java.util.List; -import org.apache.cloudstack.api.admin.network.command.CreateStorageNetworkIpRangeCmd; -import org.apache.cloudstack.api.admin.network.command.DeleteStorageNetworkIpRangeCmd; -import org.apache.cloudstack.api.admin.network.command.UpdateStorageNetworkIpRangeCmd; -import org.apache.cloudstack.api.admin.network.command.ListStorageNetworkIpRangeCmd; +import org.apache.cloudstack.api.command.admin.network.*; +import org.apache.cloudstack.api.command.admin.network.UpdateStorageNetworkIpRangeCmd; +import org.apache.cloudstack.api.command.admin.network.DeleteStorageNetworkIpRangeCmd; import com.cloud.dc.StorageNetworkIpRange; +import org.apache.cloudstack.api.command.admin.network.CreateStorageNetworkIpRangeCmd; public interface StorageNetworkService { StorageNetworkIpRange createIpRange(CreateStorageNetworkIpRangeCmd cmd) throws SQLException; diff --git a/api/src/com/cloud/network/VirtualNetworkApplianceService.java b/api/src/com/cloud/network/VirtualNetworkApplianceService.java index 088fcc2e327..7b553b29a7f 100644 --- a/api/src/com/cloud/network/VirtualNetworkApplianceService.java +++ b/api/src/com/cloud/network/VirtualNetworkApplianceService.java @@ -16,7 +16,7 @@ // under the License. package com.cloud.network; -import org.apache.cloudstack.api.admin.router.command.UpgradeRouterCmd; +import org.apache.cloudstack.api.command.admin.router.UpgradeRouterCmd; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceUnavailableException; diff --git a/api/src/com/cloud/network/as/AutoScaleService.java b/api/src/com/cloud/network/as/AutoScaleService.java index a6b2f487768..daa8d191366 100644 --- a/api/src/com/cloud/network/as/AutoScaleService.java +++ b/api/src/com/cloud/network/as/AutoScaleService.java @@ -18,15 +18,12 @@ package com.cloud.network.as; import java.util.List; -import org.apache.cloudstack.api.admin.autoscale.command.CreateCounterCmd; -import org.apache.cloudstack.api.user.autoscale.command.CreateAutoScalePolicyCmd; -import org.apache.cloudstack.api.user.autoscale.command.CreateAutoScaleVmGroupCmd; -import org.apache.cloudstack.api.user.autoscale.command.CreateAutoScaleVmProfileCmd; -import org.apache.cloudstack.api.user.autoscale.command.*; -import org.apache.cloudstack.api.user.autoscale.command.ListAutoScalePoliciesCmd; -import org.apache.cloudstack.api.user.autoscale.command.ListConditionsCmd; -import org.apache.cloudstack.api.user.autoscale.command.UpdateAutoScaleVmGroupCmd; -import org.apache.cloudstack.api.user.autoscale.command.UpdateAutoScaleVmProfileCmd; +import org.apache.cloudstack.api.command.admin.autoscale.CreateCounterCmd; +import org.apache.cloudstack.api.command.user.autoscale.*; +import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScalePolicyCmd; +import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScaleVmProfileCmd; +import org.apache.cloudstack.api.command.user.autoscale.ListAutoScalePoliciesCmd; +import org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScaleVmGroupCmd; import com.cloud.exception.ResourceInUseException; import com.cloud.exception.ResourceUnavailableException; diff --git a/api/src/com/cloud/network/element/VirtualRouterElementService.java b/api/src/com/cloud/network/element/VirtualRouterElementService.java index 05707e8fe88..3ba2045cfd6 100644 --- a/api/src/com/cloud/network/element/VirtualRouterElementService.java +++ b/api/src/com/cloud/network/element/VirtualRouterElementService.java @@ -18,8 +18,8 @@ package com.cloud.network.element; import java.util.List; -import org.apache.cloudstack.api.admin.router.command.ConfigureVirtualRouterElementCmd; -import org.apache.cloudstack.api.admin.router.command.ListVirtualRouterElementsCmd; +import org.apache.cloudstack.api.command.admin.router.ConfigureVirtualRouterElementCmd; +import org.apache.cloudstack.api.command.admin.router.ListVirtualRouterElementsCmd; import com.cloud.network.VirtualRouterProvider; import com.cloud.network.VirtualRouterProvider.VirtualRouterProviderType; import com.cloud.utils.component.PluggableService; diff --git a/api/src/com/cloud/network/firewall/FirewallService.java b/api/src/com/cloud/network/firewall/FirewallService.java index 066d5fb6004..3858499b2bb 100644 --- a/api/src/com/cloud/network/firewall/FirewallService.java +++ b/api/src/com/cloud/network/firewall/FirewallService.java @@ -19,7 +19,7 @@ package com.cloud.network.firewall; import java.util.List; -import org.apache.cloudstack.api.user.firewall.command.ListFirewallRulesCmd; +import org.apache.cloudstack.api.command.user.firewall.ListFirewallRulesCmd; import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.rules.FirewallRule; diff --git a/api/src/com/cloud/network/firewall/NetworkACLService.java b/api/src/com/cloud/network/firewall/NetworkACLService.java index 4c0f06c567c..a1fb02cb71f 100644 --- a/api/src/com/cloud/network/firewall/NetworkACLService.java +++ b/api/src/com/cloud/network/firewall/NetworkACLService.java @@ -19,7 +19,7 @@ package com.cloud.network.firewall; import java.util.List; -import org.apache.cloudstack.api.user.network.command.ListNetworkACLsCmd; +import org.apache.cloudstack.api.command.user.network.ListNetworkACLsCmd; import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.rules.FirewallRule; diff --git a/api/src/com/cloud/network/lb/LoadBalancingRulesService.java b/api/src/com/cloud/network/lb/LoadBalancingRulesService.java index 3aec8324486..4081f6efc2c 100644 --- a/api/src/com/cloud/network/lb/LoadBalancingRulesService.java +++ b/api/src/com/cloud/network/lb/LoadBalancingRulesService.java @@ -18,9 +18,9 @@ package com.cloud.network.lb; import java.util.List; -import org.apache.cloudstack.api.user.lb.command.*; -import org.apache.cloudstack.api.user.lb.command.CreateLBStickinessPolicyCmd; -import org.apache.cloudstack.api.user.lb.command.UpdateLoadBalancerRuleCmd; +import org.apache.cloudstack.api.command.user.loadbalancer.*; +import org.apache.cloudstack.api.command.user.loadbalancer.CreateLBStickinessPolicyCmd; +import org.apache.cloudstack.api.command.user.loadbalancer.UpdateLoadBalancerRuleCmd; import com.cloud.exception.InsufficientAddressCapacityException; import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceUnavailableException; @@ -28,7 +28,6 @@ import com.cloud.network.rules.LoadBalancer; import com.cloud.network.rules.StickinessPolicy; import com.cloud.uservm.UserVm; import com.cloud.utils.Pair; -import org.apache.cloudstack.api.user.lb.command.ListLoadBalancerRulesCmd; public interface LoadBalancingRulesService { diff --git a/api/src/com/cloud/network/rules/RulesService.java b/api/src/com/cloud/network/rules/RulesService.java index 613929ba003..80c96d558c4 100644 --- a/api/src/com/cloud/network/rules/RulesService.java +++ b/api/src/com/cloud/network/rules/RulesService.java @@ -18,7 +18,7 @@ package com.cloud.network.rules; import java.util.List; -import org.apache.cloudstack.api.user.firewall.command.ListPortForwardingRulesCmd; +import org.apache.cloudstack.api.command.user.firewall.ListPortForwardingRulesCmd; import com.cloud.exception.InsufficientAddressCapacityException; import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceUnavailableException; diff --git a/api/src/com/cloud/network/security/SecurityGroupService.java b/api/src/com/cloud/network/security/SecurityGroupService.java index 640b9accd8a..be86efda1bb 100644 --- a/api/src/com/cloud/network/security/SecurityGroupService.java +++ b/api/src/com/cloud/network/security/SecurityGroupService.java @@ -18,9 +18,8 @@ package com.cloud.network.security; import java.util.List; -import org.apache.cloudstack.api.user.securitygroup.command.*; -import org.apache.cloudstack.api.user.securitygroup.command.AuthorizeSecurityGroupIngressCmd; -import org.apache.cloudstack.api.user.securitygroup.command.CreateSecurityGroupCmd; +import org.apache.cloudstack.api.command.user.securitygroup.*; +import org.apache.cloudstack.api.command.user.securitygroup.AuthorizeSecurityGroupIngressCmd; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.PermissionDeniedException; import com.cloud.exception.ResourceInUseException; diff --git a/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java b/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java index 6f6a817b8ba..fdc1ee960c5 100644 --- a/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java +++ b/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java @@ -18,8 +18,8 @@ package com.cloud.network.vpn; import java.util.List; +import org.apache.cloudstack.api.command.user.user.ListVpnUsersCmd; import org.apache.cloudstack.api.user.vpn.command.ListRemoteAccessVpnsCmd; -import org.apache.cloudstack.api.user.user.command.ListVpnUsersCmd; import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.RemoteAccessVpn; diff --git a/api/src/com/cloud/resource/ResourceService.java b/api/src/com/cloud/resource/ResourceService.java index a7ee1de50e0..4d1c0bad4dd 100755 --- a/api/src/com/cloud/resource/ResourceService.java +++ b/api/src/com/cloud/resource/ResourceService.java @@ -18,16 +18,12 @@ package com.cloud.resource; import java.util.List; -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 org.apache.cloudstack.api.admin.swift.command.AddSwiftCmd; -import org.apache.cloudstack.api.admin.host.command.CancelMaintenanceCmd; -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; +import org.apache.cloudstack.api.command.admin.cluster.AddClusterCmd; +import org.apache.cloudstack.api.command.admin.cluster.DeleteClusterCmd; +import org.apache.cloudstack.api.command.admin.host.*; +import org.apache.cloudstack.api.command.admin.swift.AddSwiftCmd; +import org.apache.cloudstack.api.command.admin.swift.ListSwiftsCmd; +import org.apache.cloudstack.api.command.admin.host.PrepareForMaintenanceCmd; import com.cloud.exception.DiscoveryException; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceInUseException; @@ -36,7 +32,7 @@ import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.org.Cluster; import com.cloud.storage.Swift; import com.cloud.utils.fsm.NoTransitionException; -import org.apache.cloudstack.api.admin.host.command.ReconnectHostCmd; +import org.apache.cloudstack.api.command.admin.host.ReconnectHostCmd; public interface ResourceService { /** diff --git a/api/src/com/cloud/server/ManagementService.java b/api/src/com/cloud/server/ManagementService.java index 75064bfaa42..06df410be49 100755 --- a/api/src/com/cloud/server/ManagementService.java +++ b/api/src/com/cloud/server/ManagementService.java @@ -24,44 +24,44 @@ import java.util.Set; import com.cloud.alert.Alert; import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.admin.cluster.command.ListClustersCmd; -import org.apache.cloudstack.api.admin.host.command.ListHostsCmd; -import org.apache.cloudstack.api.admin.host.command.UpdateHostPasswordCmd; -import org.apache.cloudstack.api.admin.pod.command.ListPodsByCmd; -import org.apache.cloudstack.api.admin.resource.command.ListAlertsCmd; -import org.apache.cloudstack.api.admin.resource.command.ListCapacityCmd; -import org.apache.cloudstack.api.admin.router.command.ListRoutersCmd; -import org.apache.cloudstack.api.user.address.command.ListPublicIpAddressesCmd; -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; -import org.apache.cloudstack.api.user.ssh.command.CreateSSHKeyPairCmd; -import org.apache.cloudstack.api.user.ssh.command.DeleteSSHKeyPairCmd; -import org.apache.cloudstack.api.admin.systemvm.command.DestroySystemVmCmd; +import org.apache.cloudstack.api.command.admin.cluster.ListClustersCmd; +import org.apache.cloudstack.api.command.admin.host.ListHostsCmd; +import org.apache.cloudstack.api.command.admin.host.UpdateHostPasswordCmd; +import org.apache.cloudstack.api.command.admin.pod.ListPodsByCmd; +import org.apache.cloudstack.api.command.admin.resource.ListAlertsCmd; +import org.apache.cloudstack.api.command.admin.resource.ListCapacityCmd; +import org.apache.cloudstack.api.command.admin.router.ListRoutersCmd; +import org.apache.cloudstack.api.command.admin.domain.UpdateDomainCmd; +import org.apache.cloudstack.api.command.admin.storagepool.ListStoragePoolsCmd; +import org.apache.cloudstack.api.command.admin.systemvm.*; +import org.apache.cloudstack.api.command.admin.vlan.ListVlanIpRangesCmd; +import org.apache.cloudstack.api.command.user.address.ListPublicIpAddressesCmd; +import org.apache.cloudstack.api.command.user.config.ListCapabilitiesCmd; +import org.apache.cloudstack.api.command.user.guest.ListGuestOsCmd; +import org.apache.cloudstack.api.command.user.job.ListAsyncJobsCmd; +import org.apache.cloudstack.api.command.user.offering.ListDiskOfferingsCmd; +import org.apache.cloudstack.api.command.user.offering.ListServiceOfferingsCmd; +import org.apache.cloudstack.api.command.user.ssh.DeleteSSHKeyPairCmd; +import org.apache.cloudstack.api.command.user.ssh.CreateSSHKeyPairCmd; +import org.apache.cloudstack.api.command.user.template.ListTemplatesCmd; import org.apache.cloudstack.api.user.volume.command.ExtractVolumeCmd; -import org.apache.cloudstack.api.user.template.command.ListTemplatesCmd; -import org.apache.cloudstack.api.user.template.command.UpdateTemplateCmd; +import org.apache.cloudstack.api.command.user.template.UpdateTemplateCmd; import org.apache.cloudstack.api.user.vm.command.GetVMPasswordCmd; -import org.apache.cloudstack.api.user.job.command.ListAsyncJobsCmd; -import org.apache.cloudstack.api.admin.config.command.ListCfgsByCmd; -import org.apache.cloudstack.api.user.event.command.ListEventsCmd; -import org.apache.cloudstack.api.user.guest.command.ListGuestOsCategoriesCmd; -import org.apache.cloudstack.api.user.iso.command.ListIsosCmd; -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.command.admin.config.ListCfgsByCmd; +import org.apache.cloudstack.api.command.user.event.ListEventsCmd; +import org.apache.cloudstack.api.command.user.guest.ListGuestOsCategoriesCmd; +import org.apache.cloudstack.api.command.user.iso.ListIsosCmd; +import org.apache.cloudstack.api.command.user.ssh.ListSSHKeyPairsCmd; +import org.apache.cloudstack.api.command.admin.systemvm.ListSystemVMsCmd; import org.apache.cloudstack.api.user.vmgroup.command.ListVMGroupsCmd; -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; -import org.apache.cloudstack.api.admin.systemvm.command.StopSystemVmCmd; -import org.apache.cloudstack.api.admin.domain.command.UpdateDomainCmd; -import org.apache.cloudstack.api.user.iso.command.UpdateIsoCmd; +import org.apache.cloudstack.api.command.admin.systemvm.RebootSystemVmCmd; +import org.apache.cloudstack.api.command.user.ssh.RegisterSSHKeyPairCmd; +import org.apache.cloudstack.api.command.admin.systemvm.StopSystemVmCmd; +import org.apache.cloudstack.api.command.user.iso.UpdateIsoCmd; import org.apache.cloudstack.api.user.vmgroup.command.UpdateVMGroupCmd; -import org.apache.cloudstack.api.admin.systemvm.command.UpgradeSystemVMCmd; -import org.apache.cloudstack.api.admin.resource.command.UploadCustomCertificateCmd; +import org.apache.cloudstack.api.command.admin.systemvm.UpgradeSystemVMCmd; +import org.apache.cloudstack.api.command.admin.resource.UploadCustomCertificateCmd; import com.cloud.api.view.vo.DomainRouterJoinVO; import com.cloud.api.view.vo.EventJoinVO; import com.cloud.async.AsyncJob; @@ -71,7 +71,6 @@ import com.cloud.dc.DataCenter; import com.cloud.dc.Pod; import com.cloud.dc.Vlan; import com.cloud.domain.Domain; -import com.cloud.event.Event; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InternalErrorException; import com.cloud.exception.PermissionDeniedException; diff --git a/api/src/com/cloud/server/TaggedResourceService.java b/api/src/com/cloud/server/TaggedResourceService.java index 667a0238033..2549f79587e 100644 --- a/api/src/com/cloud/server/TaggedResourceService.java +++ b/api/src/com/cloud/server/TaggedResourceService.java @@ -19,7 +19,7 @@ package com.cloud.server; import java.util.List; import java.util.Map; -import org.apache.cloudstack.api.user.tag.command.ListTagsCmd; +import org.apache.cloudstack.api.command.user.tag.ListTagsCmd; import com.cloud.api.view.vo.ResourceTagJoinVO; import com.cloud.server.ResourceTag.TaggedResourceType; diff --git a/api/src/com/cloud/storage/StorageService.java b/api/src/com/cloud/storage/StorageService.java index bca617def0f..a5f9261c2c1 100644 --- a/api/src/com/cloud/storage/StorageService.java +++ b/api/src/com/cloud/storage/StorageService.java @@ -19,11 +19,11 @@ package com.cloud.storage; import java.net.UnknownHostException; import java.util.List; -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.command.admin.storagepool.CancelPrimaryStorageMaintenanceCmd; +import org.apache.cloudstack.api.command.admin.storagepool.CreateStoragePoolCmd; +import org.apache.cloudstack.api.command.admin.storagepool.DeletePoolCmd; +import org.apache.cloudstack.api.command.admin.storagepool.UpdateStoragePoolCmd; import org.apache.cloudstack.api.user.volume.command.CreateVolumeCmd; -import org.apache.cloudstack.api.admin.storagepool.command.DeletePoolCmd; import org.apache.cloudstack.api.user.volume.command.ListVolumesCmd; import org.apache.cloudstack.api.user.volume.command.UploadVolumeCmd; import com.cloud.exception.ConcurrentOperationException; diff --git a/api/src/com/cloud/storage/snapshot/SnapshotService.java b/api/src/com/cloud/storage/snapshot/SnapshotService.java index 0c024211469..79041c47b69 100644 --- a/api/src/com/cloud/storage/snapshot/SnapshotService.java +++ b/api/src/com/cloud/storage/snapshot/SnapshotService.java @@ -18,11 +18,11 @@ package com.cloud.storage.snapshot; import java.util.List; -import org.apache.cloudstack.api.user.snapshot.command.CreateSnapshotPolicyCmd; -import org.apache.cloudstack.api.user.snapshot.command.DeleteSnapshotPoliciesCmd; +import org.apache.cloudstack.api.command.user.snapshot.CreateSnapshotPolicyCmd; +import org.apache.cloudstack.api.command.user.snapshot.ListSnapshotsCmd; +import org.apache.cloudstack.api.command.user.snapshot.DeleteSnapshotPoliciesCmd; import com.cloud.api.commands.ListRecurringSnapshotScheduleCmd; -import org.apache.cloudstack.api.user.snapshot.command.ListSnapshotPoliciesCmd; -import org.apache.cloudstack.api.user.snapshot.command.ListSnapshotsCmd; +import org.apache.cloudstack.api.command.user.snapshot.ListSnapshotPoliciesCmd; import com.cloud.exception.PermissionDeniedException; import com.cloud.exception.ResourceAllocationException; import com.cloud.storage.Snapshot; diff --git a/api/src/com/cloud/template/TemplateService.java b/api/src/com/cloud/template/TemplateService.java index 1b41c332a0e..6fbc840b118 100755 --- a/api/src/com/cloud/template/TemplateService.java +++ b/api/src/com/cloud/template/TemplateService.java @@ -19,14 +19,14 @@ package com.cloud.template; import java.net.URISyntaxException; import java.util.List; -import org.apache.cloudstack.api.user.iso.command.RegisterIsoCmd; -import org.apache.cloudstack.api.user.template.command.CopyTemplateCmd; -import org.apache.cloudstack.api.user.iso.command.DeleteIsoCmd; -import org.apache.cloudstack.api.user.template.command.DeleteTemplateCmd; -import org.apache.cloudstack.api.user.iso.command.ExtractIsoCmd; -import org.apache.cloudstack.api.user.template.command.ExtractTemplateCmd; +import org.apache.cloudstack.api.command.user.iso.DeleteIsoCmd; +import org.apache.cloudstack.api.command.user.iso.ExtractIsoCmd; +import org.apache.cloudstack.api.command.user.iso.RegisterIsoCmd; +import org.apache.cloudstack.api.command.user.template.*; +import org.apache.cloudstack.api.command.user.template.CopyTemplateCmd; +import org.apache.cloudstack.api.command.user.template.ExtractTemplateCmd; import com.cloud.api.commands.ListTemplateOrIsoPermissionsCmd; -import org.apache.cloudstack.api.user.template.command.RegisterTemplateCmd; +import org.apache.cloudstack.api.command.user.template.RegisterTemplateCmd; import com.cloud.api.commands.UpdateTemplateOrIsoPermissionsCmd; import com.cloud.exception.InternalErrorException; import com.cloud.exception.ResourceAllocationException; diff --git a/api/src/com/cloud/user/AccountService.java b/api/src/com/cloud/user/AccountService.java index e73b04ecc86..e9558fc283e 100755 --- a/api/src/com/cloud/user/AccountService.java +++ b/api/src/com/cloud/user/AccountService.java @@ -21,12 +21,12 @@ import java.util.Map; import com.cloud.acl.ControlledEntity; import com.cloud.acl.SecurityChecker.AccessType; -import org.apache.cloudstack.api.admin.user.command.DeleteUserCmd; -import org.apache.cloudstack.api.admin.user.command.RegisterCmd; -import org.apache.cloudstack.api.admin.user.command.UpdateUserCmd; -import org.apache.cloudstack.api.user.account.command.ListAccountsCmd; -import org.apache.cloudstack.api.admin.user.command.ListUsersCmd; -import org.apache.cloudstack.api.admin.account.command.UpdateAccountCmd; +import org.apache.cloudstack.api.command.admin.user.DeleteUserCmd; +import org.apache.cloudstack.api.command.admin.user.ListUsersCmd; +import org.apache.cloudstack.api.command.admin.user.RegisterCmd; +import org.apache.cloudstack.api.command.admin.user.UpdateUserCmd; +import org.apache.cloudstack.api.command.admin.account.UpdateAccountCmd; +import org.apache.cloudstack.api.command.user.account.ListAccountsCmd; import com.cloud.domain.Domain; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.PermissionDeniedException; diff --git a/api/src/com/cloud/user/DomainService.java b/api/src/com/cloud/user/DomainService.java index 78c9a545ca2..6fbe1b9a8db 100644 --- a/api/src/com/cloud/user/DomainService.java +++ b/api/src/com/cloud/user/DomainService.java @@ -18,8 +18,8 @@ package com.cloud.user; import java.util.List; -import org.apache.cloudstack.api.admin.domain.command.ListDomainChildrenCmd; -import org.apache.cloudstack.api.admin.domain.command.ListDomainsCmd; +import org.apache.cloudstack.api.command.admin.domain.ListDomainChildrenCmd; +import org.apache.cloudstack.api.command.admin.domain.ListDomainsCmd; import com.cloud.domain.Domain; import com.cloud.exception.PermissionDeniedException; import com.cloud.utils.Pair; diff --git a/api/src/com/cloud/vm/UserVmService.java b/api/src/com/cloud/vm/UserVmService.java index 4568944d733..c926f26775a 100755 --- a/api/src/com/cloud/vm/UserVmService.java +++ b/api/src/com/cloud/vm/UserVmService.java @@ -21,9 +21,9 @@ import java.util.Map; import javax.naming.InsufficientResourcesException; -import org.apache.cloudstack.api.admin.vm.command.AssignVMCmd; +import org.apache.cloudstack.api.command.admin.vm.AssignVMCmd; +import org.apache.cloudstack.api.command.user.template.CreateTemplateCmd; import org.apache.cloudstack.api.user.volume.command.AttachVolumeCmd; -import org.apache.cloudstack.api.user.template.command.CreateTemplateCmd; import org.apache.cloudstack.api.user.vmgroup.command.CreateVMGroupCmd; import org.apache.cloudstack.api.user.vmgroup.command.DeleteVMGroupCmd; import org.apache.cloudstack.api.user.vm.command.DeployVMCmd; @@ -31,7 +31,7 @@ import org.apache.cloudstack.api.user.vm.command.DestroyVMCmd; import org.apache.cloudstack.api.user.volume.command.DetachVolumeCmd; import org.apache.cloudstack.api.user.vm.command.ListVMsCmd; import org.apache.cloudstack.api.user.vm.command.RebootVMCmd; -import org.apache.cloudstack.api.admin.vm.command.RecoverVMCmd; +import org.apache.cloudstack.api.command.admin.vm.RecoverVMCmd; import org.apache.cloudstack.api.user.vm.command.ResetVMPasswordCmd; import org.apache.cloudstack.api.user.vm.command.RestoreVMCmd; import org.apache.cloudstack.api.user.vm.command.StartVMCmd; diff --git a/api/src/org/apache/cloudstack/api/ResponseGenerator.java b/api/src/org/apache/cloudstack/api/ResponseGenerator.java index c247e34e465..3578be353df 100755 --- a/api/src/org/apache/cloudstack/api/ResponseGenerator.java +++ b/api/src/org/apache/cloudstack/api/ResponseGenerator.java @@ -22,7 +22,7 @@ import java.util.List; import org.apache.cloudstack.api.ApiConstants.HostDetails; import org.apache.cloudstack.api.ApiConstants.VMDetails; -import org.apache.cloudstack.api.user.job.command.QueryAsyncJobResultCmd; +import org.apache.cloudstack.api.command.user.job.QueryAsyncJobResultCmd; import com.cloud.api.response.AccountResponse; import com.cloud.api.response.AsyncJobResponse; import com.cloud.api.response.AutoScalePolicyResponse; @@ -48,7 +48,6 @@ import com.cloud.api.response.InstanceGroupResponse; import com.cloud.api.response.IpForwardingRuleResponse; import com.cloud.api.response.LBStickinessResponse; import com.cloud.api.response.LDAPConfigResponse; -import com.cloud.api.response.ListResponse; import com.cloud.api.response.LoadBalancerResponse; import com.cloud.api.response.NetworkACLResponse; import com.cloud.api.response.NetworkOfferingResponse; @@ -127,7 +126,6 @@ import com.cloud.network.rules.PortForwardingRule; import com.cloud.network.rules.StaticNatRule; import com.cloud.network.rules.StickinessPolicy; import com.cloud.network.security.SecurityGroup; -import com.cloud.network.security.SecurityGroupRules; import com.cloud.network.security.SecurityRule; import com.cloud.network.vpc.PrivateGateway; import com.cloud.network.vpc.StaticRoute; diff --git a/api/src/org/apache/cloudstack/api/admin/account/command/CreateAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/admin/account/command/CreateAccountCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java index 99ff4c253b3..28187258c28 100755 --- a/api/src/org/apache/cloudstack/api/admin/account/command/CreateAccountCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.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.admin.account.command; +package org.apache.cloudstack.api.command.admin.account; import java.util.Collection; import java.util.Map; diff --git a/api/src/org/apache/cloudstack/api/admin/account/command/DeleteAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/account/command/DeleteAccountCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java index d00d7c8f920..81e2efde059 100755 --- a/api/src/org/apache/cloudstack/api/admin/account/command/DeleteAccountCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.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.admin.account.command; +package org.apache.cloudstack.api.command.admin.account; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/account/command/DisableAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/account/command/DisableAccountCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java index e6e9fd5878c..cf519df5ef7 100644 --- a/api/src/org/apache/cloudstack/api/admin/account/command/DisableAccountCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.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.admin.account.command; +package org.apache.cloudstack.api.command.admin.account; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/account/command/EnableAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/account/command/EnableAccountCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java index ca0c9521d1a..91e24b05237 100644 --- a/api/src/org/apache/cloudstack/api/admin/account/command/EnableAccountCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.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.admin.account.command; +package org.apache.cloudstack.api.command.admin.account; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/account/command/LockAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/account/command/LockAccountCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java index a8a06f089df..6f9bea05e53 100644 --- a/api/src/org/apache/cloudstack/api/admin/account/command/LockAccountCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.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.admin.account.command; +package org.apache.cloudstack.api.command.admin.account; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/account/command/UpdateAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/account/command/UpdateAccountCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java index 9bb095e012b..6463265effc 100755 --- a/api/src/org/apache/cloudstack/api/admin/account/command/UpdateAccountCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.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.admin.account.command; +package org.apache.cloudstack.api.command.admin.account; import java.util.Collection; import java.util.Map; diff --git a/api/src/org/apache/cloudstack/api/admin/autoscale/command/CreateCounterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/autoscale/command/CreateCounterCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java index 1fb712ee7aa..c97ddca5ba8 100644 --- a/api/src/org/apache/cloudstack/api/admin/autoscale/command/CreateCounterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.admin.autoscale.command; +package org.apache.cloudstack.api.command.admin.autoscale; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/autoscale/command/DeleteCounterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/autoscale/command/DeleteCounterCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java index 161c60c23d0..750d2abca1f 100644 --- a/api/src/org/apache/cloudstack/api/admin/autoscale/command/DeleteCounterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.admin.autoscale.command; +package org.apache.cloudstack.api.command.admin.autoscale; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/cluster/command/AddClusterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/admin/cluster/command/AddClusterCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java index ec6ab17e3d2..d5e6aee689a 100755 --- a/api/src/org/apache/cloudstack/api/admin/cluster/command/AddClusterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.admin.cluster.command; +package org.apache.cloudstack.api.command.admin.cluster; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/admin/cluster/command/DeleteClusterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/cluster/command/DeleteClusterCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java index 64cc571d764..70eeb9a35c6 100755 --- a/api/src/org/apache/cloudstack/api/admin/cluster/command/DeleteClusterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.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.admin.cluster.command; +package org.apache.cloudstack.api.command.admin.cluster; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/cluster/command/ListClustersCmd.java b/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java similarity index 97% rename from api/src/org/apache/cloudstack/api/admin/cluster/command/ListClustersCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java index 0107648371f..7a01ba60299 100755 --- a/api/src/org/apache/cloudstack/api/admin/cluster/command/ListClustersCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java @@ -14,12 +14,12 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.admin.cluster.command; +package org.apache.cloudstack.api.command.admin.cluster; import java.util.ArrayList; import java.util.List; -import org.apache.cloudstack.api.user.offering.command.ListServiceOfferingsCmd; +import org.apache.cloudstack.api.command.user.offering.ListServiceOfferingsCmd; import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; diff --git a/api/src/org/apache/cloudstack/api/admin/cluster/command/UpdateClusterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/cluster/command/UpdateClusterCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java index 1d85ce5a813..81c3114a866 100755 --- a/api/src/org/apache/cloudstack/api/admin/cluster/command/UpdateClusterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.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.admin.cluster.command; +package org.apache.cloudstack.api.command.admin.cluster; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/config/command/ListCfgsByCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/config/command/ListCfgsByCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java index 70990ba8179..ba583e8fd44 100644 --- a/api/src/org/apache/cloudstack/api/admin/config/command/ListCfgsByCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/config/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 org.apache.cloudstack.api.admin.config.command; +package org.apache.cloudstack.api.command.admin.config; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/admin/config/command/ListHypervisorCapabilitiesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/config/command/ListHypervisorCapabilitiesCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java index e0cd04f8350..d8e2ac55ce0 100644 --- a/api/src/org/apache/cloudstack/api/admin/config/command/ListHypervisorCapabilitiesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/config/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 org.apache.cloudstack.api.admin.config.command; +package org.apache.cloudstack.api.command.admin.config; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/admin/config/command/UpdateCfgCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/config/command/UpdateCfgCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java index 62d401146a7..dc25e4dbaa5 100644 --- a/api/src/org/apache/cloudstack/api/admin/config/command/UpdateCfgCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/config/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 org.apache.cloudstack.api.admin.config.command; +package org.apache.cloudstack.api.command.admin.config; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/config/command/UpdateHypervisorCapabilitiesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/config/command/UpdateHypervisorCapabilitiesCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java index 47a99809b1d..3f4f234cd0c 100644 --- a/api/src/org/apache/cloudstack/api/admin/config/command/UpdateHypervisorCapabilitiesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/config/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 org.apache.cloudstack.api.admin.config.command; +package org.apache.cloudstack.api.command.admin.config; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/domain/command/CreateDomainCmd.java b/api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/domain/command/CreateDomainCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java index 86e77052b70..c8a653d5273 100644 --- a/api/src/org/apache/cloudstack/api/admin/domain/command/CreateDomainCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.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.admin.domain.command; +package org.apache.cloudstack.api.command.admin.domain; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/domain/command/DeleteDomainCmd.java b/api/src/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/domain/command/DeleteDomainCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java index 2c372bad4af..6b9831b8743 100644 --- a/api/src/org/apache/cloudstack/api/admin/domain/command/DeleteDomainCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.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.admin.domain.command; +package org.apache.cloudstack.api.command.admin.domain; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/domain/command/ListDomainChildrenCmd.java b/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/domain/command/ListDomainChildrenCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java index 5aee062d49f..553247851a7 100644 --- a/api/src/org/apache/cloudstack/api/admin/domain/command/ListDomainChildrenCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.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.admin.domain.command; +package org.apache.cloudstack.api.command.admin.domain; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/admin/domain/command/ListDomainsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/domain/command/ListDomainsCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java index e35f7722e15..cb7d65a8ec9 100644 --- a/api/src/org/apache/cloudstack/api/admin/domain/command/ListDomainsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.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.admin.domain.command; +package org.apache.cloudstack.api.command.admin.domain; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/admin/domain/command/UpdateDomainCmd.java b/api/src/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/domain/command/UpdateDomainCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java index 972b46f344b..41070976a30 100644 --- a/api/src/org/apache/cloudstack/api/admin/domain/command/UpdateDomainCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.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.admin.domain.command; +package org.apache.cloudstack.api.command.admin.domain; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/host/command/AddHostCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/admin/host/command/AddHostCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java index 06a065230c2..e3ac4aaccbc 100755 --- a/api/src/org/apache/cloudstack/api/admin/host/command/AddHostCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/AddHostCmd.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.admin.host.command; +package org.apache.cloudstack.api.command.admin.host; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/admin/host/command/AddSecondaryStorageCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/host/command/AddSecondaryStorageCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java index 678a73f1221..31ab929a72c 100644 --- a/api/src/org/apache/cloudstack/api/admin/host/command/AddSecondaryStorageCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.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.admin.host.command; +package org.apache.cloudstack.api.command.admin.host; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/admin/host/command/CancelMaintenanceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/host/command/CancelMaintenanceCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java index 2e84b000140..74b16d84617 100644 --- a/api/src/org/apache/cloudstack/api/admin/host/command/CancelMaintenanceCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.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.admin.host.command; +package org.apache.cloudstack.api.command.admin.host; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/host/command/DeleteHostCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/host/command/DeleteHostCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java index 0f39a043aca..cff893d193f 100644 --- a/api/src/org/apache/cloudstack/api/admin/host/command/DeleteHostCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.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.admin.host.command; +package org.apache.cloudstack.api.command.admin.host; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/host/command/ListHostsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/admin/host/command/ListHostsCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java index ec424c2d11f..e163ada2736 100755 --- a/api/src/org/apache/cloudstack/api/admin/host/command/ListHostsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.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.admin.host.command; +package org.apache.cloudstack.api.command.admin.host; import java.util.ArrayList; import java.util.EnumSet; diff --git a/api/src/org/apache/cloudstack/api/admin/host/command/PrepareForMaintenanceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/host/command/PrepareForMaintenanceCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java index b6d178eabfa..cf4326a00b1 100644 --- a/api/src/org/apache/cloudstack/api/admin/host/command/PrepareForMaintenanceCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.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.admin.host.command; +package org.apache.cloudstack.api.command.admin.host; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/host/command/ReconnectHostCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/host/command/ReconnectHostCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java index 2c57adecefc..d8f245c676f 100755 --- a/api/src/org/apache/cloudstack/api/admin/host/command/ReconnectHostCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.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.admin.host.command; +package org.apache.cloudstack.api.command.admin.host; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/host/command/UpdateHostCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/host/command/UpdateHostCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java index bbb3b6fb10d..07af547e04f 100755 --- a/api/src/org/apache/cloudstack/api/admin/host/command/UpdateHostCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.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.admin.host.command; +package org.apache.cloudstack.api.command.admin.host; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/admin/host/command/UpdateHostPasswordCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/host/command/UpdateHostPasswordCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java index 2ace2485e51..96cdaaeb88e 100644 --- a/api/src/org/apache/cloudstack/api/admin/host/command/UpdateHostPasswordCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.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.admin.host.command; +package org.apache.cloudstack.api.command.admin.host; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/ldap/command/LDAPConfigCmd.java b/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPConfigCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/admin/ldap/command/LDAPConfigCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPConfigCmd.java index 763455ceb14..a84c2c4d2aa 100644 --- a/api/src/org/apache/cloudstack/api/admin/ldap/command/LDAPConfigCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/ldap/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 org.apache.cloudstack.api.admin.ldap.command; +package org.apache.cloudstack.api.command.admin.ldap; import javax.naming.NamingException; diff --git a/api/src/org/apache/cloudstack/api/admin/ldap/command/LDAPRemoveCmd.java b/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPRemoveCmd.java similarity index 97% rename from api/src/org/apache/cloudstack/api/admin/ldap/command/LDAPRemoveCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPRemoveCmd.java index 5c53debe3f4..e4f713f2960 100644 --- a/api/src/org/apache/cloudstack/api/admin/ldap/command/LDAPRemoveCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/ldap/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 org.apache.cloudstack.api.admin.ldap.command; +package org.apache.cloudstack.api.command.admin.ldap; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/network/command/AddNetworkDeviceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java similarity index 96% rename from api/src/org/apache/cloudstack/api/admin/network/command/AddNetworkDeviceCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java index 8d63f0e091f..5c0f2ff2bae 100644 --- a/api/src/org/apache/cloudstack/api/admin/network/command/AddNetworkDeviceCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.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.admin.network.command; +package org.apache.cloudstack.api.command.admin.network; import java.util.Map; @@ -33,7 +33,7 @@ import com.cloud.exception.ResourceUnavailableException; import com.cloud.host.Host; import org.apache.cloudstack.network.ExternalNetworkDeviceManager; import com.cloud.server.ManagementService; -import org.apache.cloudstack.api.admin.network.response.NetworkDeviceResponse; +import org.apache.cloudstack.api.response.NetworkDeviceResponse; import com.cloud.utils.component.ComponentLocator; import com.cloud.utils.exception.CloudRuntimeException; diff --git a/api/src/org/apache/cloudstack/api/admin/network/command/AddNetworkServiceProviderCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/network/command/AddNetworkServiceProviderCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java index 542f8ddc9c9..f24e0d70b99 100644 --- a/api/src/org/apache/cloudstack/api/admin/network/command/AddNetworkServiceProviderCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.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.admin.network.command; +package org.apache.cloudstack.api.command.admin.network; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/admin/network/command/CreateNetworkOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/admin/network/command/CreateNetworkOfferingCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java index d85f5753bed..c7c4e53e2c2 100644 --- a/api/src/org/apache/cloudstack/api/admin/network/command/CreateNetworkOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.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.admin.network.command; +package org.apache.cloudstack.api.command.admin.network; import java.util.ArrayList; import java.util.Collection; diff --git a/api/src/org/apache/cloudstack/api/admin/network/command/CreatePhysicalNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/admin/network/command/CreatePhysicalNetworkCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java index 5216e722852..601d0971740 100644 --- a/api/src/org/apache/cloudstack/api/admin/network/command/CreatePhysicalNetworkCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.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.admin.network.command; +package org.apache.cloudstack.api.command.admin.network; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/admin/network/command/CreateStorageNetworkIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/network/command/CreateStorageNetworkIpRangeCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java index 5c0273bd701..05f68d93393 100755 --- a/api/src/org/apache/cloudstack/api/admin/network/command/CreateStorageNetworkIpRangeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.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.admin.network.command; +package org.apache.cloudstack.api.command.admin.network; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/network/command/DeleteNetworkDeviceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/network/command/DeleteNetworkDeviceCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java index d01b774642b..0afe40284b0 100644 --- a/api/src/org/apache/cloudstack/api/admin/network/command/DeleteNetworkDeviceCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.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.admin.network.command; +package org.apache.cloudstack.api.command.admin.network; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/network/command/DeleteNetworkOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/network/command/DeleteNetworkOfferingCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java index 2e0f098ccd8..cf76044ef0d 100644 --- a/api/src/org/apache/cloudstack/api/admin/network/command/DeleteNetworkOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.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.admin.network.command; +package org.apache.cloudstack.api.command.admin.network; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/network/command/DeleteNetworkServiceProviderCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/network/command/DeleteNetworkServiceProviderCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java index abfe7cb6738..1c366953d1f 100644 --- a/api/src/org/apache/cloudstack/api/admin/network/command/DeleteNetworkServiceProviderCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.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.admin.network.command; +package org.apache.cloudstack.api.command.admin.network; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/network/command/DeletePhysicalNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/network/command/DeletePhysicalNetworkCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java index 5d146bf70b5..a2eaad82141 100644 --- a/api/src/org/apache/cloudstack/api/admin/network/command/DeletePhysicalNetworkCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.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.admin.network.command; +package org.apache.cloudstack.api.command.admin.network; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/network/command/DeleteStorageNetworkIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/network/command/DeleteStorageNetworkIpRangeCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java index 5cb4eb70b32..cfcd6b43357 100755 --- a/api/src/org/apache/cloudstack/api/admin/network/command/DeleteStorageNetworkIpRangeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.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.admin.network.command; +package org.apache.cloudstack.api.command.admin.network; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/network/command/ListNetworkDeviceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkDeviceCmd.java similarity index 96% rename from api/src/org/apache/cloudstack/api/admin/network/command/ListNetworkDeviceCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkDeviceCmd.java index 21e0e6df327..384b59541fb 100644 --- a/api/src/org/apache/cloudstack/api/admin/network/command/ListNetworkDeviceCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkDeviceCmd.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.admin.network.command; +package org.apache.cloudstack.api.command.admin.network; import java.util.ArrayList; import java.util.List; @@ -29,7 +29,7 @@ import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.network.ExternalNetworkDeviceManager; -import org.apache.cloudstack.api.admin.network.response.NetworkDeviceResponse; +import org.apache.cloudstack.api.response.NetworkDeviceResponse; import com.cloud.api.response.ListResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; diff --git a/api/src/org/apache/cloudstack/api/admin/network/command/ListNetworkServiceProvidersCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/network/command/ListNetworkServiceProvidersCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java index efaf15e5d35..24119156900 100644 --- a/api/src/org/apache/cloudstack/api/admin/network/command/ListNetworkServiceProvidersCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.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.admin.network.command; +package org.apache.cloudstack.api.command.admin.network; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/admin/network/command/ListPhysicalNetworksCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/network/command/ListPhysicalNetworksCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java index e26e2862afa..eb2515505b3 100644 --- a/api/src/org/apache/cloudstack/api/admin/network/command/ListPhysicalNetworksCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.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.admin.network.command; +package org.apache.cloudstack.api.command.admin.network; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/admin/network/command/ListStorageNetworkIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/network/command/ListStorageNetworkIpRangeCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java index 06b6e2c5175..4e0e844a434 100755 --- a/api/src/org/apache/cloudstack/api/admin/network/command/ListStorageNetworkIpRangeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.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.admin.network.command; +package org.apache.cloudstack.api.command.admin.network; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/admin/network/command/ListSupportedNetworkServicesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/network/command/ListSupportedNetworkServicesCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java index 6eaa9cff3d2..a422242b6b3 100644 --- a/api/src/org/apache/cloudstack/api/admin/network/command/ListSupportedNetworkServicesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.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.admin.network.command; +package org.apache.cloudstack.api.command.admin.network; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/admin/network/command/UpdateNetworkOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/network/command/UpdateNetworkOfferingCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java index cb4497422df..a3400fb918e 100755 --- a/api/src/org/apache/cloudstack/api/admin/network/command/UpdateNetworkOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.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.admin.network.command; +package org.apache.cloudstack.api.command.admin.network; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/network/command/UpdateNetworkServiceProviderCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/network/command/UpdateNetworkServiceProviderCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java index cdacdd8149f..2b9c83f44f3 100644 --- a/api/src/org/apache/cloudstack/api/admin/network/command/UpdateNetworkServiceProviderCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.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.admin.network.command; +package org.apache.cloudstack.api.command.admin.network; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/admin/network/command/UpdatePhysicalNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/network/command/UpdatePhysicalNetworkCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java index fccde132d08..ef224bf93af 100644 --- a/api/src/org/apache/cloudstack/api/admin/network/command/UpdatePhysicalNetworkCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.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.admin.network.command; +package org.apache.cloudstack.api.command.admin.network; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/admin/network/command/UpdateStorageNetworkIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/network/command/UpdateStorageNetworkIpRangeCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java index 75526586d0b..057b1b87cd3 100755 --- a/api/src/org/apache/cloudstack/api/admin/network/command/UpdateStorageNetworkIpRangeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.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.admin.network.command; +package org.apache.cloudstack.api.command.admin.network; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/offering/command/CreateDiskOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/offering/command/CreateDiskOfferingCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java index d79c916a388..915de5d0671 100755 --- a/api/src/org/apache/cloudstack/api/admin/offering/command/CreateDiskOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/offering/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 org.apache.cloudstack.api.admin.offering.command; +package org.apache.cloudstack.api.command.admin.offering; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/offering/command/CreateServiceOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/admin/offering/command/CreateServiceOfferingCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java index 57954ec821d..cb439e3c333 100644 --- a/api/src/org/apache/cloudstack/api/admin/offering/command/CreateServiceOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/offering/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 org.apache.cloudstack.api.admin.offering.command; +package org.apache.cloudstack.api.command.admin.offering; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/offering/command/DeleteDiskOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java similarity index 97% rename from api/src/org/apache/cloudstack/api/admin/offering/command/DeleteDiskOfferingCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java index 39e8804aa8a..2cb5307b8dd 100644 --- a/api/src/org/apache/cloudstack/api/admin/offering/command/DeleteDiskOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/offering/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 org.apache.cloudstack.api.admin.offering.command; +package org.apache.cloudstack.api.command.admin.offering; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/offering/command/DeleteServiceOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/offering/command/DeleteServiceOfferingCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java index 643f8a26894..1ddbf74f933 100644 --- a/api/src/org/apache/cloudstack/api/admin/offering/command/DeleteServiceOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/offering/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 org.apache.cloudstack.api.admin.offering.command; +package org.apache.cloudstack.api.command.admin.offering; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/offering/command/UpdateDiskOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/offering/command/UpdateDiskOfferingCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java index 66438142612..dd69d9bda2f 100755 --- a/api/src/org/apache/cloudstack/api/admin/offering/command/UpdateDiskOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/offering/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 org.apache.cloudstack.api.admin.offering.command; +package org.apache.cloudstack.api.command.admin.offering; import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; diff --git a/api/src/org/apache/cloudstack/api/admin/offering/command/UpdateServiceOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/offering/command/UpdateServiceOfferingCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java index 909ad7d3a4a..1bb8346881d 100755 --- a/api/src/org/apache/cloudstack/api/admin/offering/command/UpdateServiceOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/offering/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 org.apache.cloudstack.api.admin.offering.command; +package org.apache.cloudstack.api.command.admin.offering; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/pod/command/CreatePodCmd.java b/api/src/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/pod/command/CreatePodCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java index fe7c1cee2f1..c735698c77a 100755 --- a/api/src/org/apache/cloudstack/api/admin/pod/command/CreatePodCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.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.admin.pod.command; +package org.apache.cloudstack.api.command.admin.pod; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/pod/command/DeletePodCmd.java b/api/src/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/pod/command/DeletePodCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java index 3a04d7f4873..62688f8365c 100644 --- a/api/src/org/apache/cloudstack/api/admin/pod/command/DeletePodCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.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.admin.pod.command; +package org.apache.cloudstack.api.command.admin.pod; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/pod/command/ListPodsByCmd.java b/api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/pod/command/ListPodsByCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java index db15d3d5a75..8b2b731935c 100755 --- a/api/src/org/apache/cloudstack/api/admin/pod/command/ListPodsByCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.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.admin.pod.command; +package org.apache.cloudstack.api.command.admin.pod; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/admin/pod/command/UpdatePodCmd.java b/api/src/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/pod/command/UpdatePodCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java index fe67c81cb45..48afb09232f 100755 --- a/api/src/org/apache/cloudstack/api/admin/pod/command/UpdatePodCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.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.admin.pod.command; +package org.apache.cloudstack.api.command.admin.pod; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/resource/command/ListAlertsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/resource/command/ListAlertsCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java index d82e4569638..db3b55c5ce3 100644 --- a/api/src/org/apache/cloudstack/api/admin/resource/command/ListAlertsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.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.admin.resource.command; +package org.apache.cloudstack.api.command.admin.resource; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/admin/resource/command/ListCapacityCmd.java b/api/src/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/admin/resource/command/ListCapacityCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java index 39cbddfbc7e..9f1b69642f0 100755 --- a/api/src/org/apache/cloudstack/api/admin/resource/command/ListCapacityCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.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.admin.resource.command; +package org.apache.cloudstack.api.command.admin.resource; import java.text.DecimalFormat; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/admin/resource/command/UploadCustomCertificateCmd.java b/api/src/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/resource/command/UploadCustomCertificateCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java index 76be280c8ff..09bfd12ba45 100644 --- a/api/src/org/apache/cloudstack/api/admin/resource/command/UploadCustomCertificateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.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.admin.resource.command; +package org.apache.cloudstack.api.command.admin.resource; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/router/command/ConfigureVirtualRouterElementCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/router/command/ConfigureVirtualRouterElementCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java index e17a9881690..dcf4f6389f3 100644 --- a/api/src/org/apache/cloudstack/api/admin/router/command/ConfigureVirtualRouterElementCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.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.admin.router.command; +package org.apache.cloudstack.api.command.admin.router; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/router/command/CreateVirtualRouterElementCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/router/command/CreateVirtualRouterElementCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java index 5c88c2d182d..4d8c492bbf7 100644 --- a/api/src/org/apache/cloudstack/api/admin/router/command/CreateVirtualRouterElementCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.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.admin.router.command; +package org.apache.cloudstack.api.command.admin.router; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/router/command/DestroyRouterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/router/command/DestroyRouterCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java index 1408a576406..13e16b540bc 100644 --- a/api/src/org/apache/cloudstack/api/admin/router/command/DestroyRouterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.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.admin.router.command; +package org.apache.cloudstack.api.command.admin.router; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/router/command/ListRoutersCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java similarity index 91% rename from api/src/org/apache/cloudstack/api/admin/router/command/ListRoutersCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java index e517dc14a39..1119463c4c3 100644 --- a/api/src/org/apache/cloudstack/api/admin/router/command/ListRoutersCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java @@ -14,10 +14,8 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.admin.router.command; +package org.apache.cloudstack.api.command.admin.router; -import java.util.ArrayList; -import java.util.EnumSet; import java.util.List; import org.apache.log4j.Logger; @@ -27,19 +25,12 @@ import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import org.apache.cloudstack.api.ApiConstants.VMDetails; -import com.cloud.api.response.UserVmResponse; import com.cloud.api.view.vo.DomainRouterJoinVO; -import com.cloud.api.view.vo.UserVmJoinVO; import com.cloud.api.response.DomainRouterResponse; import com.cloud.api.response.ListResponse; -import com.cloud.api.response.UserVmResponse; -import com.cloud.api.view.vo.DomainRouterJoinVO; -import com.cloud.api.view.vo.UserVmJoinVO; import com.cloud.async.AsyncJob; -import com.cloud.network.router.VirtualRouter; import com.cloud.utils.Pair; @Implementation(description="List routers.", responseObject=DomainRouterResponse.class) diff --git a/api/src/org/apache/cloudstack/api/admin/router/command/ListVirtualRouterElementsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java similarity index 97% rename from api/src/org/apache/cloudstack/api/admin/router/command/ListVirtualRouterElementsCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java index 6206de5ac1c..cfd7db573f1 100644 --- a/api/src/org/apache/cloudstack/api/admin/router/command/ListVirtualRouterElementsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java @@ -14,12 +14,12 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.admin.router.command; +package org.apache.cloudstack.api.command.admin.router; import java.util.ArrayList; import java.util.List; -import org.apache.cloudstack.api.user.network.command.ListNetworkOfferingsCmd; +import org.apache.cloudstack.api.command.user.network.ListNetworkOfferingsCmd; import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; diff --git a/api/src/org/apache/cloudstack/api/admin/router/command/RebootRouterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/router/command/RebootRouterCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java index be1ef24afb2..74bad42b5ce 100644 --- a/api/src/org/apache/cloudstack/api/admin/router/command/RebootRouterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.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.admin.router.command; +package org.apache.cloudstack.api.command.admin.router; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/router/command/StartRouterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/router/command/StartRouterCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java index cf3b5f1551f..0b56068f0d5 100644 --- a/api/src/org/apache/cloudstack/api/admin/router/command/StartRouterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.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.admin.router.command; +package org.apache.cloudstack.api.command.admin.router; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/router/command/StopRouterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/router/command/StopRouterCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java index 593b4c6dcc4..bb300b29808 100644 --- a/api/src/org/apache/cloudstack/api/admin/router/command/StopRouterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.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.admin.router.command; +package org.apache.cloudstack.api.command.admin.router; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/router/command/UpgradeRouterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/router/command/UpgradeRouterCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java index 11633bd930a..e941a897852 100644 --- a/api/src/org/apache/cloudstack/api/admin/router/command/UpgradeRouterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.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.admin.router.command; +package org.apache.cloudstack.api.command.admin.router; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/storagepool/command/CancelPrimaryStorageMaintenanceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storagepool/CancelPrimaryStorageMaintenanceCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/storagepool/command/CancelPrimaryStorageMaintenanceCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/storagepool/CancelPrimaryStorageMaintenanceCmd.java index d87259b301c..a50db6abeb8 100644 --- a/api/src/org/apache/cloudstack/api/admin/storagepool/command/CancelPrimaryStorageMaintenanceCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storagepool/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 org.apache.cloudstack.api.admin.storagepool.command; +package org.apache.cloudstack.api.command.admin.storagepool; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/storagepool/command/CreateStoragePoolCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storagepool/CreateStoragePoolCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/storagepool/command/CreateStoragePoolCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/storagepool/CreateStoragePoolCmd.java index fd3ca397766..563e2ae856b 100644 --- a/api/src/org/apache/cloudstack/api/admin/storagepool/command/CreateStoragePoolCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storagepool/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 org.apache.cloudstack.api.admin.storagepool.command; +package org.apache.cloudstack.api.command.admin.storagepool; import java.net.UnknownHostException; import java.util.Map; diff --git a/api/src/org/apache/cloudstack/api/admin/storagepool/command/DeletePoolCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storagepool/DeletePoolCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/storagepool/command/DeletePoolCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/storagepool/DeletePoolCmd.java index 473d35e4070..fcabb4ced48 100644 --- a/api/src/org/apache/cloudstack/api/admin/storagepool/command/DeletePoolCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storagepool/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 org.apache.cloudstack.api.admin.storagepool.command; +package org.apache.cloudstack.api.command.admin.storagepool; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/storagepool/command/ListStoragePoolsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storagepool/ListStoragePoolsCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/storagepool/command/ListStoragePoolsCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/storagepool/ListStoragePoolsCmd.java index b9879624440..e96ffd382a3 100644 --- a/api/src/org/apache/cloudstack/api/admin/storagepool/command/ListStoragePoolsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storagepool/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 org.apache.cloudstack.api.admin.storagepool.command; +package org.apache.cloudstack.api.command.admin.storagepool; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/admin/storagepool/command/PreparePrimaryStorageForMaintenanceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storagepool/PreparePrimaryStorageForMaintenanceCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/storagepool/command/PreparePrimaryStorageForMaintenanceCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/storagepool/PreparePrimaryStorageForMaintenanceCmd.java index 3f7f80d8df0..eb7aaaeeecb 100644 --- a/api/src/org/apache/cloudstack/api/admin/storagepool/command/PreparePrimaryStorageForMaintenanceCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storagepool/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 org.apache.cloudstack.api.admin.storagepool.command; +package org.apache.cloudstack.api.command.admin.storagepool; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/storagepool/command/UpdateStoragePoolCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storagepool/UpdateStoragePoolCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/storagepool/command/UpdateStoragePoolCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/storagepool/UpdateStoragePoolCmd.java index c027224d3bf..3ba7676870c 100644 --- a/api/src/org/apache/cloudstack/api/admin/storagepool/command/UpdateStoragePoolCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storagepool/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 org.apache.cloudstack.api.admin.storagepool.command; +package org.apache.cloudstack.api.command.admin.storagepool; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/admin/swift/command/AddSwiftCmd.java b/api/src/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/swift/command/AddSwiftCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java index 185024065d5..fd3c15424e6 100644 --- a/api/src/org/apache/cloudstack/api/admin/swift/command/AddSwiftCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/swift/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 org.apache.cloudstack.api.admin.swift.command; +package org.apache.cloudstack.api.command.admin.swift; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/swift/command/ListSwiftsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/swift/command/ListSwiftsCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java index 3a2202a9920..625054d2247 100644 --- a/api/src/org/apache/cloudstack/api/admin/swift/command/ListSwiftsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/swift/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 org.apache.cloudstack.api.admin.swift.command; +package org.apache.cloudstack.api.command.admin.swift; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/admin/systemvm/command/DestroySystemVmCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/systemvm/command/DestroySystemVmCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java index 56a82fb2255..c45922fa3ca 100644 --- a/api/src/org/apache/cloudstack/api/admin/systemvm/command/DestroySystemVmCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.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.admin.systemvm.command; +package org.apache.cloudstack.api.command.admin.systemvm; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/systemvm/command/ListSystemVMsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/systemvm/command/ListSystemVMsCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java index a1e27cd45d1..187ca6efc47 100644 --- a/api/src/org/apache/cloudstack/api/admin/systemvm/command/ListSystemVMsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.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.admin.systemvm.command; +package org.apache.cloudstack.api.command.admin.systemvm; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/admin/systemvm/command/MigrateSystemVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/systemvm/command/MigrateSystemVMCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java index 8876be1af69..b1c9587df13 100644 --- a/api/src/org/apache/cloudstack/api/admin/systemvm/command/MigrateSystemVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.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.admin.systemvm.command; +package org.apache.cloudstack.api.command.admin.systemvm; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/systemvm/command/RebootSystemVmCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/systemvm/command/RebootSystemVmCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java index 61a8892ad8a..ac295cffcf9 100644 --- a/api/src/org/apache/cloudstack/api/admin/systemvm/command/RebootSystemVmCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.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.admin.systemvm.command; +package org.apache.cloudstack.api.command.admin.systemvm; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/systemvm/command/StartSystemVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/systemvm/command/StartSystemVMCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java index f9e12a81d20..ea3917f8345 100644 --- a/api/src/org/apache/cloudstack/api/admin/systemvm/command/StartSystemVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.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.admin.systemvm.command; +package org.apache.cloudstack.api.command.admin.systemvm; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/systemvm/command/StopSystemVmCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/systemvm/command/StopSystemVmCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java index 1bf95831cc1..36f22c3d0b2 100644 --- a/api/src/org/apache/cloudstack/api/admin/systemvm/command/StopSystemVmCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.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.admin.systemvm.command; +package org.apache.cloudstack.api.command.admin.systemvm; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/systemvm/command/UpgradeSystemVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/systemvm/command/UpgradeSystemVMCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java index 88b69e173fa..3a4f97ba0f9 100644 --- a/api/src/org/apache/cloudstack/api/admin/systemvm/command/UpgradeSystemVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.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.admin.systemvm.command; +package org.apache.cloudstack.api.command.admin.systemvm; import org.apache.cloudstack.api.user.vm.command.UpgradeVMCmd; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/template/command/PrepareTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/template/command/PrepareTemplateCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java index 910169b96c3..7951a7647a3 100644 --- a/api/src/org/apache/cloudstack/api/admin/template/command/PrepareTemplateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.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.admin.template.command; +package org.apache.cloudstack.api.command.admin.template; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/admin/usage/command/AddTrafficTypeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/admin/usage/command/AddTrafficTypeCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java index 6135741e464..4c8cefaf31f 100644 --- a/api/src/org/apache/cloudstack/api/admin/usage/command/AddTrafficTypeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.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.admin.usage.command; +package org.apache.cloudstack.api.command.admin.usage; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/usage/command/DeleteTrafficTypeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/usage/command/DeleteTrafficTypeCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java index a7a2b7d7a9e..56499f32fe0 100644 --- a/api/src/org/apache/cloudstack/api/admin/usage/command/DeleteTrafficTypeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.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.admin.usage.command; +package org.apache.cloudstack.api.command.admin.usage; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/usage/command/ListTrafficTypeImplementorsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/usage/command/ListTrafficTypeImplementorsCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java index 1a7db85d562..54faadd9ede 100755 --- a/api/src/org/apache/cloudstack/api/admin/usage/command/ListTrafficTypeImplementorsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.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.admin.usage.command; +package org.apache.cloudstack.api.command.admin.usage; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/admin/usage/command/ListTrafficTypesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/usage/command/ListTrafficTypesCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java index d3fe699c7f0..23819dee1a9 100755 --- a/api/src/org/apache/cloudstack/api/admin/usage/command/ListTrafficTypesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.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.admin.usage.command; +package org.apache.cloudstack.api.command.admin.usage; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/admin/usage/command/UpdateTrafficTypeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/usage/command/UpdateTrafficTypeCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java index cca4d3d0ba7..de2938f2ae9 100644 --- a/api/src/org/apache/cloudstack/api/admin/usage/command/UpdateTrafficTypeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.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.admin.usage.command; +package org.apache.cloudstack.api.command.admin.usage; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/user/command/CreateUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/admin/user/command/CreateUserCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java index a4b3bcac45c..0ecefd344c7 100644 --- a/api/src/org/apache/cloudstack/api/admin/user/command/CreateUserCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.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.admin.user.command; +package org.apache.cloudstack.api.command.admin.user; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/user/command/DeleteUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/user/command/DeleteUserCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java index 5bdbfe7754f..99aafc498c1 100644 --- a/api/src/org/apache/cloudstack/api/admin/user/command/DeleteUserCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.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.admin.user.command; +package org.apache.cloudstack.api.command.admin.user; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/user/command/DisableUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/user/command/DisableUserCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java index 37589915a2c..ab5831bc619 100644 --- a/api/src/org/apache/cloudstack/api/admin/user/command/DisableUserCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.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.admin.user.command; +package org.apache.cloudstack.api.command.admin.user; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/user/command/EnableUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/user/command/EnableUserCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java index 92545fb68cb..066eae845f9 100644 --- a/api/src/org/apache/cloudstack/api/admin/user/command/EnableUserCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.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.admin.user.command; +package org.apache.cloudstack.api.command.admin.user; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/user/command/GetUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/user/command/GetUserCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java index 5cfc27ab499..5083a492e57 100644 --- a/api/src/org/apache/cloudstack/api/admin/user/command/GetUserCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.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.admin.user.command; +package org.apache.cloudstack.api.command.admin.user; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/user/command/ListUsersCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/user/command/ListUsersCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java index 6314e5e0d01..84b85c0141f 100644 --- a/api/src/org/apache/cloudstack/api/admin/user/command/ListUsersCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.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.admin.user.command; +package org.apache.cloudstack.api.command.admin.user; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/admin/user/command/LockUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/user/command/LockUserCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java index 8215fd5734e..3eee1da77be 100644 --- a/api/src/org/apache/cloudstack/api/admin/user/command/LockUserCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/user/LockUserCmd.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.admin.user.command; +package org.apache.cloudstack.api.command.admin.user; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/user/command/RegisterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/user/command/RegisterCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java index 8aa4d0473e3..5a38fdca5f8 100644 --- a/api/src/org/apache/cloudstack/api/admin/user/command/RegisterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/user/RegisterCmd.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.admin.user.command; +package org.apache.cloudstack.api.command.admin.user; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/user/command/UpdateUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/user/command/UpdateUserCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java index c77db3320ef..021a93e23b5 100644 --- a/api/src/org/apache/cloudstack/api/admin/user/command/UpdateUserCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.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.admin.user.command; +package org.apache.cloudstack.api.command.admin.user; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/vlan/command/CreateVlanIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/admin/vlan/command/CreateVlanIpRangeCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java index 27dd604199e..f50820b1a1e 100644 --- a/api/src/org/apache/cloudstack/api/admin/vlan/command/CreateVlanIpRangeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vlan/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 org.apache.cloudstack.api.admin.vlan.command; +package org.apache.cloudstack.api.command.admin.vlan; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/vlan/command/DeleteVlanIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/vlan/command/DeleteVlanIpRangeCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java index 9ae10c60cba..55272a67582 100644 --- a/api/src/org/apache/cloudstack/api/admin/vlan/command/DeleteVlanIpRangeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vlan/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 org.apache.cloudstack.api.admin.vlan.command; +package org.apache.cloudstack.api.command.admin.vlan; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/vlan/command/ListVlanIpRangesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/admin/vlan/command/ListVlanIpRangesCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java index 7de9016287b..3554c4fafd6 100644 --- a/api/src/org/apache/cloudstack/api/admin/vlan/command/ListVlanIpRangesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vlan/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 org.apache.cloudstack.api.admin.vlan.command; +package org.apache.cloudstack.api.command.admin.vlan; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/admin/vm/command/AssignVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/vm/command/AssignVMCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java index 5ae6140a189..12647dc01d0 100644 --- a/api/src/org/apache/cloudstack/api/admin/vm/command/AssignVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.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.admin.vm.command; +package org.apache.cloudstack.api.command.admin.vm; import java.util.List; @@ -24,7 +24,6 @@ import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; diff --git a/api/src/org/apache/cloudstack/api/admin/vm/command/MigrateVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/admin/vm/command/MigrateVMCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java index 6103a864786..011ff7868ca 100644 --- a/api/src/org/apache/cloudstack/api/admin/vm/command/MigrateVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.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.admin.vm.command; +package org.apache.cloudstack.api.command.admin.vm; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/vm/command/RecoverVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java similarity index 97% rename from api/src/org/apache/cloudstack/api/admin/vm/command/RecoverVMCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java index c10907cf203..c08c30b93be 100644 --- a/api/src/org/apache/cloudstack/api/admin/vm/command/RecoverVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java @@ -14,13 +14,12 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.admin.vm.command; +package org.apache.cloudstack.api.command.admin.vm; import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; diff --git a/api/src/org/apache/cloudstack/api/admin/vpc/command/CreatePrivateGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/admin/vpc/command/CreatePrivateGatewayCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java index 8abb0be1d54..300ffa09308 100644 --- a/api/src/org/apache/cloudstack/api/admin/vpc/command/CreatePrivateGatewayCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.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.admin.vpc.command; +package org.apache.cloudstack.api.command.admin.vpc; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/vpc/command/CreateVPCOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/vpc/command/CreateVPCOfferingCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java index 23d1d9b4bb1..c2fcb22a6d7 100644 --- a/api/src/org/apache/cloudstack/api/admin/vpc/command/CreateVPCOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.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.admin.vpc.command; +package org.apache.cloudstack.api.command.admin.vpc; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/admin/vpc/command/DeletePrivateGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/vpc/command/DeletePrivateGatewayCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java index 4128e10e8ad..b6a921af249 100644 --- a/api/src/org/apache/cloudstack/api/admin/vpc/command/DeletePrivateGatewayCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.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.admin.vpc.command; +package org.apache.cloudstack.api.command.admin.vpc; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/vpc/command/DeleteVPCOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/vpc/command/DeleteVPCOfferingCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java index b929efff1a0..ed91dfea621 100644 --- a/api/src/org/apache/cloudstack/api/admin/vpc/command/DeleteVPCOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.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.admin.vpc.command; +package org.apache.cloudstack.api.command.admin.vpc; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/vpc/command/UpdateVPCOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/vpc/command/UpdateVPCOfferingCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java index df4087668fb..81affa1386e 100644 --- a/api/src/org/apache/cloudstack/api/admin/vpc/command/UpdateVPCOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.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.admin.vpc.command; +package org.apache.cloudstack.api.command.admin.vpc; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/zone/command/CreateZoneCmd.java b/api/src/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/zone/command/CreateZoneCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java index 64dfbeec88b..6b59f936517 100755 --- a/api/src/org/apache/cloudstack/api/admin/zone/command/CreateZoneCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java @@ -14,13 +14,12 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.admin.zone.command; +package org.apache.cloudstack.api.command.admin.zone; import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; diff --git a/api/src/org/apache/cloudstack/api/admin/zone/command/DeleteZoneCmd.java b/api/src/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java similarity index 96% rename from api/src/org/apache/cloudstack/api/admin/zone/command/DeleteZoneCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java index 75770673588..c62c5362f5a 100644 --- a/api/src/org/apache/cloudstack/api/admin/zone/command/DeleteZoneCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java @@ -14,13 +14,12 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.admin.zone.command; +package org.apache.cloudstack.api.command.admin.zone; import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; diff --git a/api/src/org/apache/cloudstack/api/admin/zone/command/MarkDefaultZoneForAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java similarity index 97% rename from api/src/org/apache/cloudstack/api/admin/zone/command/MarkDefaultZoneForAccountCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java index fdb1d9cbbe6..22ddfbfdaa1 100644 --- a/api/src/org/apache/cloudstack/api/admin/zone/command/MarkDefaultZoneForAccountCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.admin.zone.command; +package org.apache.cloudstack.api.command.admin.zone; import org.apache.log4j.Logger; @@ -23,7 +23,6 @@ import org.apache.cloudstack.api.BaseAsyncCmd; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.IdentityMapper; import com.cloud.user.Account; import com.cloud.event.EventTypes; import com.cloud.async.AsyncJob; diff --git a/api/src/org/apache/cloudstack/api/admin/zone/command/UpdateZoneCmd.java b/api/src/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/admin/zone/command/UpdateZoneCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java index f1e9f738f61..c67607fd34d 100755 --- a/api/src/org/apache/cloudstack/api/admin/zone/command/UpdateZoneCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.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.admin.zone.command; +package org.apache.cloudstack.api.command.admin.zone; import java.util.List; import java.util.Map; @@ -23,7 +23,6 @@ import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; diff --git a/api/src/org/apache/cloudstack/api/user/account/command/AddAccountToProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/account/command/AddAccountToProjectCmd.java rename to api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java index 56dea9ebc76..ba94d4d3e28 100644 --- a/api/src/org/apache/cloudstack/api/user/account/command/AddAccountToProjectCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.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.account.command; +package org.apache.cloudstack.api.command.user.account; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/account/command/DeleteAccountFromProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java similarity index 97% rename from api/src/org/apache/cloudstack/api/user/account/command/DeleteAccountFromProjectCmd.java rename to api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java index d5ce0e9c02a..29c247f9968 100644 --- a/api/src/org/apache/cloudstack/api/user/account/command/DeleteAccountFromProjectCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java @@ -14,9 +14,9 @@ // 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.account.command; +package org.apache.cloudstack.api.command.user.account; -import org.apache.cloudstack.api.user.project.command.DeleteProjectCmd; +import org.apache.cloudstack.api.command.user.project.DeleteProjectCmd; import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; diff --git a/api/src/org/apache/cloudstack/api/user/account/command/ListAccountsCmd.java b/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/account/command/ListAccountsCmd.java rename to api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java index 1a412859b73..c6d9adb6a35 100755 --- a/api/src/org/apache/cloudstack/api/user/account/command/ListAccountsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.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.account.command; +package org.apache.cloudstack.api.command.user.account; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/account/command/ListProjectAccountsCmd.java b/api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/account/command/ListProjectAccountsCmd.java rename to api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java index 3ad7fe644a0..f4850165cc5 100644 --- a/api/src/org/apache/cloudstack/api/user/account/command/ListProjectAccountsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.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.account.command; +package org.apache.cloudstack.api.command.user.account; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/address/command/AssociateIPAddrCmd.java b/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/user/address/command/AssociateIPAddrCmd.java rename to api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java index ca98a4bc6bc..806a90d504c 100644 --- a/api/src/org/apache/cloudstack/api/user/address/command/AssociateIPAddrCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.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.address.command; +package org.apache.cloudstack.api.command.user.address; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/address/command/DisassociateIPAddrCmd.java b/api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/address/command/DisassociateIPAddrCmd.java rename to api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java index 265b296747a..de0a5d894ce 100644 --- a/api/src/org/apache/cloudstack/api/user/address/command/DisassociateIPAddrCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.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.address.command; +package org.apache.cloudstack.api.command.user.address; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/address/command/ListPublicIpAddressesCmd.java b/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/user/address/command/ListPublicIpAddressesCmd.java rename to api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java index 85201f8da31..f889a9d3018 100644 --- a/api/src/org/apache/cloudstack/api/user/address/command/ListPublicIpAddressesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.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.address.command; +package org.apache.cloudstack.api.command.user.address; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/autoscale/command/CreateAutoScalePolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/user/autoscale/command/CreateAutoScalePolicyCmd.java rename to api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java index 75cead97a3d..d88fe4f51b4 100644 --- a/api/src/org/apache/cloudstack/api/user/autoscale/command/CreateAutoScalePolicyCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.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.autoscale.command; +package org.apache.cloudstack.api.command.user.autoscale; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/autoscale/command/CreateAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/user/autoscale/command/CreateAutoScaleVmGroupCmd.java rename to api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java index 34042075bca..411458cc472 100644 --- a/api/src/org/apache/cloudstack/api/user/autoscale/command/CreateAutoScaleVmGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.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.autoscale.command; +package org.apache.cloudstack.api.command.user.autoscale; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/autoscale/command/CreateAutoScaleVmProfileCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/user/autoscale/command/CreateAutoScaleVmProfileCmd.java rename to api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java index 74c08dfd9f9..d152c61122b 100644 --- a/api/src/org/apache/cloudstack/api/user/autoscale/command/CreateAutoScaleVmProfileCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.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.autoscale.command; +package org.apache.cloudstack.api.command.user.autoscale; import java.util.HashMap; import java.util.Map; diff --git a/api/src/org/apache/cloudstack/api/user/autoscale/command/CreateConditionCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/autoscale/command/CreateConditionCmd.java rename to api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java index 2884f8e3a90..f48653d6efc 100644 --- a/api/src/org/apache/cloudstack/api/user/autoscale/command/CreateConditionCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.user.autoscale.command; +package org.apache.cloudstack.api.command.user.autoscale; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/autoscale/command/DeleteAutoScalePolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/autoscale/command/DeleteAutoScalePolicyCmd.java rename to api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java index a6228b4be76..d13783b1f8b 100644 --- a/api/src/org/apache/cloudstack/api/user/autoscale/command/DeleteAutoScalePolicyCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.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.autoscale.command; +package org.apache.cloudstack.api.command.user.autoscale; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/autoscale/command/DeleteAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/autoscale/command/DeleteAutoScaleVmGroupCmd.java rename to api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java index b1198c94c35..cb4de7f524d 100644 --- a/api/src/org/apache/cloudstack/api/user/autoscale/command/DeleteAutoScaleVmGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.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.autoscale.command; +package org.apache.cloudstack.api.command.user.autoscale; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/autoscale/command/DeleteAutoScaleVmProfileCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/autoscale/command/DeleteAutoScaleVmProfileCmd.java rename to api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java index a8565dc8097..1d6caf2b3c9 100644 --- a/api/src/org/apache/cloudstack/api/user/autoscale/command/DeleteAutoScaleVmProfileCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.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.autoscale.command; +package org.apache.cloudstack.api.command.user.autoscale; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/autoscale/command/DeleteConditionCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/autoscale/command/DeleteConditionCmd.java rename to api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java index 26c23a5ef83..43f0fc1cdd5 100644 --- a/api/src/org/apache/cloudstack/api/user/autoscale/command/DeleteConditionCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.user.autoscale.command; +package org.apache.cloudstack.api.command.user.autoscale; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/autoscale/command/DisableAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/autoscale/command/DisableAutoScaleVmGroupCmd.java rename to api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java index ba87c586572..7552e41182a 100644 --- a/api/src/org/apache/cloudstack/api/user/autoscale/command/DisableAutoScaleVmGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.user.autoscale.command; +package org.apache.cloudstack.api.command.user.autoscale; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/autoscale/command/EnableAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/autoscale/command/EnableAutoScaleVmGroupCmd.java rename to api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java index 93039b0b204..9c63327aad3 100644 --- a/api/src/org/apache/cloudstack/api/user/autoscale/command/EnableAutoScaleVmGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.user.autoscale.command; +package org.apache.cloudstack.api.command.user.autoscale; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/autoscale/command/ListAutoScalePoliciesCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/autoscale/command/ListAutoScalePoliciesCmd.java rename to api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java index 57db5be3933..e8bc8318b75 100644 --- a/api/src/org/apache/cloudstack/api/user/autoscale/command/ListAutoScalePoliciesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.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.autoscale.command; +package org.apache.cloudstack.api.command.user.autoscale; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/autoscale/command/ListAutoScaleVmGroupsCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/autoscale/command/ListAutoScaleVmGroupsCmd.java rename to api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java index adea921c696..37d0945a788 100644 --- a/api/src/org/apache/cloudstack/api/user/autoscale/command/ListAutoScaleVmGroupsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.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.autoscale.command; +package org.apache.cloudstack.api.command.user.autoscale; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/autoscale/command/ListAutoScaleVmProfilesCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/autoscale/command/ListAutoScaleVmProfilesCmd.java rename to api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java index aae7376eeb1..e8554d965b7 100644 --- a/api/src/org/apache/cloudstack/api/user/autoscale/command/ListAutoScaleVmProfilesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.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.autoscale.command; +package org.apache.cloudstack.api.command.user.autoscale; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/autoscale/command/ListConditionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/autoscale/command/ListConditionsCmd.java rename to api/src/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java index d5dd067ba5d..be5b17ef16b 100644 --- a/api/src/org/apache/cloudstack/api/user/autoscale/command/ListConditionsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.user.autoscale.command; +package org.apache.cloudstack.api.command.user.autoscale; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/autoscale/command/ListCountersCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/autoscale/command/ListCountersCmd.java rename to api/src/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java index b55aeb5d964..abb2fc0504f 100644 --- a/api/src/org/apache/cloudstack/api/user/autoscale/command/ListCountersCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.user.autoscale.command; +package org.apache.cloudstack.api.command.user.autoscale; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/autoscale/command/UpdateAutoScalePolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/autoscale/command/UpdateAutoScalePolicyCmd.java rename to api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java index 01945f243a0..17ee90d6132 100644 --- a/api/src/org/apache/cloudstack/api/user/autoscale/command/UpdateAutoScalePolicyCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.user.autoscale.command; +package org.apache.cloudstack.api.command.user.autoscale; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/autoscale/command/UpdateAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/autoscale/command/UpdateAutoScaleVmGroupCmd.java rename to api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java index 1d7911e6d70..d0f84e50232 100644 --- a/api/src/org/apache/cloudstack/api/user/autoscale/command/UpdateAutoScaleVmGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.user.autoscale.command; +package org.apache.cloudstack.api.command.user.autoscale; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/autoscale/command/UpdateAutoScaleVmProfileCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/autoscale/command/UpdateAutoScaleVmProfileCmd.java rename to api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java index 08e0667575c..5f5d808e63f 100644 --- a/api/src/org/apache/cloudstack/api/user/autoscale/command/UpdateAutoScaleVmProfileCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.user.autoscale.command; +package org.apache.cloudstack.api.command.user.autoscale; import java.util.Map; diff --git a/api/src/org/apache/cloudstack/api/user/config/command/ListCapabilitiesCmd.java b/api/src/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java similarity index 97% rename from api/src/org/apache/cloudstack/api/user/config/command/ListCapabilitiesCmd.java rename to api/src/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java index 3b235ee38c0..d9f2195d76c 100644 --- a/api/src/org/apache/cloudstack/api/user/config/command/ListCapabilitiesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/config/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.config.command; +package org.apache.cloudstack.api.command.user.config; import java.util.Map; diff --git a/api/src/org/apache/cloudstack/api/user/event/command/ListEventTypesCmd.java b/api/src/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java similarity index 97% rename from api/src/org/apache/cloudstack/api/user/event/command/ListEventTypesCmd.java rename to api/src/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java index 6cb385ab283..2828b32a82b 100644 --- a/api/src/org/apache/cloudstack/api/user/event/command/ListEventTypesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.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.event.command; +package org.apache.cloudstack.api.command.user.event; import java.util.ArrayList; diff --git a/api/src/org/apache/cloudstack/api/user/event/command/ListEventsCmd.java b/api/src/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java similarity index 95% rename from api/src/org/apache/cloudstack/api/user/event/command/ListEventsCmd.java rename to api/src/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java index a16252dd1d6..769c97e17ac 100755 --- a/api/src/org/apache/cloudstack/api/user/event/command/ListEventsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java @@ -14,9 +14,8 @@ // 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.event.command; +package org.apache.cloudstack.api.command.user.event; -import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -29,10 +28,7 @@ import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import com.cloud.api.response.EventResponse; import com.cloud.api.response.ListResponse; -import com.cloud.api.response.ResourceTagResponse; import com.cloud.api.view.vo.EventJoinVO; -import com.cloud.api.view.vo.ResourceTagJoinVO; -import com.cloud.event.Event; import com.cloud.utils.Pair; @Implementation(description="A command to list events.", responseObject=EventResponse.class) diff --git a/api/src/org/apache/cloudstack/api/user/firewall/command/CreateFirewallRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/user/firewall/command/CreateFirewallRuleCmd.java rename to api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java index 17f2d2a3dea..4daf3f6ae75 100644 --- a/api/src/org/apache/cloudstack/api/user/firewall/command/CreateFirewallRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.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.firewall.command; +package org.apache.cloudstack.api.command.user.firewall; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/firewall/command/CreatePortForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/user/firewall/command/CreatePortForwardingRuleCmd.java rename to api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java index df0f4419a21..97ec651cd4c 100644 --- a/api/src/org/apache/cloudstack/api/user/firewall/command/CreatePortForwardingRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.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.firewall.command; +package org.apache.cloudstack.api.command.user.firewall; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/firewall/command/DeleteFirewallRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/firewall/command/DeleteFirewallRuleCmd.java rename to api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java index 7d7ff58bb18..6f714b078db 100644 --- a/api/src/org/apache/cloudstack/api/user/firewall/command/DeleteFirewallRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.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.firewall.command; +package org.apache.cloudstack.api.command.user.firewall; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/firewall/command/DeletePortForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/firewall/command/DeletePortForwardingRuleCmd.java rename to api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java index 880b87bf379..10b5f27fa29 100644 --- a/api/src/org/apache/cloudstack/api/user/firewall/command/DeletePortForwardingRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.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.firewall.command; +package org.apache.cloudstack.api.command.user.firewall; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/firewall/command/ListFirewallRulesCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/firewall/command/ListFirewallRulesCmd.java rename to api/src/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java index 2317a9fb169..20c908b8175 100644 --- a/api/src/org/apache/cloudstack/api/user/firewall/command/ListFirewallRulesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.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.firewall.command; +package org.apache.cloudstack.api.command.user.firewall; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/firewall/command/ListPortForwardingRulesCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/firewall/command/ListPortForwardingRulesCmd.java rename to api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java index b45fc350738..930133d00c2 100644 --- a/api/src/org/apache/cloudstack/api/user/firewall/command/ListPortForwardingRulesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.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.firewall.command; +package org.apache.cloudstack.api.command.user.firewall; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/firewall/command/UpdatePortForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/firewall/command/UpdatePortForwardingRuleCmd.java rename to api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java index 654e6af6259..d7599c65993 100644 --- a/api/src/org/apache/cloudstack/api/user/firewall/command/UpdatePortForwardingRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.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.firewall.command; +package org.apache.cloudstack.api.command.user.firewall; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/guest/command/ListGuestOsCategoriesCmd.java b/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java similarity index 96% rename from api/src/org/apache/cloudstack/api/user/guest/command/ListGuestOsCategoriesCmd.java rename to api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java index 134d6ed22fb..6a8d00bfc84 100644 --- a/api/src/org/apache/cloudstack/api/user/guest/command/ListGuestOsCategoriesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java @@ -14,12 +14,12 @@ // 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.guest.command; +package org.apache.cloudstack.api.command.user.guest; import java.util.ArrayList; import java.util.List; -import org.apache.cloudstack.api.user.iso.command.ListIsosCmd; +import org.apache.cloudstack.api.command.user.iso.ListIsosCmd; import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; diff --git a/api/src/org/apache/cloudstack/api/user/guest/command/ListGuestOsCmd.java b/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java similarity index 97% rename from api/src/org/apache/cloudstack/api/user/guest/command/ListGuestOsCmd.java rename to api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java index f08efafdb9f..1bed7cabe2e 100644 --- a/api/src/org/apache/cloudstack/api/user/guest/command/ListGuestOsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java @@ -14,12 +14,12 @@ // 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.guest.command; +package org.apache.cloudstack.api.command.user.guest; import java.util.ArrayList; import java.util.List; -import org.apache.cloudstack.api.user.iso.command.ListIsosCmd; +import org.apache.cloudstack.api.command.user.iso.ListIsosCmd; import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; diff --git a/api/src/org/apache/cloudstack/api/user/iso/command/AttachIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/iso/command/AttachIsoCmd.java rename to api/src/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java index 7f799c8f882..8fdfb3dbee8 100755 --- a/api/src/org/apache/cloudstack/api/user/iso/command/AttachIsoCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.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.iso.command; +package org.apache.cloudstack.api.command.user.iso; import org.apache.cloudstack.api.user.vm.command.DeployVMCmd; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/iso/command/DeleteIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/iso/command/DeleteIsoCmd.java rename to api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java index ba94b6693c9..b3c47202bc3 100755 --- a/api/src/org/apache/cloudstack/api/user/iso/command/DeleteIsoCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.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.iso.command; +package org.apache.cloudstack.api.command.user.iso; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/iso/command/DetachIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/iso/command/DetachIsoCmd.java rename to api/src/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java index 64334adbd86..58c6bc4959b 100755 --- a/api/src/org/apache/cloudstack/api/user/iso/command/DetachIsoCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.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.iso.command; +package org.apache.cloudstack.api.command.user.iso; import org.apache.cloudstack.api.user.vm.command.DeployVMCmd; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/iso/command/ExtractIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/iso/command/ExtractIsoCmd.java rename to api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java index 13a833f6d5a..ac595503225 100755 --- a/api/src/org/apache/cloudstack/api/user/iso/command/ExtractIsoCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.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.iso.command; +package org.apache.cloudstack.api.command.user.iso; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/iso/command/ListIsoPermissionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java similarity index 96% rename from api/src/org/apache/cloudstack/api/user/iso/command/ListIsoPermissionsCmd.java rename to api/src/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java index b047689b6e6..45ca87552a7 100644 --- a/api/src/org/apache/cloudstack/api/user/iso/command/ListIsoPermissionsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.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.iso.command; +package org.apache.cloudstack.api.command.user.iso; import com.cloud.api.commands.ListTemplateOrIsoPermissionsCmd; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/iso/command/ListIsosCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/user/iso/command/ListIsosCmd.java rename to api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java index 4a5f996aaef..0c1ae2223cf 100755 --- a/api/src/org/apache/cloudstack/api/user/iso/command/ListIsosCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.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.iso.command; +package org.apache.cloudstack.api.command.user.iso; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/iso/command/RegisterIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/user/iso/command/RegisterIsoCmd.java rename to api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java index cedaa869886..3aea186c9fd 100755 --- a/api/src/org/apache/cloudstack/api/user/iso/command/RegisterIsoCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.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.iso.command; +package org.apache.cloudstack.api.command.user.iso; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/iso/command/UpdateIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/iso/command/UpdateIsoCmd.java rename to api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java index eb83260d5f1..f2c8dbfaf5b 100755 --- a/api/src/org/apache/cloudstack/api/user/iso/command/UpdateIsoCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.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.iso.command; +package org.apache.cloudstack.api.command.user.iso; import com.cloud.api.commands.UpdateTemplateOrIsoCmd; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/iso/command/UpdateIsoPermissionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java similarity index 97% rename from api/src/org/apache/cloudstack/api/user/iso/command/UpdateIsoPermissionsCmd.java rename to api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java index f657b66c6e0..d5199d8be04 100644 --- a/api/src/org/apache/cloudstack/api/user/iso/command/UpdateIsoPermissionsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.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.iso.command; +package org.apache.cloudstack.api.command.user.iso; import com.cloud.api.commands.UpdateTemplateOrIsoPermissionsCmd; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/job/command/ListAsyncJobsCmd.java b/api/src/org/apache/cloudstack/api/command/user/job/ListAsyncJobsCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/job/command/ListAsyncJobsCmd.java rename to api/src/org/apache/cloudstack/api/command/user/job/ListAsyncJobsCmd.java index addaa12a67d..471c5436113 100644 --- a/api/src/org/apache/cloudstack/api/user/job/command/ListAsyncJobsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/job/ListAsyncJobsCmd.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.job.command; +package org.apache.cloudstack.api.command.user.job; import java.util.ArrayList; import java.util.Date; diff --git a/api/src/org/apache/cloudstack/api/user/job/command/QueryAsyncJobResultCmd.java b/api/src/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/job/command/QueryAsyncJobResultCmd.java rename to api/src/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java index defeab7fab4..0eb7e345cd0 100644 --- a/api/src/org/apache/cloudstack/api/user/job/command/QueryAsyncJobResultCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.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.job.command; +package org.apache.cloudstack.api.command.user.job; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/lb/command/AssignToLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/lb/command/AssignToLoadBalancerRuleCmd.java rename to api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java index fae88a65c26..8395bb1d5cb 100644 --- a/api/src/org/apache/cloudstack/api/user/lb/command/AssignToLoadBalancerRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.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.lb.command; +package org.apache.cloudstack.api.command.user.loadbalancer; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/lb/command/CreateLBStickinessPolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/user/lb/command/CreateLBStickinessPolicyCmd.java rename to api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java index 866422a4e0b..99aeed7bd8c 100644 --- a/api/src/org/apache/cloudstack/api/user/lb/command/CreateLBStickinessPolicyCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.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.lb.command; +package org.apache.cloudstack.api.command.user.loadbalancer; import java.util.Map; diff --git a/api/src/org/apache/cloudstack/api/user/lb/command/CreateLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/user/lb/command/CreateLoadBalancerRuleCmd.java rename to api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java index bacf54de5e0..1183f5b49c6 100644 --- a/api/src/org/apache/cloudstack/api/user/lb/command/CreateLoadBalancerRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.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.lb.command; +package org.apache.cloudstack.api.command.user.loadbalancer; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/lb/command/DeleteLBStickinessPolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/lb/command/DeleteLBStickinessPolicyCmd.java rename to api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java index f68ab8c0f82..8b5601fd828 100644 --- a/api/src/org/apache/cloudstack/api/user/lb/command/DeleteLBStickinessPolicyCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.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.lb.command; +package org.apache.cloudstack.api.command.user.loadbalancer; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/lb/command/DeleteLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/lb/command/DeleteLoadBalancerRuleCmd.java rename to api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java index 2bff86b9e83..7713dc74b2c 100644 --- a/api/src/org/apache/cloudstack/api/user/lb/command/DeleteLoadBalancerRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.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.lb.command; +package org.apache.cloudstack.api.command.user.loadbalancer; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/lb/command/ListLBStickinessPoliciesCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/lb/command/ListLBStickinessPoliciesCmd.java rename to api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java index b4a351cbc6d..c0cb77af976 100644 --- a/api/src/org/apache/cloudstack/api/user/lb/command/ListLBStickinessPoliciesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.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.lb.command; +package org.apache.cloudstack.api.command.user.loadbalancer; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/lb/command/ListLoadBalancerRuleInstancesCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/lb/command/ListLoadBalancerRuleInstancesCmd.java rename to api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java index 1b6577ebd5a..8e84e9c5ff0 100644 --- a/api/src/org/apache/cloudstack/api/user/lb/command/ListLoadBalancerRuleInstancesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.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.lb.command; +package org.apache.cloudstack.api.command.user.loadbalancer; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/lb/command/ListLoadBalancerRulesCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/lb/command/ListLoadBalancerRulesCmd.java rename to api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java index 0c1b9b0f223..2f014f6833a 100644 --- a/api/src/org/apache/cloudstack/api/user/lb/command/ListLoadBalancerRulesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.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.lb.command; +package org.apache.cloudstack.api.command.user.loadbalancer; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/lb/command/RemoveFromLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/lb/command/RemoveFromLoadBalancerRuleCmd.java rename to api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java index 9aeca0281d2..ae65d8d5ab6 100644 --- a/api/src/org/apache/cloudstack/api/user/lb/command/RemoveFromLoadBalancerRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.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.lb.command; +package org.apache.cloudstack.api.command.user.loadbalancer; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/lb/command/UpdateLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/lb/command/UpdateLoadBalancerRuleCmd.java rename to api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java index a738c65f9b4..6c1b5a2a75e 100644 --- a/api/src/org/apache/cloudstack/api/user/lb/command/UpdateLoadBalancerRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.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.lb.command; +package org.apache.cloudstack.api.command.user.loadbalancer; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/nat/command/CreateIpForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/user/nat/command/CreateIpForwardingRuleCmd.java rename to api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java index 8f4dff75fd9..6afa8fa7b61 100644 --- a/api/src/org/apache/cloudstack/api/user/nat/command/CreateIpForwardingRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.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.nat.command; +package org.apache.cloudstack.api.command.user.nat; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/nat/command/DeleteIpForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/nat/command/DeleteIpForwardingRuleCmd.java rename to api/src/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java index aa0d87fe6d2..0986f98463f 100644 --- a/api/src/org/apache/cloudstack/api/user/nat/command/DeleteIpForwardingRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.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.nat.command; +package org.apache.cloudstack.api.command.user.nat; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/nat/command/DisableStaticNatCmd.java b/api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java similarity index 97% rename from api/src/org/apache/cloudstack/api/user/nat/command/DisableStaticNatCmd.java rename to api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java index e228e713644..228cbd89fea 100644 --- a/api/src/org/apache/cloudstack/api/user/nat/command/DisableStaticNatCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java @@ -14,9 +14,9 @@ // 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.nat.command; +package org.apache.cloudstack.api.command.user.nat; -import org.apache.cloudstack.api.user.firewall.command.DeletePortForwardingRuleCmd; +import org.apache.cloudstack.api.command.user.firewall.DeletePortForwardingRuleCmd; import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; diff --git a/api/src/org/apache/cloudstack/api/user/nat/command/EnableStaticNatCmd.java b/api/src/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java similarity index 97% rename from api/src/org/apache/cloudstack/api/user/nat/command/EnableStaticNatCmd.java rename to api/src/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java index 3398077dcc1..b5fa549a145 100644 --- a/api/src/org/apache/cloudstack/api/user/nat/command/EnableStaticNatCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java @@ -14,9 +14,8 @@ // 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.nat.command; +package org.apache.cloudstack.api.command.user.nat; -import org.apache.cloudstack.api.user.nat.command.CreateIpForwardingRuleCmd; import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; diff --git a/api/src/org/apache/cloudstack/api/user/nat/command/ListIpForwardingRulesCmd.java b/api/src/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/nat/command/ListIpForwardingRulesCmd.java rename to api/src/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java index 50c240804bf..337a8795a3b 100644 --- a/api/src/org/apache/cloudstack/api/user/nat/command/ListIpForwardingRulesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.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.nat.command; +package org.apache.cloudstack.api.command.user.nat; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/network/command/CreateNetworkACLCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/user/network/command/CreateNetworkACLCmd.java rename to api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java index 89d5c85efc0..0e6a0838e1e 100644 --- a/api/src/org/apache/cloudstack/api/user/network/command/CreateNetworkACLCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.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.network.command; +package org.apache.cloudstack.api.command.user.network; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/network/command/CreateNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/user/network/command/CreateNetworkCmd.java rename to api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java index cfa71dd1086..331664e21f0 100644 --- a/api/src/org/apache/cloudstack/api/user/network/command/CreateNetworkCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.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.network.command; +package org.apache.cloudstack.api.command.user.network; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/network/command/DeleteNetworkACLCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/network/command/DeleteNetworkACLCmd.java rename to api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java index d34d07d5cc6..6aeed16d7f4 100644 --- a/api/src/org/apache/cloudstack/api/user/network/command/DeleteNetworkACLCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.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.network.command; +package org.apache.cloudstack.api.command.user.network; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/network/command/DeleteNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java similarity index 96% rename from api/src/org/apache/cloudstack/api/user/network/command/DeleteNetworkCmd.java rename to api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java index f158e4321ab..8e47e7699b1 100644 --- a/api/src/org/apache/cloudstack/api/user/network/command/DeleteNetworkCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java @@ -14,9 +14,9 @@ // 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.network.command; +package org.apache.cloudstack.api.command.user.network; -import org.apache.cloudstack.api.admin.network.command.DeleteNetworkOfferingCmd; +import org.apache.cloudstack.api.command.admin.network.DeleteNetworkOfferingCmd; import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; diff --git a/api/src/org/apache/cloudstack/api/user/network/command/ListNetworkACLsCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/network/command/ListNetworkACLsCmd.java rename to api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java index 4696ab8960d..a14066a689d 100644 --- a/api/src/org/apache/cloudstack/api/user/network/command/ListNetworkACLsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.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.network.command; +package org.apache.cloudstack.api.command.user.network; import java.util.ArrayList; diff --git a/api/src/org/apache/cloudstack/api/user/network/command/ListNetworkOfferingsCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/user/network/command/ListNetworkOfferingsCmd.java rename to api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java index 71d760bd9af..33003423d8b 100644 --- a/api/src/org/apache/cloudstack/api/user/network/command/ListNetworkOfferingsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.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.network.command; +package org.apache.cloudstack.api.command.user.network; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/network/command/ListNetworksCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/user/network/command/ListNetworksCmd.java rename to api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java index 945fbb61926..e9be8c41439 100644 --- a/api/src/org/apache/cloudstack/api/user/network/command/ListNetworksCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.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.network.command; +package org.apache.cloudstack.api.command.user.network; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/network/command/RestartNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/network/command/RestartNetworkCmd.java rename to api/src/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java index 5065937f101..f73fc5691e2 100644 --- a/api/src/org/apache/cloudstack/api/user/network/command/RestartNetworkCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.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.network.command; +package org.apache.cloudstack.api.command.user.network; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/network/command/UpdateNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/user/network/command/UpdateNetworkCmd.java rename to api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java index 2b3dd29df50..4aafee5bc52 100644 --- a/api/src/org/apache/cloudstack/api/user/network/command/UpdateNetworkCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.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.network.command; +package org.apache.cloudstack.api.command.user.network; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/offering/command/ListDiskOfferingsCmd.java b/api/src/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/offering/command/ListDiskOfferingsCmd.java rename to api/src/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java index 85d42496bdb..a9a4eb69eda 100644 --- a/api/src/org/apache/cloudstack/api/user/offering/command/ListDiskOfferingsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.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.offering.command; +package org.apache.cloudstack.api.command.user.offering; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/offering/command/ListServiceOfferingsCmd.java b/api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/offering/command/ListServiceOfferingsCmd.java rename to api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java index e5c12661956..42aabc205aa 100644 --- a/api/src/org/apache/cloudstack/api/user/offering/command/ListServiceOfferingsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/offering/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 org.apache.cloudstack.api.user.offering.command; +package org.apache.cloudstack.api.command.user.offering; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/project/command/ActivateProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/ActivateProjectCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/project/command/ActivateProjectCmd.java rename to api/src/org/apache/cloudstack/api/command/user/project/ActivateProjectCmd.java index b5526c6fe20..c44c0241988 100644 --- a/api/src/org/apache/cloudstack/api/user/project/command/ActivateProjectCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/project/ActivateProjectCmd.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.project.command; +package org.apache.cloudstack.api.command.user.project; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/project/command/CreateProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/project/command/CreateProjectCmd.java rename to api/src/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java index e66dc746358..9154b2633bb 100644 --- a/api/src/org/apache/cloudstack/api/user/project/command/CreateProjectCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.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.project.command; +package org.apache.cloudstack.api.command.user.project; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/project/command/DeleteProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/project/command/DeleteProjectCmd.java rename to api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java index ca9e334d496..b0fb2b97763 100644 --- a/api/src/org/apache/cloudstack/api/user/project/command/DeleteProjectCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.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.project.command; +package org.apache.cloudstack.api.command.user.project; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/project/command/DeleteProjectInvitationCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/project/command/DeleteProjectInvitationCmd.java rename to api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.java index 9804bd60b67..76740734edd 100644 --- a/api/src/org/apache/cloudstack/api/user/project/command/DeleteProjectInvitationCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.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.project.command; +package org.apache.cloudstack.api.command.user.project; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/project/command/ListProjectInvitationsCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/project/command/ListProjectInvitationsCmd.java rename to api/src/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.java index 276ff8c70c5..9083f03b61b 100644 --- a/api/src/org/apache/cloudstack/api/user/project/command/ListProjectInvitationsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.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.project.command; +package org.apache.cloudstack.api.command.user.project; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/project/command/ListProjectsCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/project/command/ListProjectsCmd.java rename to api/src/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java index d8afc64a3d3..649746664b1 100644 --- a/api/src/org/apache/cloudstack/api/user/project/command/ListProjectsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.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.project.command; +package org.apache.cloudstack.api.command.user.project; import java.util.ArrayList; import java.util.Collection; diff --git a/api/src/org/apache/cloudstack/api/user/project/command/SuspendProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/project/command/SuspendProjectCmd.java rename to api/src/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.java index 4a60d5fce47..9542fa9dc78 100644 --- a/api/src/org/apache/cloudstack/api/user/project/command/SuspendProjectCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.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.project.command; +package org.apache.cloudstack.api.command.user.project; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/project/command/UpdateProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/project/command/UpdateProjectCmd.java rename to api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.java index f0bfbdf4db1..071571b8f45 100644 --- a/api/src/org/apache/cloudstack/api/user/project/command/UpdateProjectCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.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.project.command; +package org.apache.cloudstack.api.command.user.project; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/project/command/UpdateProjectInvitationCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/project/command/UpdateProjectInvitationCmd.java rename to api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.java index 8c24b2c1ea2..1d9d7318d9e 100644 --- a/api/src/org/apache/cloudstack/api/user/project/command/UpdateProjectInvitationCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.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.project.command; +package org.apache.cloudstack.api.command.user.project; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/resource/command/GetCloudIdentifierCmd.java b/api/src/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/resource/command/GetCloudIdentifierCmd.java rename to api/src/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.java index 09d8ecdcfe1..ca33036ad4c 100644 --- a/api/src/org/apache/cloudstack/api/user/resource/command/GetCloudIdentifierCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.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.command.user.resource; import java.util.ArrayList; diff --git a/api/src/org/apache/cloudstack/api/user/resource/command/ListHypervisorsCmd.java b/api/src/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java similarity index 96% rename from api/src/org/apache/cloudstack/api/user/resource/command/ListHypervisorsCmd.java rename to api/src/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java index 2f78aa8afd2..dd4bf989179 100644 --- a/api/src/org/apache/cloudstack/api/user/resource/command/ListHypervisorsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java @@ -14,12 +14,12 @@ // 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.command.user.resource; import java.util.ArrayList; import java.util.List; -import org.apache.cloudstack.api.admin.router.command.UpgradeRouterCmd; +import org.apache.cloudstack.api.command.admin.router.UpgradeRouterCmd; import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; diff --git a/api/src/org/apache/cloudstack/api/user/resource/command/ListResourceLimitsCmd.java b/api/src/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/resource/command/ListResourceLimitsCmd.java rename to api/src/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java index 49e29d67dd4..3e0d9a2ed08 100644 --- a/api/src/org/apache/cloudstack/api/user/resource/command/ListResourceLimitsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.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.command.user.resource; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/resource/command/UpdateResourceCountCmd.java b/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/user/resource/command/UpdateResourceCountCmd.java rename to api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java index 53448c697cc..30888c7c2d7 100644 --- a/api/src/org/apache/cloudstack/api/user/resource/command/UpdateResourceCountCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.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.command.user.resource; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/resource/command/UpdateResourceLimitCmd.java b/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/resource/command/UpdateResourceLimitCmd.java rename to api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java index c1270762a55..743c8244911 100644 --- a/api/src/org/apache/cloudstack/api/user/resource/command/UpdateResourceLimitCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.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.command.user.resource; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/securitygroup/command/AuthorizeSecurityGroupEgressCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/user/securitygroup/command/AuthorizeSecurityGroupEgressCmd.java rename to api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java index 207eb7d0cd2..ab9631810ab 100644 --- a/api/src/org/apache/cloudstack/api/user/securitygroup/command/AuthorizeSecurityGroupEgressCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.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.securitygroup.command; +package org.apache.cloudstack.api.command.user.securitygroup; import java.util.Collection; import java.util.HashMap; diff --git a/api/src/org/apache/cloudstack/api/user/securitygroup/command/AuthorizeSecurityGroupIngressCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/user/securitygroup/command/AuthorizeSecurityGroupIngressCmd.java rename to api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java index 3ea5216f086..43e419a947a 100644 --- a/api/src/org/apache/cloudstack/api/user/securitygroup/command/AuthorizeSecurityGroupIngressCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.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.securitygroup.command; +package org.apache.cloudstack.api.command.user.securitygroup; import java.util.Collection; import java.util.HashMap; diff --git a/api/src/org/apache/cloudstack/api/user/securitygroup/command/CreateSecurityGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/securitygroup/command/CreateSecurityGroupCmd.java rename to api/src/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java index a66ee5a8e1b..965df1972a0 100644 --- a/api/src/org/apache/cloudstack/api/user/securitygroup/command/CreateSecurityGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.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.securitygroup.command; +package org.apache.cloudstack.api.command.user.securitygroup; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/securitygroup/command/DeleteSecurityGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/securitygroup/command/DeleteSecurityGroupCmd.java rename to api/src/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java index c48644f82ed..1300464b7e3 100644 --- a/api/src/org/apache/cloudstack/api/user/securitygroup/command/DeleteSecurityGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.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.securitygroup.command; +package org.apache.cloudstack.api.command.user.securitygroup; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/securitygroup/command/ListSecurityGroupsCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java similarity index 94% rename from api/src/org/apache/cloudstack/api/user/securitygroup/command/ListSecurityGroupsCmd.java rename to api/src/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java index 3859a1da3f7..c375c7a1970 100644 --- a/api/src/org/apache/cloudstack/api/user/securitygroup/command/ListSecurityGroupsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.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.securitygroup.command; +package org.apache.cloudstack.api.command.user.securitygroup; import java.util.List; @@ -25,13 +25,10 @@ import org.apache.cloudstack.api.BaseListTaggedResourcesCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.DomainRouterResponse; import com.cloud.api.response.ListResponse; import com.cloud.api.response.SecurityGroupResponse; -import com.cloud.api.view.vo.DomainRouterJoinVO; import com.cloud.api.view.vo.SecurityGroupJoinVO; import com.cloud.async.AsyncJob; -import com.cloud.network.security.SecurityGroupRules; import com.cloud.utils.Pair; @Implementation(description="Lists security groups", responseObject=SecurityGroupResponse.class) diff --git a/api/src/org/apache/cloudstack/api/user/securitygroup/command/RevokeSecurityGroupEgressCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/securitygroup/command/RevokeSecurityGroupEgressCmd.java rename to api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java index 8da03170aaa..809e089aa27 100644 --- a/api/src/org/apache/cloudstack/api/user/securitygroup/command/RevokeSecurityGroupEgressCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.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.securitygroup.command; +package org.apache.cloudstack.api.command.user.securitygroup; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/securitygroup/command/RevokeSecurityGroupIngressCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/securitygroup/command/RevokeSecurityGroupIngressCmd.java rename to api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java index b9ddc8632c5..b319d842697 100644 --- a/api/src/org/apache/cloudstack/api/user/securitygroup/command/RevokeSecurityGroupIngressCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.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.securitygroup.command; +package org.apache.cloudstack.api.command.user.securitygroup; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/snapshot/command/CreateSnapshotCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/user/snapshot/command/CreateSnapshotCmd.java rename to api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java index 443b53bb607..a685bd0abc7 100755 --- a/api/src/org/apache/cloudstack/api/user/snapshot/command/CreateSnapshotCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.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.snapshot.command; +package org.apache.cloudstack.api.command.user.snapshot; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/snapshot/command/CreateSnapshotPolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/user/snapshot/command/CreateSnapshotPolicyCmd.java rename to api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java index b025abe37f9..14cf553e1f2 100644 --- a/api/src/org/apache/cloudstack/api/user/snapshot/command/CreateSnapshotPolicyCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.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.snapshot.command; +package org.apache.cloudstack.api.command.user.snapshot; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/snapshot/command/DeleteSnapshotCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/snapshot/command/DeleteSnapshotCmd.java rename to api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java index a9e172911b4..3e380a00464 100644 --- a/api/src/org/apache/cloudstack/api/user/snapshot/command/DeleteSnapshotCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.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.snapshot.command; +package org.apache.cloudstack.api.command.user.snapshot; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/snapshot/command/DeleteSnapshotPoliciesCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/snapshot/command/DeleteSnapshotPoliciesCmd.java rename to api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java index 6e3207603f9..053de7f2496 100755 --- a/api/src/org/apache/cloudstack/api/user/snapshot/command/DeleteSnapshotPoliciesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.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.snapshot.command; +package org.apache.cloudstack.api.command.user.snapshot; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/snapshot/command/ListSnapshotPoliciesCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/snapshot/command/ListSnapshotPoliciesCmd.java rename to api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.java index aea7eda5744..0b01e5ed41b 100644 --- a/api/src/org/apache/cloudstack/api/user/snapshot/command/ListSnapshotPoliciesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.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.snapshot.command; +package org.apache.cloudstack.api.command.user.snapshot; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/snapshot/command/ListSnapshotsCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/snapshot/command/ListSnapshotsCmd.java rename to api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java index 22890018808..bfda3ade4fa 100644 --- a/api/src/org/apache/cloudstack/api/user/snapshot/command/ListSnapshotsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.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.snapshot.command; +package org.apache.cloudstack.api.command.user.snapshot; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/ssh/command/CreateSSHKeyPairCmd.java b/api/src/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/ssh/command/CreateSSHKeyPairCmd.java rename to api/src/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java index 10c57260e83..9be649d5ded 100644 --- a/api/src/org/apache/cloudstack/api/user/ssh/command/CreateSSHKeyPairCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.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.ssh.command; +package org.apache.cloudstack.api.command.user.ssh; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/ssh/command/DeleteSSHKeyPairCmd.java b/api/src/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/ssh/command/DeleteSSHKeyPairCmd.java rename to api/src/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java index d074afa7c9a..768a4dd082c 100644 --- a/api/src/org/apache/cloudstack/api/user/ssh/command/DeleteSSHKeyPairCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.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.ssh.command; +package org.apache.cloudstack.api.command.user.ssh; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/ssh/command/ListSSHKeyPairsCmd.java b/api/src/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/ssh/command/ListSSHKeyPairsCmd.java rename to api/src/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java index 109c66d0094..ee2aa1894fc 100644 --- a/api/src/org/apache/cloudstack/api/user/ssh/command/ListSSHKeyPairsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.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.ssh.command; +package org.apache.cloudstack.api.command.user.ssh; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/ssh/command/RegisterSSHKeyPairCmd.java b/api/src/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/ssh/command/RegisterSSHKeyPairCmd.java rename to api/src/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java index 9c4eb8cdeb9..6603578b721 100644 --- a/api/src/org/apache/cloudstack/api/user/ssh/command/RegisterSSHKeyPairCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.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.ssh.command; +package org.apache.cloudstack.api.command.user.ssh; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/tag/command/CreateTagsCmd.java b/api/src/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/tag/command/CreateTagsCmd.java rename to api/src/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java index 99b51e9d205..0a2d3b3d3df 100644 --- a/api/src/org/apache/cloudstack/api/user/tag/command/CreateTagsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.user.tag.command; +package org.apache.cloudstack.api.command.user.tag; import java.util.Collection; import java.util.HashMap; diff --git a/api/src/org/apache/cloudstack/api/user/tag/command/DeleteTagsCmd.java b/api/src/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/tag/command/DeleteTagsCmd.java rename to api/src/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java index 09d9a6900d3..2278384fc82 100644 --- a/api/src/org/apache/cloudstack/api/user/tag/command/DeleteTagsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.user.tag.command; +package org.apache.cloudstack.api.command.user.tag; import java.util.Collection; import java.util.HashMap; diff --git a/api/src/org/apache/cloudstack/api/user/tag/command/ListTagsCmd.java b/api/src/org/apache/cloudstack/api/command/user/tag/ListTagsCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/tag/command/ListTagsCmd.java rename to api/src/org/apache/cloudstack/api/command/user/tag/ListTagsCmd.java index 28f895b63ce..e0abc17460a 100644 --- a/api/src/org/apache/cloudstack/api/user/tag/command/ListTagsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/tag/ListTagsCmd.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.api.user.tag.command; +package org.apache.cloudstack.api.command.user.tag; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/template/command/CopyTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/template/command/CopyTemplateCmd.java rename to api/src/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java index 6b00aee2704..0b8f7e43b84 100755 --- a/api/src/org/apache/cloudstack/api/user/template/command/CopyTemplateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.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.template.command; +package org.apache.cloudstack.api.command.user.template; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/template/command/CreateTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/user/template/command/CreateTemplateCmd.java rename to api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java index 0a2b970680c..0a52e3058fc 100755 --- a/api/src/org/apache/cloudstack/api/user/template/command/CreateTemplateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.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.template.command; +package org.apache.cloudstack.api.command.user.template; import java.util.Collection; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/template/command/DeleteTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/template/command/DeleteTemplateCmd.java rename to api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java index c0e58122728..56d6f846c7d 100755 --- a/api/src/org/apache/cloudstack/api/user/template/command/DeleteTemplateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.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.template.command; +package org.apache.cloudstack.api.command.user.template; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/template/command/ExtractTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/template/command/ExtractTemplateCmd.java rename to api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java index 6de5118e9d4..0adfdd82c42 100755 --- a/api/src/org/apache/cloudstack/api/user/template/command/ExtractTemplateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.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.template.command; +package org.apache.cloudstack.api.command.user.template; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/template/command/ListTemplatePermissionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java similarity index 96% rename from api/src/org/apache/cloudstack/api/user/template/command/ListTemplatePermissionsCmd.java rename to api/src/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java index 8188032639c..934e2e8a1a0 100644 --- a/api/src/org/apache/cloudstack/api/user/template/command/ListTemplatePermissionsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.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.template.command; +package org.apache.cloudstack.api.command.user.template; import com.cloud.api.commands.ListTemplateOrIsoPermissionsCmd; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/template/command/ListTemplatesCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/user/template/command/ListTemplatesCmd.java rename to api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java index 7d2cc01da78..f16b7e27c4d 100755 --- a/api/src/org/apache/cloudstack/api/user/template/command/ListTemplatesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.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.template.command; +package org.apache.cloudstack.api.command.user.template; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/template/command/RegisterTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/user/template/command/RegisterTemplateCmd.java rename to api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java index 5ad284c0529..54269ac975e 100755 --- a/api/src/org/apache/cloudstack/api/user/template/command/RegisterTemplateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.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.template.command; +package org.apache.cloudstack.api.command.user.template; import java.net.URISyntaxException; import java.util.Collection; diff --git a/api/src/org/apache/cloudstack/api/user/template/command/UpdateTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/template/command/UpdateTemplateCmd.java rename to api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java index bfde98eb11a..5d2af34b9d3 100755 --- a/api/src/org/apache/cloudstack/api/user/template/command/UpdateTemplateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.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.template.command; +package org.apache.cloudstack.api.command.user.template; import com.cloud.api.commands.UpdateTemplateOrIsoCmd; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/template/command/UpdateTemplatePermissionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplatePermissionsCmd.java similarity index 97% rename from api/src/org/apache/cloudstack/api/user/template/command/UpdateTemplatePermissionsCmd.java rename to api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplatePermissionsCmd.java index 3fd09da28b5..bdd4a0c4997 100644 --- a/api/src/org/apache/cloudstack/api/user/template/command/UpdateTemplatePermissionsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplatePermissionsCmd.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.template.command; +package org.apache.cloudstack.api.command.user.template; import com.cloud.api.commands.UpdateTemplateOrIsoPermissionsCmd; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/user/command/AddVpnUserCmd.java b/api/src/org/apache/cloudstack/api/command/user/user/AddVpnUserCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/user/user/command/AddVpnUserCmd.java rename to api/src/org/apache/cloudstack/api/command/user/user/AddVpnUserCmd.java index 520db9d4126..a7ec871c254 100644 --- a/api/src/org/apache/cloudstack/api/user/user/command/AddVpnUserCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/user/AddVpnUserCmd.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.user.command; +package org.apache.cloudstack.api.command.user.user; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/user/command/ListVpnUsersCmd.java b/api/src/org/apache/cloudstack/api/command/user/user/ListVpnUsersCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/user/command/ListVpnUsersCmd.java rename to api/src/org/apache/cloudstack/api/command/user/user/ListVpnUsersCmd.java index 1b1bcbbc392..6149b408348 100644 --- a/api/src/org/apache/cloudstack/api/user/user/command/ListVpnUsersCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/user/ListVpnUsersCmd.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.user.command; +package org.apache.cloudstack.api.command.user.user; import java.util.ArrayList; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/user/command/RemoveVpnUserCmd.java b/api/src/org/apache/cloudstack/api/command/user/user/RemoveVpnUserCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/user/command/RemoveVpnUserCmd.java rename to api/src/org/apache/cloudstack/api/command/user/user/RemoveVpnUserCmd.java index 51d44fe8ebc..f03c1a84848 100644 --- a/api/src/org/apache/cloudstack/api/user/user/command/RemoveVpnUserCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/user/RemoveVpnUserCmd.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.user.command; +package org.apache.cloudstack.api.command.user.user; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/admin/network/response/NetworkDeviceResponse.java b/api/src/org/apache/cloudstack/api/response/NetworkDeviceResponse.java similarity index 95% rename from api/src/org/apache/cloudstack/api/admin/network/response/NetworkDeviceResponse.java rename to api/src/org/apache/cloudstack/api/response/NetworkDeviceResponse.java index f4435bedeb4..c7fb7e842b6 100644 --- a/api/src/org/apache/cloudstack/api/admin/network/response/NetworkDeviceResponse.java +++ b/api/src/org/apache/cloudstack/api/response/NetworkDeviceResponse.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.admin.network.response; +package org.apache.cloudstack.api.response; import org.apache.cloudstack.api.ApiConstants; import com.cloud.utils.IdentityProxy; diff --git a/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java b/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java index 35cab8e26b0..418cd653a9d 100644 --- a/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java +++ b/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java @@ -20,11 +20,11 @@ import java.util.ArrayList; import java.util.List; import com.cloud.network.Network; -import org.apache.cloudstack.api.admin.network.command.AddNetworkDeviceCmd; -import org.apache.cloudstack.api.admin.network.command.DeleteNetworkDeviceCmd; -import org.apache.cloudstack.api.admin.network.command.ListNetworkDeviceCmd; +import org.apache.cloudstack.api.command.admin.network.AddNetworkDeviceCmd; +import org.apache.cloudstack.api.command.admin.network.DeleteNetworkDeviceCmd; +import org.apache.cloudstack.api.command.admin.network.ListNetworkDeviceCmd; import com.cloud.host.Host; -import org.apache.cloudstack.api.admin.network.response.NetworkDeviceResponse; +import org.apache.cloudstack.api.response.NetworkDeviceResponse; import com.cloud.utils.component.Manager; public interface ExternalNetworkDeviceManager extends Manager { diff --git a/api/test/src/com/cloud/api/commands/test/ActivateProjectCmdTest.java b/api/test/src/com/cloud/api/commands/test/ActivateProjectCmdTest.java index facbdcff24e..073c1aaba57 100644 --- a/api/test/src/com/cloud/api/commands/test/ActivateProjectCmdTest.java +++ b/api/test/src/com/cloud/api/commands/test/ActivateProjectCmdTest.java @@ -19,13 +19,13 @@ package src.com.cloud.api.commands.test; import junit.framework.Assert; import junit.framework.TestCase; +import org.apache.cloudstack.api.command.user.project.ActivateProjectCmd; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Mockito; -import org.apache.cloudstack.api.user.project.command.ActivateProjectCmd; import com.cloud.exception.InvalidParameterValueException; import com.cloud.projects.Project; import com.cloud.projects.ProjectService; diff --git a/api/test/src/com/cloud/api/commands/test/AddAccountToProjectCmdTest.java b/api/test/src/com/cloud/api/commands/test/AddAccountToProjectCmdTest.java index d7191967e09..736656f4102 100644 --- a/api/test/src/com/cloud/api/commands/test/AddAccountToProjectCmdTest.java +++ b/api/test/src/com/cloud/api/commands/test/AddAccountToProjectCmdTest.java @@ -19,7 +19,7 @@ package src.com.cloud.api.commands.test; import junit.framework.Assert; import junit.framework.TestCase; -import org.apache.cloudstack.api.user.account.command.AddAccountToProjectCmd; +import org.apache.cloudstack.api.command.user.account.AddAccountToProjectCmd; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/api/test/src/com/cloud/api/commands/test/AddClusterCmdTest.java b/api/test/src/com/cloud/api/commands/test/AddClusterCmdTest.java index bfbd811fe11..3b546e3cd29 100644 --- a/api/test/src/com/cloud/api/commands/test/AddClusterCmdTest.java +++ b/api/test/src/com/cloud/api/commands/test/AddClusterCmdTest.java @@ -19,7 +19,7 @@ package src.com.cloud.api.commands.test; import junit.framework.Assert; import junit.framework.TestCase; -import org.apache.cloudstack.api.admin.cluster.command.AddClusterCmd; +import org.apache.cloudstack.api.command.admin.cluster.AddClusterCmd; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/api/test/src/com/cloud/api/commands/test/AddHostCmdTest.java b/api/test/src/com/cloud/api/commands/test/AddHostCmdTest.java index 75c40d2fb50..c0cf2297e2b 100644 --- a/api/test/src/com/cloud/api/commands/test/AddHostCmdTest.java +++ b/api/test/src/com/cloud/api/commands/test/AddHostCmdTest.java @@ -19,7 +19,7 @@ package src.com.cloud.api.commands.test; import junit.framework.Assert; import junit.framework.TestCase; -import org.apache.cloudstack.api.admin.host.command.AddHostCmd; +import org.apache.cloudstack.api.command.admin.host.AddHostCmd; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/api/test/src/com/cloud/api/commands/test/AddNetworkServiceProviderCmdTest.java b/api/test/src/com/cloud/api/commands/test/AddNetworkServiceProviderCmdTest.java index b484916dcc1..1a5ee4346d5 100644 --- a/api/test/src/com/cloud/api/commands/test/AddNetworkServiceProviderCmdTest.java +++ b/api/test/src/com/cloud/api/commands/test/AddNetworkServiceProviderCmdTest.java @@ -22,7 +22,7 @@ import java.util.List; import junit.framework.Assert; import junit.framework.TestCase; -import org.apache.cloudstack.api.admin.network.command.AddNetworkServiceProviderCmd; +import org.apache.cloudstack.api.command.admin.network.AddNetworkServiceProviderCmd; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/api/test/src/com/cloud/api/commands/test/AddSecondaryStorageCmdTest.java b/api/test/src/com/cloud/api/commands/test/AddSecondaryStorageCmdTest.java index 9b73b0c1081..5065e9d5180 100644 --- a/api/test/src/com/cloud/api/commands/test/AddSecondaryStorageCmdTest.java +++ b/api/test/src/com/cloud/api/commands/test/AddSecondaryStorageCmdTest.java @@ -19,7 +19,7 @@ package src.com.cloud.api.commands.test; import junit.framework.Assert; import junit.framework.TestCase; -import org.apache.cloudstack.api.admin.host.command.AddSecondaryStorageCmd; +import org.apache.cloudstack.api.command.admin.host.AddSecondaryStorageCmd; import org.junit.Before; import org.junit.Rule; import org.junit.Test; 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 59ffc39678e..92048570842 100644 --- a/api/test/src/com/cloud/api/commands/test/AddSwiftCmdTest.java +++ b/api/test/src/com/cloud/api/commands/test/AddSwiftCmdTest.java @@ -19,7 +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.apache.cloudstack.api.command.admin.swift.AddSwiftCmd; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/api/test/src/com/cloud/api/commands/test/AddVpnUserCmdTest.java b/api/test/src/com/cloud/api/commands/test/AddVpnUserCmdTest.java index ce5d4f20286..f5dd1cec684 100644 --- a/api/test/src/com/cloud/api/commands/test/AddVpnUserCmdTest.java +++ b/api/test/src/com/cloud/api/commands/test/AddVpnUserCmdTest.java @@ -19,7 +19,7 @@ package src.com.cloud.api.commands.test; import junit.framework.Assert; import junit.framework.TestCase; -import org.apache.cloudstack.api.user.user.command.AddVpnUserCmd; +import org.apache.cloudstack.api.command.user.user.AddVpnUserCmd; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/api/test/src/com/cloud/api/commands/test/ListRoutersCmdTest.java b/api/test/src/com/cloud/api/commands/test/ListRoutersCmdTest.java index 64039f1c7c4..68083984683 100644 --- a/api/test/src/com/cloud/api/commands/test/ListRoutersCmdTest.java +++ b/api/test/src/com/cloud/api/commands/test/ListRoutersCmdTest.java @@ -20,9 +20,9 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; -import junit.framework.Assert; import junit.framework.TestCase; +import org.apache.cloudstack.api.command.admin.router.ListRoutersCmd; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -31,7 +31,6 @@ import org.mockito.Mockito; import org.apache.cloudstack.api.ResponseGenerator; import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.admin.router.command.ListRoutersCmd; import com.cloud.api.response.DomainRouterResponse; import com.cloud.api.response.ListResponse; import com.cloud.api.view.vo.DomainRouterJoinVO; diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index d03937fa979..33daafd0d7d 100755 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -19,39 +19,39 @@ ### Please standardize naming conventions to camel-case (even for acronyms). ### Account commands -createAccount=org.apache.cloudstack.api.admin.account.command.CreateAccountCmd;3 -deleteAccount=org.apache.cloudstack.api.admin.account.command.DeleteAccountCmd;3 -updateAccount=org.apache.cloudstack.api.admin.account.command.UpdateAccountCmd;3 -disableAccount=org.apache.cloudstack.api.admin.account.command.DisableAccountCmd;7 -enableAccount=org.apache.cloudstack.api.admin.account.command.EnableAccountCmd;7 -lockAccount=org.apache.cloudstack.api.admin.account.command.LockAccountCmd;7 -listAccounts=org.apache.cloudstack.api.user.account.command.ListAccountsCmd;15 -markDefaultZoneForAccount=org.apache.cloudstack.api.admin.zone.command.MarkDefaultZoneForAccountCmd;1 +createAccount=org.apache.cloudstack.api.command.admin.account.CreateAccountCmd;3 +deleteAccount=org.apache.cloudstack.api.command.admin.account.DeleteAccountCmd;3 +updateAccount=org.apache.cloudstack.api.command.admin.account.UpdateAccountCmd;3 +disableAccount=org.apache.cloudstack.api.command.admin.account.DisableAccountCmd;7 +enableAccount=org.apache.cloudstack.api.command.admin.account.EnableAccountCmd;7 +lockAccount=org.apache.cloudstack.api.command.admin.account.LockAccountCmd;7 +listAccounts=org.apache.cloudstack.api.command.user.account.ListAccountsCmd;15 +markDefaultZoneForAccount=org.apache.cloudstack.api.command.admin.zone.MarkDefaultZoneForAccountCmd;1 #### User commands -createUser=org.apache.cloudstack.api.admin.user.command.CreateUserCmd;3 -deleteUser=org.apache.cloudstack.api.admin.user.command.DeleteUserCmd;3 -updateUser=org.apache.cloudstack.api.admin.user.command.UpdateUserCmd;3 -listUsers=org.apache.cloudstack.api.admin.user.command.ListUsersCmd;7 -lockUser=org.apache.cloudstack.api.admin.user.command.LockUserCmd;7 -disableUser=org.apache.cloudstack.api.admin.user.command.DisableUserCmd;7 -enableUser=org.apache.cloudstack.api.admin.user.command.EnableUserCmd;7 -getUser=org.apache.cloudstack.api.admin.user.command.GetUserCmd;1 +createUser=org.apache.cloudstack.api.command.admin.user.CreateUserCmd;3 +deleteUser=org.apache.cloudstack.api.command.admin.user.DeleteUserCmd;3 +updateUser=org.apache.cloudstack.api.command.admin.user.UpdateUserCmd;3 +listUsers=org.apache.cloudstack.api.command.admin.user.ListUsersCmd;7 +lockUser=org.apache.cloudstack.api.command.admin.user.LockUserCmd;7 +disableUser=org.apache.cloudstack.api.command.admin.user.DisableUserCmd;7 +enableUser=org.apache.cloudstack.api.command.admin.user.EnableUserCmd;7 +getUser=org.apache.cloudstack.api.command.admin.user.GetUserCmd;1 #### Domain commands -createDomain=org.apache.cloudstack.api.admin.domain.command.CreateDomainCmd;1 -updateDomain=org.apache.cloudstack.api.admin.domain.command.UpdateDomainCmd;1 -deleteDomain=org.apache.cloudstack.api.admin.domain.command.DeleteDomainCmd;1 -listDomains=org.apache.cloudstack.api.admin.domain.command.ListDomainsCmd;7 -listDomainChildren=org.apache.cloudstack.api.admin.domain.command.ListDomainChildrenCmd;7 +createDomain=org.apache.cloudstack.api.command.admin.domain.CreateDomainCmd;1 +updateDomain=org.apache.cloudstack.api.command.admin.domain.UpdateDomainCmd;1 +deleteDomain=org.apache.cloudstack.api.command.admin.domain.DeleteDomainCmd;1 +listDomains=org.apache.cloudstack.api.command.admin.domain.ListDomainsCmd;7 +listDomainChildren=org.apache.cloudstack.api.command.admin.domain.ListDomainChildrenCmd;7 ####Cloud Identifier commands -getCloudIdentifier=org.apache.cloudstack.api.user.resource.command.GetCloudIdentifierCmd;15 +getCloudIdentifier=org.apache.cloudstack.api.command.user.resource.GetCloudIdentifierCmd;15 #### Limit commands -updateResourceLimit=org.apache.cloudstack.api.user.resource.command.UpdateResourceLimitCmd;7 -updateResourceCount=org.apache.cloudstack.api.user.resource.command.UpdateResourceCountCmd;7 -listResourceLimits=org.apache.cloudstack.api.user.resource.command.ListResourceLimitsCmd;15 +updateResourceLimit=org.apache.cloudstack.api.command.user.resource.UpdateResourceLimitCmd;7 +updateResourceCount=org.apache.cloudstack.api.command.user.resource.UpdateResourceCountCmd;7 +listResourceLimits=org.apache.cloudstack.api.command.user.resource.ListResourceLimitsCmd;15 #### VM commands deployVirtualMachine=org.apache.cloudstack.api.user.vm.command.DeployVMCmd;15 @@ -65,182 +65,182 @@ listVirtualMachines=org.apache.cloudstack.api.user.vm.command.ListVMsCmd;15 getVMPassword=org.apache.cloudstack.api.user.vm.command.GetVMPasswordCmd;15 restoreVirtualMachine=org.apache.cloudstack.api.user.vm.command.RestoreVMCmd;15 changeServiceForVirtualMachine=org.apache.cloudstack.api.user.vm.command.UpgradeVMCmd;15 -assignVirtualMachine=org.apache.cloudstack.api.admin.vm.command.AssignVMCmd;1 -migrateVirtualMachine=org.apache.cloudstack.api.admin.vm.command.MigrateVMCmd;1 -recoverVirtualMachine=org.apache.cloudstack.api.admin.vm.command.RecoverVMCmd;7 +assignVirtualMachine=org.apache.cloudstack.api.command.admin.vm.AssignVMCmd;1 +migrateVirtualMachine=org.apache.cloudstack.api.command.admin.vm.MigrateVMCmd;1 +recoverVirtualMachine=org.apache.cloudstack.api.command.admin.vm.RecoverVMCmd;7 #### snapshot commands -createSnapshot=org.apache.cloudstack.api.user.snapshot.command.CreateSnapshotCmd;15 -listSnapshots=org.apache.cloudstack.api.user.snapshot.command.ListSnapshotsCmd;15 -deleteSnapshot=org.apache.cloudstack.api.user.snapshot.command.DeleteSnapshotCmd;15 -createSnapshotPolicy=org.apache.cloudstack.api.user.snapshot.command.CreateSnapshotPolicyCmd;15 -deleteSnapshotPolicies=org.apache.cloudstack.api.user.snapshot.command.DeleteSnapshotPoliciesCmd;15 -listSnapshotPolicies=org.apache.cloudstack.api.user.snapshot.command.ListSnapshotPoliciesCmd;15 +createSnapshot=org.apache.cloudstack.api.command.user.snapshot.CreateSnapshotCmd;15 +listSnapshots=org.apache.cloudstack.api.command.user.snapshot.ListSnapshotsCmd;15 +deleteSnapshot=org.apache.cloudstack.api.command.user.snapshot.DeleteSnapshotCmd;15 +createSnapshotPolicy=org.apache.cloudstack.api.command.user.snapshot.CreateSnapshotPolicyCmd;15 +deleteSnapshotPolicies=org.apache.cloudstack.api.command.user.snapshot.DeleteSnapshotPoliciesCmd;15 +listSnapshotPolicies=org.apache.cloudstack.api.command.user.snapshot.ListSnapshotPoliciesCmd;15 #### template commands -createTemplate=org.apache.cloudstack.api.user.template.command.CreateTemplateCmd;15 -registerTemplate=org.apache.cloudstack.api.user.template.command.RegisterTemplateCmd;15 -updateTemplate=org.apache.cloudstack.api.user.template.command.UpdateTemplateCmd;15 -copyTemplate=org.apache.cloudstack.api.user.template.command.CopyTemplateCmd;15 -deleteTemplate=org.apache.cloudstack.api.user.template.command.DeleteTemplateCmd;15 -listTemplates=org.apache.cloudstack.api.user.template.command.ListTemplatesCmd;15 -updateTemplatePermissions=org.apache.cloudstack.api.user.template.command.UpdateTemplatePermissionsCmd;15 -listTemplatePermissions=org.apache.cloudstack.api.user.template.command.ListTemplatePermissionsCmd;15 -extractTemplate=org.apache.cloudstack.api.user.template.command.ExtractTemplateCmd;15 -prepareTemplate=org.apache.cloudstack.api.admin.template.command.PrepareTemplateCmd;1 +createTemplate=org.apache.cloudstack.api.command.user.template.CreateTemplateCmd;15 +registerTemplate=org.apache.cloudstack.api.command.user.template.RegisterTemplateCmd;15 +updateTemplate=org.apache.cloudstack.api.command.user.template.UpdateTemplateCmd;15 +copyTemplate=org.apache.cloudstack.api.command.user.template.CopyTemplateCmd;15 +deleteTemplate=org.apache.cloudstack.api.command.user.template.DeleteTemplateCmd;15 +listTemplates=org.apache.cloudstack.api.command.user.template.ListTemplatesCmd;15 +updateTemplatePermissions=org.apache.cloudstack.api.command.user.template.UpdateTemplatePermissionsCmd;15 +listTemplatePermissions=org.apache.cloudstack.api.command.user.template.ListTemplatePermissionsCmd;15 +extractTemplate=org.apache.cloudstack.api.command.user.template.ExtractTemplateCmd;15 +prepareTemplate=org.apache.cloudstack.api.command.admin.template.PrepareTemplateCmd;1 #### iso commands -attachIso=org.apache.cloudstack.api.user.iso.command.AttachIsoCmd;15 -detachIso=org.apache.cloudstack.api.user.iso.command.DetachIsoCmd;15 -listIsos=org.apache.cloudstack.api.user.iso.command.ListIsosCmd;15 -registerIso=org.apache.cloudstack.api.user.iso.command.RegisterIsoCmd;15 -updateIso=org.apache.cloudstack.api.user.iso.command.UpdateIsoCmd;15 -deleteIso=org.apache.cloudstack.api.user.iso.command.DeleteIsoCmd;15 -copyIso=org.apache.cloudstack.api.user.template.command.CopyTemplateCmd;15 -updateIsoPermissions=org.apache.cloudstack.api.user.iso.command.UpdateIsoPermissionsCmd;15 -listIsoPermissions=org.apache.cloudstack.api.user.iso.command.ListIsoPermissionsCmd;15 -extractIso=org.apache.cloudstack.api.user.iso.command.ExtractIsoCmd;15 +attachIso=org.apache.cloudstack.api.command.user.iso.AttachIsoCmd;15 +detachIso=org.apache.cloudstack.api.command.user.iso.DetachIsoCmd;15 +listIsos=org.apache.cloudstack.api.command.user.iso.ListIsosCmd;15 +registerIso=org.apache.cloudstack.api.command.user.iso.RegisterIsoCmd;15 +updateIso=org.apache.cloudstack.api.command.user.iso.UpdateIsoCmd;15 +deleteIso=org.apache.cloudstack.api.command.user.iso.DeleteIsoCmd;15 +copyIso=org.apache.cloudstack.api.command.user.template.CopyTemplateCmd;15 +updateIsoPermissions=org.apache.cloudstack.api.command.user.iso.UpdateIsoPermissionsCmd;15 +listIsoPermissions=org.apache.cloudstack.api.command.user.iso.ListIsoPermissionsCmd;15 +extractIso=org.apache.cloudstack.api.command.user.iso.ExtractIsoCmd;15 #### guest OS commands -listOsTypes=org.apache.cloudstack.api.user.guest.command.ListGuestOsCmd;15 -listOsCategories=org.apache.cloudstack.api.user.guest.command.ListGuestOsCategoriesCmd;15 +listOsTypes=org.apache.cloudstack.api.command.user.guest.ListGuestOsCmd;15 +listOsCategories=org.apache.cloudstack.api.command.user.guest.ListGuestOsCategoriesCmd;15 #### service offering commands -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 +createServiceOffering=org.apache.cloudstack.api.command.admin.offering.CreateServiceOfferingCmd;1 +deleteServiceOffering=org.apache.cloudstack.api.command.admin.offering.DeleteServiceOfferingCmd;1 +updateServiceOffering=org.apache.cloudstack.api.command.admin.offering.UpdateServiceOfferingCmd;1 +listServiceOfferings=org.apache.cloudstack.api.command.user.offering.ListServiceOfferingsCmd;15 #### disk offering commands -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 +createDiskOffering=org.apache.cloudstack.api.command.admin.offering.CreateDiskOfferingCmd;1 +updateDiskOffering=org.apache.cloudstack.api.command.admin.offering.UpdateDiskOfferingCmd;1 +deleteDiskOffering=org.apache.cloudstack.api.command.admin.offering.DeleteDiskOfferingCmd;1 +listDiskOfferings=org.apache.cloudstack.api.command.user.offering.ListDiskOfferingsCmd;15 #### vlan commands -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 +createVlanIpRange=org.apache.cloudstack.api.command.admin.vlan.CreateVlanIpRangeCmd;1 +deleteVlanIpRange=org.apache.cloudstack.api.command.admin.vlan.DeleteVlanIpRangeCmd;1 +listVlanIpRanges=org.apache.cloudstack.api.command.admin.vlan.ListVlanIpRangesCmd;1 #### address commands -associateIpAddress=org.apache.cloudstack.api.user.address.command.AssociateIPAddrCmd;15 -disassociateIpAddress=org.apache.cloudstack.api.user.address.command.DisassociateIPAddrCmd;15 -listPublicIpAddresses=org.apache.cloudstack.api.user.address.command.ListPublicIpAddressesCmd;15 +associateIpAddress=org.apache.cloudstack.api.command.user.address.AssociateIPAddrCmd;15 +disassociateIpAddress=org.apache.cloudstack.api.command.user.address.DisassociateIPAddrCmd;15 +listPublicIpAddresses=org.apache.cloudstack.api.command.user.address.ListPublicIpAddressesCmd;15 #### firewall commands -listPortForwardingRules=org.apache.cloudstack.api.user.firewall.command.ListPortForwardingRulesCmd;15 -createPortForwardingRule=org.apache.cloudstack.api.user.firewall.command.CreatePortForwardingRuleCmd;15 -deletePortForwardingRule=org.apache.cloudstack.api.user.firewall.command.DeletePortForwardingRuleCmd;15 -updatePortForwardingRule=org.apache.cloudstack.api.user.firewall.command.UpdatePortForwardingRuleCmd;15 +listPortForwardingRules=org.apache.cloudstack.api.command.user.firewall.ListPortForwardingRulesCmd;15 +createPortForwardingRule=org.apache.cloudstack.api.command.user.firewall.CreatePortForwardingRuleCmd;15 +deletePortForwardingRule=org.apache.cloudstack.api.command.user.firewall.DeletePortForwardingRuleCmd;15 +updatePortForwardingRule=org.apache.cloudstack.api.command.user.firewall.UpdatePortForwardingRuleCmd;15 #### NAT commands -enableStaticNat=org.apache.cloudstack.api.user.nat.command.EnableStaticNatCmd;15 -createIpForwardingRule=org.apache.cloudstack.api.user.nat.command.CreateIpForwardingRuleCmd;15 -deleteIpForwardingRule=org.apache.cloudstack.api.user.nat.command.DeleteIpForwardingRuleCmd;15 -listIpForwardingRules=org.apache.cloudstack.api.user.nat.command.ListIpForwardingRulesCmd;15 -disableStaticNat=org.apache.cloudstack.api.user.nat.command.DisableStaticNatCmd;15 +enableStaticNat=org.apache.cloudstack.api.command.user.nat.EnableStaticNatCmd;15 +createIpForwardingRule=org.apache.cloudstack.api.command.user.nat.CreateIpForwardingRuleCmd;15 +deleteIpForwardingRule=org.apache.cloudstack.api.command.user.nat.DeleteIpForwardingRuleCmd;15 +listIpForwardingRules=org.apache.cloudstack.api.command.user.nat.ListIpForwardingRulesCmd;15 +disableStaticNat=org.apache.cloudstack.api.command.user.nat.DisableStaticNatCmd;15 #### load balancer commands -createLoadBalancerRule=org.apache.cloudstack.api.user.lb.command.CreateLoadBalancerRuleCmd;15 -deleteLoadBalancerRule=org.apache.cloudstack.api.user.lb.command.DeleteLoadBalancerRuleCmd;15 -removeFromLoadBalancerRule=org.apache.cloudstack.api.user.lb.command.RemoveFromLoadBalancerRuleCmd;15 -assignToLoadBalancerRule=org.apache.cloudstack.api.user.lb.command.AssignToLoadBalancerRuleCmd;15 -createLBStickinessPolicy=org.apache.cloudstack.api.user.lb.command.CreateLBStickinessPolicyCmd;15 -deleteLBStickinessPolicy=org.apache.cloudstack.api.user.lb.command.DeleteLBStickinessPolicyCmd;15 -listLoadBalancerRules=org.apache.cloudstack.api.user.lb.command.ListLoadBalancerRulesCmd;15 -listLBStickinessPolicies=org.apache.cloudstack.api.user.lb.command.ListLBStickinessPoliciesCmd;15 -listLoadBalancerRuleInstances=org.apache.cloudstack.api.user.lb.command.ListLoadBalancerRuleInstancesCmd;15 -updateLoadBalancerRule=org.apache.cloudstack.api.user.lb.command.UpdateLoadBalancerRuleCmd;15 +createLoadBalancerRule=org.apache.cloudstack.api.command.user.loadbalancer.CreateLoadBalancerRuleCmd;15 +deleteLoadBalancerRule=org.apache.cloudstack.api.command.user.loadbalancer.DeleteLoadBalancerRuleCmd;15 +removeFromLoadBalancerRule=org.apache.cloudstack.api.command.user.loadbalancer.RemoveFromLoadBalancerRuleCmd;15 +assignToLoadBalancerRule=org.apache.cloudstack.api.command.user.loadbalancer.AssignToLoadBalancerRuleCmd;15 +createLBStickinessPolicy=org.apache.cloudstack.api.command.user.loadbalancer.CreateLBStickinessPolicyCmd;15 +deleteLBStickinessPolicy=org.apache.cloudstack.api.command.user.loadbalancer.DeleteLBStickinessPolicyCmd;15 +listLoadBalancerRules=org.apache.cloudstack.api.command.user.loadbalancer.ListLoadBalancerRulesCmd;15 +listLBStickinessPolicies=org.apache.cloudstack.api.command.user.loadbalancer.ListLBStickinessPoliciesCmd;15 +listLoadBalancerRuleInstances=org.apache.cloudstack.api.command.user.loadbalancer.ListLoadBalancerRuleInstancesCmd;15 +updateLoadBalancerRule=org.apache.cloudstack.api.command.user.loadbalancer.UpdateLoadBalancerRuleCmd;15 #### autoscale commands -createCounter = org.apache.cloudstack.api.admin.autoscale.command.CreateCounterCmd;1 -createCondition = org.apache.cloudstack.api.user.autoscale.command.CreateConditionCmd;15 -createAutoScalePolicy=org.apache.cloudstack.api.user.autoscale.command.CreateAutoScalePolicyCmd;15 -createAutoScaleVmProfile=org.apache.cloudstack.api.user.autoscale.command.CreateAutoScaleVmProfileCmd;15 -createAutoScaleVmGroup=org.apache.cloudstack.api.user.autoscale.command.CreateAutoScaleVmGroupCmd;15 -deleteCounter = org.apache.cloudstack.api.admin.autoscale.command.DeleteCounterCmd;1 -deleteCondition = org.apache.cloudstack.api.user.autoscale.command.DeleteConditionCmd;15 -deleteAutoScalePolicy=org.apache.cloudstack.api.user.autoscale.command.DeleteAutoScalePolicyCmd;15 -deleteAutoScaleVmProfile=org.apache.cloudstack.api.user.autoscale.command.DeleteAutoScaleVmProfileCmd;15 -deleteAutoScaleVmGroup=org.apache.cloudstack.api.user.autoscale.command.DeleteAutoScaleVmGroupCmd;15 -listCounters = org.apache.cloudstack.api.user.autoscale.command.ListCountersCmd;15 -listConditions = org.apache.cloudstack.api.user.autoscale.command.ListConditionsCmd;15 -listAutoScalePolicies=org.apache.cloudstack.api.user.autoscale.command.ListAutoScalePoliciesCmd;15 -listAutoScaleVmProfiles=org.apache.cloudstack.api.user.autoscale.command.ListAutoScaleVmProfilesCmd;15 -listAutoScaleVmGroups=org.apache.cloudstack.api.user.autoscale.command.ListAutoScaleVmGroupsCmd;15 -enableAutoScaleVmGroup=org.apache.cloudstack.api.user.autoscale.command.EnableAutoScaleVmGroupCmd;15 -disableAutoScaleVmGroup=org.apache.cloudstack.api.user.autoscale.command.DisableAutoScaleVmGroupCmd;15 -updateAutoScalePolicy=org.apache.cloudstack.api.user.autoscale.command.UpdateAutoScalePolicyCmd;15 -updateAutoScaleVmProfile=org.apache.cloudstack.api.user.autoscale.command.UpdateAutoScaleVmProfileCmd;15 -updateAutoScaleVmGroup=org.apache.cloudstack.api.user.autoscale.command.UpdateAutoScaleVmGroupCmd;15 +createCounter = org.apache.cloudstack.api.command.admin.autoscale.CreateCounterCmd;1 +createCondition = org.apache.cloudstack.api.command.user.autoscale.CreateConditionCmd;15 +createAutoScalePolicy=org.apache.cloudstack.api.command.user.autoscale.CreateAutoScalePolicyCmd;15 +createAutoScaleVmProfile=org.apache.cloudstack.api.command.user.autoscale.CreateAutoScaleVmProfileCmd;15 +createAutoScaleVmGroup=org.apache.cloudstack.api.command.user.autoscale.CreateAutoScaleVmGroupCmd;15 +deleteCounter = org.apache.cloudstack.api.command.admin.autoscale.DeleteCounterCmd;1 +deleteCondition = org.apache.cloudstack.api.command.user.autoscale.DeleteConditionCmd;15 +deleteAutoScalePolicy=org.apache.cloudstack.api.command.user.autoscale.DeleteAutoScalePolicyCmd;15 +deleteAutoScaleVmProfile=org.apache.cloudstack.api.command.user.autoscale.DeleteAutoScaleVmProfileCmd;15 +deleteAutoScaleVmGroup=org.apache.cloudstack.api.command.user.autoscale.DeleteAutoScaleVmGroupCmd;15 +listCounters = org.apache.cloudstack.api.command.user.autoscale.ListCountersCmd;15 +listConditions = org.apache.cloudstack.api.command.user.autoscale.ListConditionsCmd;15 +listAutoScalePolicies=org.apache.cloudstack.api.command.user.autoscale.ListAutoScalePoliciesCmd;15 +listAutoScaleVmProfiles=org.apache.cloudstack.api.command.user.autoscale.ListAutoScaleVmProfilesCmd;15 +listAutoScaleVmGroups=org.apache.cloudstack.api.command.user.autoscale.ListAutoScaleVmGroupsCmd;15 +enableAutoScaleVmGroup=org.apache.cloudstack.api.command.user.autoscale.EnableAutoScaleVmGroupCmd;15 +disableAutoScaleVmGroup=org.apache.cloudstack.api.command.user.autoscale.DisableAutoScaleVmGroupCmd;15 +updateAutoScalePolicy=org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScalePolicyCmd;15 +updateAutoScaleVmProfile=org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScaleVmProfileCmd;15 +updateAutoScaleVmGroup=org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScaleVmGroupCmd;15 #### router commands -startRouter=org.apache.cloudstack.api.admin.router.command.StartRouterCmd;7 -rebootRouter=org.apache.cloudstack.api.admin.router.command.RebootRouterCmd;7 -stopRouter=org.apache.cloudstack.api.admin.router.command.StopRouterCmd;7 -destroyRouter=org.apache.cloudstack.api.admin.router.command.DestroyRouterCmd;7 -changeServiceForRouter=org.apache.cloudstack.api.admin.router.command.UpgradeRouterCmd;7 -listRouters=org.apache.cloudstack.api.admin.router.command.ListRoutersCmd;7 -listVirtualRouterElements=org.apache.cloudstack.api.admin.router.command.ListVirtualRouterElementsCmd;7 -configureVirtualRouterElement=org.apache.cloudstack.api.admin.router.command.ConfigureVirtualRouterElementCmd;7 -createVirtualRouterElement=org.apache.cloudstack.api.admin.router.command.CreateVirtualRouterElementCmd;7 +startRouter=org.apache.cloudstack.api.command.admin.router.StartRouterCmd;7 +rebootRouter=org.apache.cloudstack.api.command.admin.router.RebootRouterCmd;7 +stopRouter=org.apache.cloudstack.api.command.admin.router.StopRouterCmd;7 +destroyRouter=org.apache.cloudstack.api.command.admin.router.DestroyRouterCmd;7 +changeServiceForRouter=org.apache.cloudstack.api.command.admin.router.UpgradeRouterCmd;7 +listRouters=org.apache.cloudstack.api.command.admin.router.ListRoutersCmd;7 +listVirtualRouterElements=org.apache.cloudstack.api.command.admin.router.ListVirtualRouterElementsCmd;7 +configureVirtualRouterElement=org.apache.cloudstack.api.command.admin.router.ConfigureVirtualRouterElementCmd;7 +createVirtualRouterElement=org.apache.cloudstack.api.command.admin.router.CreateVirtualRouterElementCmd;7 #### system vm commands -startSystemVm=org.apache.cloudstack.api.admin.systemvm.command.StartSystemVMCmd;1 -rebootSystemVm=org.apache.cloudstack.api.admin.systemvm.command.RebootSystemVmCmd;1 -stopSystemVm=org.apache.cloudstack.api.admin.systemvm.command.StopSystemVmCmd;1 -destroySystemVm=org.apache.cloudstack.api.admin.systemvm.command.DestroySystemVmCmd;1 -listSystemVms=org.apache.cloudstack.api.admin.systemvm.command.ListSystemVMsCmd;3 -migrateSystemVm=org.apache.cloudstack.api.admin.systemvm.command.MigrateSystemVMCmd;1 -changeServiceForSystemVm=org.apache.cloudstack.api.admin.systemvm.command.UpgradeSystemVMCmd;1 +startSystemVm=org.apache.cloudstack.api.command.admin.systemvm.StartSystemVMCmd;1 +rebootSystemVm=org.apache.cloudstack.api.command.admin.systemvm.RebootSystemVmCmd;1 +stopSystemVm=org.apache.cloudstack.api.command.admin.systemvm.StopSystemVmCmd;1 +destroySystemVm=org.apache.cloudstack.api.command.admin.systemvm.DestroySystemVmCmd;1 +listSystemVms=org.apache.cloudstack.api.command.admin.systemvm.ListSystemVMsCmd;3 +migrateSystemVm=org.apache.cloudstack.api.command.admin.systemvm.MigrateSystemVMCmd;1 +changeServiceForSystemVm=org.apache.cloudstack.api.command.admin.systemvm.UpgradeSystemVMCmd;1 #### configuration commands -updateConfiguration=org.apache.cloudstack.api.admin.config.command.UpdateCfgCmd;1 -listConfigurations=org.apache.cloudstack.api.admin.config.command.ListCfgsByCmd;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 +updateConfiguration=org.apache.cloudstack.api.command.admin.config.UpdateCfgCmd;1 +listConfigurations=org.apache.cloudstack.api.command.admin.config.ListCfgsByCmd;1 +ldapConfig=org.apache.cloudstack.api.command.admin.ldap.LDAPConfigCmd;1 +ldapRemove=org.apache.cloudstack.api.command.admin.ldap.LDAPRemoveCmd;1 +listCapabilities=org.apache.cloudstack.api.command.user.config.ListCapabilitiesCmd;15 #### pod commands -createPod=org.apache.cloudstack.api.admin.pod.command.CreatePodCmd;1 -updatePod=org.apache.cloudstack.api.admin.pod.command.UpdatePodCmd;1 -deletePod=org.apache.cloudstack.api.admin.pod.command.DeletePodCmd;1 -listPods=org.apache.cloudstack.api.admin.pod.command.ListPodsByCmd;3 +createPod=org.apache.cloudstack.api.command.admin.pod.CreatePodCmd;1 +updatePod=org.apache.cloudstack.api.command.admin.pod.UpdatePodCmd;1 +deletePod=org.apache.cloudstack.api.command.admin.pod.DeletePodCmd;1 +listPods=org.apache.cloudstack.api.command.admin.pod.ListPodsByCmd;3 #### zone commands -createZone=org.apache.cloudstack.api.admin.zone.command.CreateZoneCmd;1 -updateZone=org.apache.cloudstack.api.admin.zone.command.UpdateZoneCmd;1 -deleteZone=org.apache.cloudstack.api.admin.zone.command.DeleteZoneCmd;1 +createZone=org.apache.cloudstack.api.command.admin.zone.CreateZoneCmd;1 +updateZone=org.apache.cloudstack.api.command.admin.zone.UpdateZoneCmd;1 +deleteZone=org.apache.cloudstack.api.command.admin.zone.DeleteZoneCmd;1 listZones=org.apache.cloudstack.api.user.zone.command.ListZonesByCmd;15 #### events commands -listEvents=org.apache.cloudstack.api.user.event.command.ListEventsCmd;15 -listEventTypes=org.apache.cloudstack.api.user.event.command.ListEventTypesCmd;15 +listEvents=org.apache.cloudstack.api.command.user.event.ListEventsCmd;15 +listEventTypes=org.apache.cloudstack.api.command.user.event.ListEventTypesCmd;15 #### alerts commands -listAlerts=org.apache.cloudstack.api.admin.resource.command.ListAlertsCmd;3 +listAlerts=org.apache.cloudstack.api.command.admin.resource.ListAlertsCmd;3 #### system capacity commands -listCapacity=org.apache.cloudstack.api.admin.resource.command.ListCapacityCmd;3 +listCapacity=org.apache.cloudstack.api.command.admin.resource.ListCapacityCmd;3 #### swift commands^M -addSwift=org.apache.cloudstack.api.admin.swift.command.AddSwiftCmd;1 -listSwifts=org.apache.cloudstack.api.admin.swift.command.ListSwiftsCmd;1 +addSwift=org.apache.cloudstack.api.command.admin.swift.AddSwiftCmd;1 +listSwifts=org.apache.cloudstack.api.command.admin.swift.ListSwiftsCmd;1 #### host commands -addHost=org.apache.cloudstack.api.admin.host.command.AddHostCmd;3 -addCluster=org.apache.cloudstack.api.admin.cluster.command.AddClusterCmd;1 -deleteCluster=org.apache.cloudstack.api.admin.cluster.command.DeleteClusterCmd;1 -updateCluster=org.apache.cloudstack.api.admin.cluster.command.UpdateClusterCmd;1 -reconnectHost=org.apache.cloudstack.api.admin.host.command.ReconnectHostCmd;1 -updateHost=org.apache.cloudstack.api.admin.host.command.UpdateHostCmd;1 -deleteHost=org.apache.cloudstack.api.admin.host.command.DeleteHostCmd;3 -prepareHostForMaintenance=org.apache.cloudstack.api.admin.host.command.PrepareForMaintenanceCmd;1 -cancelHostMaintenance=org.apache.cloudstack.api.admin.host.command.CancelMaintenanceCmd;1 -listHosts=org.apache.cloudstack.api.admin.host.command.ListHostsCmd;3 -addSecondaryStorage=org.apache.cloudstack.api.admin.host.command.AddSecondaryStorageCmd;1 -updateHostPassword=org.apache.cloudstack.api.admin.host.command.UpdateHostPasswordCmd;1 +addHost=org.apache.cloudstack.api.command.admin.host.AddHostCmd;3 +addCluster=org.apache.cloudstack.api.command.admin.cluster.AddClusterCmd;1 +deleteCluster=org.apache.cloudstack.api.command.admin.cluster.DeleteClusterCmd;1 +updateCluster=org.apache.cloudstack.api.command.admin.cluster.UpdateClusterCmd;1 +reconnectHost=org.apache.cloudstack.api.command.admin.host.ReconnectHostCmd;1 +updateHost=org.apache.cloudstack.api.command.admin.host.UpdateHostCmd;1 +deleteHost=org.apache.cloudstack.api.command.admin.host.DeleteHostCmd;3 +prepareHostForMaintenance=org.apache.cloudstack.api.command.admin.host.PrepareForMaintenanceCmd;1 +cancelHostMaintenance=org.apache.cloudstack.api.command.admin.host.CancelMaintenanceCmd;1 +listHosts=org.apache.cloudstack.api.command.admin.host.ListHostsCmd;3 +addSecondaryStorage=org.apache.cloudstack.api.command.admin.host.AddSecondaryStorageCmd;1 +updateHostPassword=org.apache.cloudstack.api.command.admin.host.UpdateHostPasswordCmd;1 #### volume commands attachVolume=org.apache.cloudstack.api.user.volume.command.AttachVolumeCmd;15 @@ -257,29 +257,29 @@ migrateVolume=org.apache.cloudstack.api.user.volume.command.MigrateVolumeCmd;15 #### use that key...the key is stored in the db associated w/ #### the userId...every request to the developer API should be #### checked against the key -registerUserKeys=org.apache.cloudstack.api.admin.user.command.RegisterCmd;1 +registerUserKeys=org.apache.cloudstack.api.command.admin.user.RegisterCmd;1 ### async-query command -queryAsyncJobResult=org.apache.cloudstack.api.user.job.command.QueryAsyncJobResultCmd;15 -listAsyncJobs=org.apache.cloudstack.api.user.job.command.ListAsyncJobsCmd;15 +queryAsyncJobResult=org.apache.cloudstack.api.command.user.job.QueryAsyncJobResultCmd;15 +listAsyncJobs=org.apache.cloudstack.api.command.user.job.ListAsyncJobsCmd;15 #### storage pools commands -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=org.apache.cloudstack.api.admin.cluster.command.ListClustersCmd;3 -enableStorageMaintenance=org.apache.cloudstack.api.admin.storagepool.command.PreparePrimaryStorageForMaintenanceCmd;1 -cancelStorageMaintenance=org.apache.cloudstack.api.admin.storagepool.command.CancelPrimaryStorageMaintenanceCmd;1 +listStoragePools=org.apache.cloudstack.api.command.admin.storagepool.ListStoragePoolsCmd;3 +createStoragePool=org.apache.cloudstack.api.command.admin.storagepool.CreateStoragePoolCmd;1 +updateStoragePool=org.apache.cloudstack.api.command.admin.storagepool.UpdateStoragePoolCmd;1 +deleteStoragePool=org.apache.cloudstack.api.command.admin.storagepool.DeletePoolCmd;1 +listClusters=org.apache.cloudstack.api.command.admin.cluster.ListClustersCmd;3 +enableStorageMaintenance=org.apache.cloudstack.api.command.admin.storagepool.PreparePrimaryStorageForMaintenanceCmd;1 +cancelStorageMaintenance=org.apache.cloudstack.api.command.admin.storagepool.CancelPrimaryStorageMaintenanceCmd;1 #### security group commands -createSecurityGroup=org.apache.cloudstack.api.user.securitygroup.command.CreateSecurityGroupCmd;15 -deleteSecurityGroup=org.apache.cloudstack.api.user.securitygroup.command.DeleteSecurityGroupCmd;15 -authorizeSecurityGroupIngress=org.apache.cloudstack.api.user.securitygroup.command.AuthorizeSecurityGroupIngressCmd;15 -revokeSecurityGroupIngress=org.apache.cloudstack.api.user.securitygroup.command.RevokeSecurityGroupIngressCmd;15 -authorizeSecurityGroupEgress=org.apache.cloudstack.api.user.securitygroup.command.AuthorizeSecurityGroupEgressCmd;15 -revokeSecurityGroupEgress=org.apache.cloudstack.api.user.securitygroup.command.RevokeSecurityGroupEgressCmd;15 -listSecurityGroups=org.apache.cloudstack.api.user.securitygroup.command.ListSecurityGroupsCmd;15 +createSecurityGroup=org.apache.cloudstack.api.command.user.securitygroup.CreateSecurityGroupCmd;15 +deleteSecurityGroup=org.apache.cloudstack.api.command.user.securitygroup.DeleteSecurityGroupCmd;15 +authorizeSecurityGroupIngress=org.apache.cloudstack.api.command.user.securitygroup.AuthorizeSecurityGroupIngressCmd;15 +revokeSecurityGroupIngress=org.apache.cloudstack.api.command.user.securitygroup.RevokeSecurityGroupIngressCmd;15 +authorizeSecurityGroupEgress=org.apache.cloudstack.api.command.user.securitygroup.AuthorizeSecurityGroupEgressCmd;15 +revokeSecurityGroupEgress=org.apache.cloudstack.api.command.user.securitygroup.RevokeSecurityGroupEgressCmd;15 +listSecurityGroups=org.apache.cloudstack.api.command.user.securitygroup.ListSecurityGroupsCmd;15 #### vm group commands createInstanceGroup=org.apache.cloudstack.api.user.vmgroup.command.CreateVMGroupCmd;15 @@ -288,92 +288,92 @@ updateInstanceGroup=org.apache.cloudstack.api.user.vmgroup.command.UpdateVMGroup listInstanceGroups=org.apache.cloudstack.api.user.vmgroup.command.ListVMGroupsCmd;15 ### Certificate commands -uploadCustomCertificate=org.apache.cloudstack.api.admin.resource.command.UploadCustomCertificateCmd;1 +uploadCustomCertificate=org.apache.cloudstack.api.command.admin.resource.UploadCustomCertificateCmd;1 ### other commands -listHypervisors=org.apache.cloudstack.api.user.resource.command.ListHypervisorsCmd;15 +listHypervisors=org.apache.cloudstack.api.command.user.resource.ListHypervisorsCmd;15 ### VPN createRemoteAccessVpn=org.apache.cloudstack.api.user.vpn.command.CreateRemoteAccessVpnCmd;15 deleteRemoteAccessVpn=org.apache.cloudstack.api.user.vpn.command.DeleteRemoteAccessVpnCmd;15 listRemoteAccessVpns=org.apache.cloudstack.api.user.vpn.command.ListRemoteAccessVpnsCmd;15 -addVpnUser=org.apache.cloudstack.api.user.user.command.AddVpnUserCmd;15 -removeVpnUser=org.apache.cloudstack.api.user.user.command.RemoveVpnUserCmd;15 -listVpnUsers=org.apache.cloudstack.api.user.user.command.ListVpnUsersCmd;15 +addVpnUser=org.apache.cloudstack.api.command.user.user.AddVpnUserCmd;15 +removeVpnUser=org.apache.cloudstack.api.command.user.user.RemoveVpnUserCmd;15 +listVpnUsers=org.apache.cloudstack.api.command.user.user.ListVpnUsersCmd;15 #### network offering commands -createNetworkOffering=org.apache.cloudstack.api.admin.network.command.CreateNetworkOfferingCmd;1 -updateNetworkOffering=org.apache.cloudstack.api.admin.network.command.UpdateNetworkOfferingCmd;1 -deleteNetworkOffering=org.apache.cloudstack.api.admin.network.command.DeleteNetworkOfferingCmd;1 -listNetworkOfferings=org.apache.cloudstack.api.user.network.command.ListNetworkOfferingsCmd;15 +createNetworkOffering=org.apache.cloudstack.api.command.admin.network.CreateNetworkOfferingCmd;1 +updateNetworkOffering=org.apache.cloudstack.api.command.admin.network.UpdateNetworkOfferingCmd;1 +deleteNetworkOffering=org.apache.cloudstack.api.command.admin.network.DeleteNetworkOfferingCmd;1 +listNetworkOfferings=org.apache.cloudstack.api.command.user.network.ListNetworkOfferingsCmd;15 #### network commands -createNetwork=org.apache.cloudstack.api.user.network.command.CreateNetworkCmd;15 -deleteNetwork=org.apache.cloudstack.api.user.network.command.DeleteNetworkCmd;15 -listNetworks=org.apache.cloudstack.api.user.network.command.ListNetworksCmd;15 -restartNetwork=org.apache.cloudstack.api.user.network.command.RestartNetworkCmd;15 -updateNetwork=org.apache.cloudstack.api.user.network.command.UpdateNetworkCmd;15 +createNetwork=org.apache.cloudstack.api.command.user.network.CreateNetworkCmd;15 +deleteNetwork=org.apache.cloudstack.api.command.user.network.DeleteNetworkCmd;15 +listNetworks=org.apache.cloudstack.api.command.user.network.ListNetworksCmd;15 +restartNetwork=org.apache.cloudstack.api.command.user.network.RestartNetworkCmd;15 +updateNetwork=org.apache.cloudstack.api.command.user.network.UpdateNetworkCmd;15 #### SSH key pair commands -registerSSHKeyPair=org.apache.cloudstack.api.user.ssh.command.RegisterSSHKeyPairCmd;15 -createSSHKeyPair=org.apache.cloudstack.api.user.ssh.command.CreateSSHKeyPairCmd;15 -deleteSSHKeyPair=org.apache.cloudstack.api.user.ssh.command.DeleteSSHKeyPairCmd;15 -listSSHKeyPairs=org.apache.cloudstack.api.user.ssh.command.ListSSHKeyPairsCmd;15 +registerSSHKeyPair=org.apache.cloudstack.api.command.user.ssh.RegisterSSHKeyPairCmd;15 +createSSHKeyPair=org.apache.cloudstack.api.command.user.ssh.CreateSSHKeyPairCmd;15 +deleteSSHKeyPair=org.apache.cloudstack.api.command.user.ssh.DeleteSSHKeyPairCmd;15 +listSSHKeyPairs=org.apache.cloudstack.api.command.user.ssh.ListSSHKeyPairsCmd;15 #### Projects commands -createProject=org.apache.cloudstack.api.user.project.command.CreateProjectCmd;15 -deleteProject=org.apache.cloudstack.api.user.project.command.DeleteProjectCmd;15 -updateProject=org.apache.cloudstack.api.user.project.command.UpdateProjectCmd;15 -activateProject=org.apache.cloudstack.api.user.project.command.ActivateProjectCmd;15 -suspendProject=org.apache.cloudstack.api.user.project.command.SuspendProjectCmd;15 -listProjects=org.apache.cloudstack.api.user.project.command.ListProjectsCmd;15 -addAccountToProject=org.apache.cloudstack.api.user.account.command.AddAccountToProjectCmd;15 -deleteAccountFromProject=org.apache.cloudstack.api.user.account.command.DeleteAccountFromProjectCmd;15 -listProjectAccounts=org.apache.cloudstack.api.user.account.command.ListProjectAccountsCmd;15 -listProjectInvitations=org.apache.cloudstack.api.user.project.command.ListProjectInvitationsCmd;15 -updateProjectInvitation=org.apache.cloudstack.api.user.project.command.UpdateProjectInvitationCmd;15 -deleteProjectInvitation=org.apache.cloudstack.api.user.project.command.DeleteProjectInvitationCmd;15 +createProject=org.apache.cloudstack.api.command.user.project.CreateProjectCmd;15 +deleteProject=org.apache.cloudstack.api.command.user.project.DeleteProjectCmd;15 +updateProject=org.apache.cloudstack.api.command.user.project.UpdateProjectCmd;15 +activateProject=org.apache.cloudstack.api.command.user.project.ActivateProjectCmd;15 +suspendProject=org.apache.cloudstack.api.command.user.project.SuspendProjectCmd;15 +listProjects=org.apache.cloudstack.api.command.user.project.ListProjectsCmd;15 +addAccountToProject=org.apache.cloudstack.api.command.user.account.AddAccountToProjectCmd;15 +deleteAccountFromProject=org.apache.cloudstack.api.command.user.account.DeleteAccountFromProjectCmd;15 +listProjectAccounts=org.apache.cloudstack.api.command.user.account.ListProjectAccountsCmd;15 +listProjectInvitations=org.apache.cloudstack.api.command.user.project.ListProjectInvitationsCmd;15 +updateProjectInvitation=org.apache.cloudstack.api.command.user.project.UpdateProjectInvitationCmd;15 +deleteProjectInvitation=org.apache.cloudstack.api.command.user.project.DeleteProjectInvitationCmd;15 #### -createFirewallRule=org.apache.cloudstack.api.user.firewall.command.CreateFirewallRuleCmd;15 -deleteFirewallRule=org.apache.cloudstack.api.user.firewall.command.DeleteFirewallRuleCmd;15 -listFirewallRules=org.apache.cloudstack.api.user.firewall.command.ListFirewallRulesCmd;15 +createFirewallRule=org.apache.cloudstack.api.command.user.firewall.CreateFirewallRuleCmd;15 +deleteFirewallRule=org.apache.cloudstack.api.command.user.firewall.DeleteFirewallRuleCmd;15 +listFirewallRules=org.apache.cloudstack.api.command.user.firewall.ListFirewallRulesCmd;15 #### hypervisor capabilities commands -updateHypervisorCapabilities=org.apache.cloudstack.api.admin.config.command.UpdateHypervisorCapabilitiesCmd;1 -listHypervisorCapabilities=org.apache.cloudstack.api.admin.config.command.ListHypervisorCapabilitiesCmd;1 +updateHypervisorCapabilities=org.apache.cloudstack.api.command.admin.config.UpdateHypervisorCapabilitiesCmd;1 +listHypervisorCapabilities=org.apache.cloudstack.api.command.admin.config.ListHypervisorCapabilitiesCmd;1 #### Physical Network commands -createPhysicalNetwork=org.apache.cloudstack.api.admin.network.command.CreatePhysicalNetworkCmd;1 -deletePhysicalNetwork=org.apache.cloudstack.api.admin.network.command.DeletePhysicalNetworkCmd;1 -listPhysicalNetworks=org.apache.cloudstack.api.admin.network.command.ListPhysicalNetworksCmd;1 -updatePhysicalNetwork=org.apache.cloudstack.api.admin.network.command.UpdatePhysicalNetworkCmd;1 +createPhysicalNetwork=org.apache.cloudstack.api.command.admin.network.CreatePhysicalNetworkCmd;1 +deletePhysicalNetwork=org.apache.cloudstack.api.command.admin.network.DeletePhysicalNetworkCmd;1 +listPhysicalNetworks=org.apache.cloudstack.api.command.admin.network.ListPhysicalNetworksCmd;1 +updatePhysicalNetwork=org.apache.cloudstack.api.command.admin.network.UpdatePhysicalNetworkCmd;1 #### Physical Network Service Provider commands -listSupportedNetworkServices=org.apache.cloudstack.api.admin.network.command.ListSupportedNetworkServicesCmd;1 -addNetworkServiceProvider=org.apache.cloudstack.api.admin.network.command.AddNetworkServiceProviderCmd;1 -deleteNetworkServiceProvider=org.apache.cloudstack.api.admin.network.command.DeleteNetworkServiceProviderCmd;1 -listNetworkServiceProviders=org.apache.cloudstack.api.admin.network.command.ListNetworkServiceProvidersCmd;1 -updateNetworkServiceProvider=org.apache.cloudstack.api.admin.network.command.UpdateNetworkServiceProviderCmd;1 +listSupportedNetworkServices=org.apache.cloudstack.api.command.admin.network.ListSupportedNetworkServicesCmd;1 +addNetworkServiceProvider=org.apache.cloudstack.api.command.admin.network.AddNetworkServiceProviderCmd;1 +deleteNetworkServiceProvider=org.apache.cloudstack.api.command.admin.network.DeleteNetworkServiceProviderCmd;1 +listNetworkServiceProviders=org.apache.cloudstack.api.command.admin.network.ListNetworkServiceProvidersCmd;1 +updateNetworkServiceProvider=org.apache.cloudstack.api.command.admin.network.UpdateNetworkServiceProviderCmd;1 #### Physical Network Traffic Type commands -addTrafficType=org.apache.cloudstack.api.admin.usage.command.AddTrafficTypeCmd;1 -deleteTrafficType=org.apache.cloudstack.api.admin.usage.command.DeleteTrafficTypeCmd;1 -listTrafficTypes=org.apache.cloudstack.api.admin.usage.command.ListTrafficTypesCmd;1 -updateTrafficType=org.apache.cloudstack.api.admin.usage.command.UpdateTrafficTypeCmd;1 -listTrafficTypeImplementors=org.apache.cloudstack.api.admin.usage.command.ListTrafficTypeImplementorsCmd;1 +addTrafficType=org.apache.cloudstack.api.command.admin.usage.AddTrafficTypeCmd;1 +deleteTrafficType=org.apache.cloudstack.api.command.admin.usage.DeleteTrafficTypeCmd;1 +listTrafficTypes=org.apache.cloudstack.api.command.admin.usage.ListTrafficTypesCmd;1 +updateTrafficType=org.apache.cloudstack.api.command.admin.usage.UpdateTrafficTypeCmd;1 +listTrafficTypeImplementors=org.apache.cloudstack.api.command.admin.usage.ListTrafficTypeImplementorsCmd;1 #### Storage Network commands -createStorageNetworkIpRange=org.apache.cloudstack.api.admin.network.command.CreateStorageNetworkIpRangeCmd;1 -deleteStorageNetworkIpRange=org.apache.cloudstack.api.admin.network.command.DeleteStorageNetworkIpRangeCmd;1 -listStorageNetworkIpRange=org.apache.cloudstack.api.admin.network.command.ListStorageNetworkIpRangeCmd;1 -updateStorageNetworkIpRange=org.apache.cloudstack.api.admin.network.command.UpdateStorageNetworkIpRangeCmd;1 +createStorageNetworkIpRange=org.apache.cloudstack.api.command.admin.network.CreateStorageNetworkIpRangeCmd;1 +deleteStorageNetworkIpRange=org.apache.cloudstack.api.command.admin.network.DeleteStorageNetworkIpRangeCmd;1 +listStorageNetworkIpRange=org.apache.cloudstack.api.command.admin.network.ListStorageNetworkIpRangeCmd;1 +updateStorageNetworkIpRange=org.apache.cloudstack.api.command.admin.network.UpdateStorageNetworkIpRangeCmd;1 ### Network Devices commands -addNetworkDevice=org.apache.cloudstack.api.admin.network.command.AddNetworkDeviceCmd;1 -listNetworkDevice=org.apache.cloudstack.api.admin.network.command.ListNetworkDeviceCmd;1 -deleteNetworkDevice=org.apache.cloudstack.api.admin.network.command.DeleteNetworkDeviceCmd;1 +addNetworkDevice=org.apache.cloudstack.api.command.admin.network.AddNetworkDeviceCmd;1 +listNetworkDevice=org.apache.cloudstack.api.command.admin.network.ListNetworkDeviceCmd;1 +deleteNetworkDevice=org.apache.cloudstack.api.command.admin.network.DeleteNetworkDeviceCmd;1 ### VPC commands createVPC=org.apache.cloudstack.api.user.vpc.command.CreateVPCCmd;15 @@ -383,20 +383,20 @@ updateVPC=org.apache.cloudstack.api.user.vpc.command.UpdateVPCCmd;15 restartVPC=org.apache.cloudstack.api.user.vpc.command.RestartVPCCmd;15 #### VPC offering commands -createVPCOffering=org.apache.cloudstack.api.admin.vpc.command.CreateVPCOfferingCmd;1 -updateVPCOffering=org.apache.cloudstack.api.admin.vpc.command.UpdateVPCOfferingCmd;1 -deleteVPCOffering=org.apache.cloudstack.api.admin.vpc.command.DeleteVPCOfferingCmd;1 +createVPCOffering=org.apache.cloudstack.api.command.admin.vpc.CreateVPCOfferingCmd;1 +updateVPCOffering=org.apache.cloudstack.api.command.admin.vpc.UpdateVPCOfferingCmd;1 +deleteVPCOffering=org.apache.cloudstack.api.command.admin.vpc.DeleteVPCOfferingCmd;1 listVPCOfferings=org.apache.cloudstack.api.user.vpc.command.ListVPCOfferingsCmd;15 #### Private gateway commands -createPrivateGateway=org.apache.cloudstack.api.admin.vpc.command.CreatePrivateGatewayCmd;1 +createPrivateGateway=org.apache.cloudstack.api.command.admin.vpc.CreatePrivateGatewayCmd;1 listPrivateGateways=org.apache.cloudstack.api.user.vpc.command.ListPrivateGatewaysCmd;15 -deletePrivateGateway=org.apache.cloudstack.api.admin.vpc.command.DeletePrivateGatewayCmd;1 +deletePrivateGateway=org.apache.cloudstack.api.command.admin.vpc.DeletePrivateGatewayCmd;1 #### Network ACL commands -createNetworkACL=org.apache.cloudstack.api.user.network.command.CreateNetworkACLCmd;15 -deleteNetworkACL=org.apache.cloudstack.api.user.network.command.DeleteNetworkACLCmd;15 -listNetworkACLs=org.apache.cloudstack.api.user.network.command.ListNetworkACLsCmd;15 +createNetworkACL=org.apache.cloudstack.api.command.user.network.CreateNetworkACLCmd;15 +deleteNetworkACL=org.apache.cloudstack.api.command.user.network.DeleteNetworkACLCmd;15 +listNetworkACLs=org.apache.cloudstack.api.command.user.network.ListNetworkACLsCmd;15 #### Static route commands createStaticRoute=org.apache.cloudstack.api.user.vpc.command.CreateStaticRouteCmd;15 @@ -404,9 +404,9 @@ deleteStaticRoute=org.apache.cloudstack.api.user.vpc.command.DeleteStaticRouteCm listStaticRoutes=org.apache.cloudstack.api.user.vpc.command.ListStaticRoutesCmd;15 #### Tags commands -createTags=org.apache.cloudstack.api.user.tag.command.CreateTagsCmd;15 -deleteTags=org.apache.cloudstack.api.user.tag.command.DeleteTagsCmd;15 -listTags=org.apache.cloudstack.api.user.tag.command.ListTagsCmd;15 +createTags=org.apache.cloudstack.api.command.user.tag.CreateTagsCmd;15 +deleteTags=org.apache.cloudstack.api.command.user.tag.DeleteTagsCmd;15 +listTags=org.apache.cloudstack.api.command.user.tag.ListTagsCmd;15 ### Site-to-site VPN commands createVpnCustomerGateway=org.apache.cloudstack.api.user.vpn.command.CreateVpnCustomerGatewayCmd;15 diff --git a/client/tomcatconf/virtualrouter_commands.properties.in b/client/tomcatconf/virtualrouter_commands.properties.in index 1cca28a40ea..e8d7933462e 100644 --- a/client/tomcatconf/virtualrouter_commands.properties.in +++ b/client/tomcatconf/virtualrouter_commands.properties.in @@ -19,6 +19,6 @@ ### Please standardize naming conventions to camel-case (even for acronyms). #### router commands -createVirtualRouterElement=org.apache.cloudstack.api.admin.router.command.CreateVirtualRouterElementCmd;7 -configureVirtualRouterElement=org.apache.cloudstack.api.admin.router.command.ConfigureVirtualRouterElementCmd;7 -listVirtualRouterElements=org.apache.cloudstack.api.admin.router.command.ListVirtualRouterElementsCmd;7 +createVirtualRouterElement=org.apache.cloudstack.api.command.admin.router.CreateVirtualRouterElementCmd;7 +configureVirtualRouterElement=org.apache.cloudstack.api.command.admin.router.ConfigureVirtualRouterElementCmd;7 +listVirtualRouterElements=org.apache.cloudstack.api.command.admin.router.ListVirtualRouterElementsCmd;7 diff --git a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManager.java b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManager.java index d4cedf647f1..aea795d436f 100644 --- a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManager.java +++ b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManager.java @@ -18,7 +18,7 @@ package com.cloud.network.lb; import java.util.List; -import org.apache.cloudstack.api.user.lb.command.CreateLoadBalancerRuleCmd; +import org.apache.cloudstack.api.command.user.loadbalancer.CreateLoadBalancerRuleCmd; import com.cloud.exception.InsufficientAddressCapacityException; import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceUnavailableException; diff --git a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java index 3ce2717e936..c3f03b87898 100644 --- a/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java +++ b/plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java @@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit; import javax.ejb.Local; import javax.naming.ConfigurationException; -import org.apache.cloudstack.api.user.lb.command.CreateLoadBalancerRuleCmd; +import org.apache.cloudstack.api.command.user.loadbalancer.CreateLoadBalancerRuleCmd; import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; 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 6777765c30f..153f9e1b29f 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,7 +19,7 @@ package com.cloud.api.commands; import java.util.ArrayList; import java.util.List; -import org.apache.cloudstack.api.user.offering.command.ListServiceOfferingsCmd; +import org.apache.cloudstack.api.command.user.offering.ListServiceOfferingsCmd; import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; diff --git a/server/src/com/cloud/api/ApiDispatcher.java b/server/src/com/cloud/api/ApiDispatcher.java index fc2b6256bb7..37321a1dded 100755 --- a/server/src/com/cloud/api/ApiDispatcher.java +++ b/server/src/com/cloud/api/ApiDispatcher.java @@ -34,7 +34,7 @@ import org.apache.log4j.Logger; import com.cloud.acl.ControlledEntity; import com.cloud.acl.Role; import org.apache.cloudstack.api.BaseCmd.CommandType; -import org.apache.cloudstack.api.user.event.command.ListEventsCmd; +import org.apache.cloudstack.api.command.user.event.ListEventsCmd; import com.cloud.async.AsyncCommandQueued; import com.cloud.async.AsyncJobManager; import com.cloud.configuration.Config; diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index 95d10f4c10e..15a1a791f5b 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -39,7 +39,7 @@ import com.cloud.acl.ControlledEntity; import com.cloud.acl.ControlledEntity.ACLType; import org.apache.cloudstack.api.ApiConstants.HostDetails; import org.apache.cloudstack.api.ApiConstants.VMDetails; -import org.apache.cloudstack.api.user.job.command.QueryAsyncJobResultCmd; +import org.apache.cloudstack.api.command.user.job.QueryAsyncJobResultCmd; import com.cloud.api.response.AccountResponse; import com.cloud.api.response.ApiResponseSerializer; import com.cloud.api.response.AsyncJobResponse; @@ -70,12 +70,10 @@ import com.cloud.api.response.IpForwardingRuleResponse; import com.cloud.api.response.LBStickinessPolicyResponse; import com.cloud.api.response.LBStickinessResponse; import com.cloud.api.response.LDAPConfigResponse; -import com.cloud.api.response.ListResponse; import com.cloud.api.response.LoadBalancerResponse; import com.cloud.api.response.NetworkACLResponse; import com.cloud.api.response.NetworkOfferingResponse; import com.cloud.api.response.NetworkResponse; -import com.cloud.api.response.NicResponse; import com.cloud.api.response.PhysicalNetworkResponse; import com.cloud.api.response.PodResponse; import com.cloud.api.response.PrivateGatewayResponse; @@ -88,9 +86,7 @@ import com.cloud.api.response.ResourceCountResponse; import com.cloud.api.response.ResourceLimitResponse; import com.cloud.api.response.ResourceTagResponse; import com.cloud.api.response.SecurityGroupResponse; -import com.cloud.api.response.SecurityGroupResultObject; import com.cloud.api.response.SecurityGroupRuleResponse; -import com.cloud.api.response.SecurityGroupRuleResultObject; import com.cloud.api.response.ServiceOfferingResponse; import com.cloud.api.response.ServiceResponse; import com.cloud.api.response.Site2SiteCustomerGatewayResponse; @@ -178,8 +174,6 @@ import com.cloud.network.rules.PortForwardingRule; import com.cloud.network.rules.StaticNatRule; import com.cloud.network.rules.StickinessPolicy; import com.cloud.network.security.SecurityGroup; -import com.cloud.network.security.SecurityGroupRules; -import com.cloud.network.security.SecurityGroupVO; import com.cloud.network.security.SecurityRule; import com.cloud.network.security.SecurityRule.SecurityRuleType; import com.cloud.network.vpc.PrivateGateway; @@ -230,17 +224,11 @@ import com.cloud.utils.StringUtils; import com.cloud.utils.net.NetUtils; import com.cloud.vm.ConsoleProxyVO; import com.cloud.vm.InstanceGroup; -import com.cloud.vm.InstanceGroupVO; import com.cloud.vm.NicProfile; -import com.cloud.vm.UserVmDetailVO; import com.cloud.vm.VMInstanceVO; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachine.State; import com.cloud.vm.VirtualMachine.Type; -import com.cloud.vm.VmStats; -import com.cloud.vm.dao.UserVmData; -import com.cloud.vm.dao.UserVmData.NicData; -import com.cloud.vm.dao.UserVmData.SecurityGroupData; public class ApiResponseHelper implements ResponseGenerator { diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/com/cloud/api/ApiServer.java index ae12715b0dd..ee4a2228be1 100755 --- a/server/src/com/cloud/api/ApiServer.java +++ b/server/src/com/cloud/api/ApiServer.java @@ -50,6 +50,7 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.apache.cloudstack.api.*; +import org.apache.cloudstack.api.command.user.event.ListEventsCmd; import org.apache.commons.codec.binary.Base64; import org.apache.http.ConnectionClosedException; import org.apache.http.HttpException; @@ -78,10 +79,9 @@ import org.apache.http.protocol.ResponseDate; import org.apache.http.protocol.ResponseServer; import org.apache.log4j.Logger; -import org.apache.cloudstack.api.admin.router.command.ListRoutersCmd; -import org.apache.cloudstack.api.user.event.command.ListEventsCmd; -import org.apache.cloudstack.api.user.securitygroup.command.ListSecurityGroupsCmd; -import org.apache.cloudstack.api.user.tag.command.ListTagsCmd; +import org.apache.cloudstack.api.command.admin.router.ListRoutersCmd; +import org.apache.cloudstack.api.command.user.securitygroup.ListSecurityGroupsCmd; +import org.apache.cloudstack.api.command.user.tag.ListTagsCmd; import org.apache.cloudstack.api.user.vm.command.ListVMsCmd; import com.cloud.acl.ControlledEntity; import com.cloud.api.response.ApiResponseSerializer; diff --git a/server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java b/server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java index a6f35976758..0bdc362fdf9 100644 --- a/server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java +++ b/server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java @@ -19,7 +19,7 @@ package com.cloud.api.commands; import java.util.ArrayList; import java.util.List; -import org.apache.cloudstack.api.user.offering.command.ListServiceOfferingsCmd; +import org.apache.cloudstack.api.command.user.offering.ListServiceOfferingsCmd; import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; diff --git a/server/src/com/cloud/async/AsyncJobManager.java b/server/src/com/cloud/async/AsyncJobManager.java index 7876b551903..4cd67f3e39c 100644 --- a/server/src/com/cloud/async/AsyncJobManager.java +++ b/server/src/com/cloud/async/AsyncJobManager.java @@ -18,7 +18,7 @@ package com.cloud.async; import java.util.List; -import org.apache.cloudstack.api.user.job.command.QueryAsyncJobResultCmd; +import org.apache.cloudstack.api.command.user.job.QueryAsyncJobResultCmd; import com.cloud.utils.component.Manager; public interface AsyncJobManager extends Manager { diff --git a/server/src/com/cloud/async/AsyncJobManagerImpl.java b/server/src/com/cloud/async/AsyncJobManagerImpl.java index a451f28c438..86a23c9c0a3 100644 --- a/server/src/com/cloud/async/AsyncJobManagerImpl.java +++ b/server/src/com/cloud/async/AsyncJobManagerImpl.java @@ -34,7 +34,7 @@ import java.util.concurrent.TimeUnit; import javax.ejb.Local; import javax.naming.ConfigurationException; -import org.apache.cloudstack.api.user.job.command.QueryAsyncJobResultCmd; +import org.apache.cloudstack.api.command.user.job.QueryAsyncJobResultCmd; import org.apache.log4j.Logger; import org.apache.log4j.NDC; diff --git a/server/src/com/cloud/baremetal/BareMetalTemplateAdapter.java b/server/src/com/cloud/baremetal/BareMetalTemplateAdapter.java index c609e83468b..25298a9eebd 100755 --- a/server/src/com/cloud/baremetal/BareMetalTemplateAdapter.java +++ b/server/src/com/cloud/baremetal/BareMetalTemplateAdapter.java @@ -21,11 +21,11 @@ import java.util.List; import javax.ejb.Local; -import org.apache.cloudstack.api.user.iso.command.DeleteIsoCmd; -import org.apache.cloudstack.api.user.iso.command.RegisterIsoCmd; +import org.apache.cloudstack.api.command.user.iso.DeleteIsoCmd; +import org.apache.cloudstack.api.command.user.iso.RegisterIsoCmd; +import org.apache.cloudstack.api.command.user.template.RegisterTemplateCmd; import org.apache.log4j.Logger; -import org.apache.cloudstack.api.user.template.command.RegisterTemplateCmd; import com.cloud.configuration.Resource.ResourceType; import com.cloud.dc.DataCenterVO; import com.cloud.event.EventTypes; diff --git a/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java b/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java index b5abd82af7b..e4fcdf8b14d 100755 --- a/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java +++ b/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java @@ -25,7 +25,7 @@ import java.util.concurrent.Executors; import javax.ejb.Local; import javax.naming.ConfigurationException; -import org.apache.cloudstack.api.user.template.command.CreateTemplateCmd; +import org.apache.cloudstack.api.command.user.template.CreateTemplateCmd; import org.apache.cloudstack.api.user.volume.command.AttachVolumeCmd; import org.apache.cloudstack.api.user.volume.command.DetachVolumeCmd; import org.apache.log4j.Logger; diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index f5dea7ed09b..c25b3b7ba6f 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -38,32 +38,30 @@ 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.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.cloudstack.api.command.admin.config.UpdateCfgCmd; +import org.apache.cloudstack.api.command.admin.ldap.LDAPConfigCmd; +import org.apache.cloudstack.api.command.admin.ldap.LDAPRemoveCmd; +import org.apache.cloudstack.api.command.admin.network.DeleteNetworkOfferingCmd; +import org.apache.cloudstack.api.command.admin.network.CreateNetworkOfferingCmd; +import org.apache.cloudstack.api.command.admin.network.UpdateNetworkOfferingCmd; +import org.apache.cloudstack.api.command.admin.offering.CreateDiskOfferingCmd; +import org.apache.cloudstack.api.command.admin.offering.*; +import org.apache.cloudstack.api.command.admin.pod.DeletePodCmd; +import org.apache.cloudstack.api.command.admin.pod.UpdatePodCmd; +import org.apache.cloudstack.api.command.admin.vlan.CreateVlanIpRangeCmd; +import org.apache.cloudstack.api.command.admin.zone.CreateZoneCmd; +import org.apache.cloudstack.api.command.admin.zone.DeleteZoneCmd; +import org.apache.cloudstack.api.command.admin.zone.UpdateZoneCmd; +import org.apache.cloudstack.api.command.admin.offering.CreateServiceOfferingCmd; import org.apache.log4j.Logger; import com.cloud.acl.SecurityChecker; 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 org.apache.cloudstack.api.admin.offering.command.DeleteDiskOfferingCmd; -import org.apache.cloudstack.api.admin.offering.command.DeleteServiceOfferingCmd; -import org.apache.cloudstack.api.admin.vlan.command.DeleteVlanIpRangeCmd; -import org.apache.cloudstack.api.admin.zone.command.DeleteZoneCmd; -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; +import org.apache.cloudstack.api.command.admin.offering.DeleteServiceOfferingCmd; +import org.apache.cloudstack.api.command.admin.vlan.DeleteVlanIpRangeCmd; +import org.apache.cloudstack.api.command.user.network.ListNetworkOfferingsCmd; import com.cloud.capacity.dao.CapacityDao; import com.cloud.configuration.Resource.ResourceType; import com.cloud.configuration.dao.ConfigurationDao; diff --git a/server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java b/server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java index 8767f95108c..39f2cc8dbe2 100755 --- a/server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java +++ b/server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java @@ -26,15 +26,15 @@ import java.util.concurrent.ScheduledExecutorService; import javax.ejb.Local; import javax.naming.ConfigurationException; -import org.apache.cloudstack.api.admin.network.command.AddNetworkDeviceCmd; -import org.apache.cloudstack.api.admin.network.command.ListNetworkDeviceCmd; +import org.apache.cloudstack.api.command.admin.network.AddNetworkDeviceCmd; +import org.apache.cloudstack.api.command.admin.network.ListNetworkDeviceCmd; import org.apache.cloudstack.network.ExternalNetworkDeviceManager; import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.IdentityService; -import org.apache.cloudstack.api.admin.network.command.DeleteNetworkDeviceCmd; +import org.apache.cloudstack.api.command.admin.network.DeleteNetworkDeviceCmd; import com.cloud.baremetal.ExternalDhcpManager; import com.cloud.baremetal.PxeServerManager; import com.cloud.baremetal.PxeServerProfile; @@ -59,7 +59,7 @@ import com.cloud.network.dao.VpnUserDao; import com.cloud.network.rules.dao.PortForwardingRulesDao; import com.cloud.offerings.dao.NetworkOfferingDao; import com.cloud.server.ManagementServer; -import org.apache.cloudstack.api.admin.network.response.NetworkDeviceResponse; +import org.apache.cloudstack.api.response.NetworkDeviceResponse; import com.cloud.server.api.response.NwDeviceDhcpResponse; import com.cloud.server.api.response.PxePingResponse; import com.cloud.user.AccountManager; diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 542efa7e7b6..651f33b3948 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -40,8 +40,9 @@ import java.util.concurrent.TimeUnit; import javax.ejb.Local; import javax.naming.ConfigurationException; -import org.apache.cloudstack.api.admin.usage.command.ListTrafficTypeImplementorsCmd; -import org.apache.cloudstack.api.user.network.command.CreateNetworkCmd; +import org.apache.cloudstack.api.command.admin.usage.ListTrafficTypeImplementorsCmd; +import org.apache.cloudstack.api.command.user.network.CreateNetworkCmd; +import org.apache.cloudstack.api.command.user.network.RestartNetworkCmd; import org.apache.log4j.Logger; import com.cloud.acl.ControlledEntity.ACLType; @@ -58,8 +59,7 @@ import com.cloud.agent.api.StartupCommand; import com.cloud.agent.api.StartupRoutingCommand; import com.cloud.agent.api.to.NicTO; import com.cloud.alert.AlertManager; -import org.apache.cloudstack.api.user.network.command.ListNetworksCmd; -import org.apache.cloudstack.api.user.network.command.RestartNetworkCmd; +import org.apache.cloudstack.api.command.user.network.ListNetworksCmd; import com.cloud.configuration.Config; import com.cloud.configuration.ConfigurationManager; import com.cloud.configuration.Resource.ResourceType; diff --git a/server/src/com/cloud/network/StorageNetworkManagerImpl.java b/server/src/com/cloud/network/StorageNetworkManagerImpl.java index 04dfcd3431f..f46081c9de0 100755 --- a/server/src/com/cloud/network/StorageNetworkManagerImpl.java +++ b/server/src/com/cloud/network/StorageNetworkManagerImpl.java @@ -25,12 +25,12 @@ import java.util.Map; import javax.ejb.Local; import javax.naming.ConfigurationException; -import org.apache.cloudstack.api.admin.network.command.CreateStorageNetworkIpRangeCmd; -import org.apache.cloudstack.api.admin.network.command.ListStorageNetworkIpRangeCmd; -import org.apache.cloudstack.api.admin.network.command.UpdateStorageNetworkIpRangeCmd; +import org.apache.cloudstack.api.command.admin.network.CreateStorageNetworkIpRangeCmd; +import org.apache.cloudstack.api.command.admin.network.ListStorageNetworkIpRangeCmd; +import org.apache.cloudstack.api.command.admin.network.UpdateStorageNetworkIpRangeCmd; import org.apache.log4j.Logger; -import org.apache.cloudstack.api.admin.network.command.DeleteStorageNetworkIpRangeCmd; +import org.apache.cloudstack.api.command.admin.network.DeleteStorageNetworkIpRangeCmd; import com.cloud.dc.HostPodVO; import com.cloud.dc.StorageNetworkIpRange; import com.cloud.dc.StorageNetworkIpAddressVO; diff --git a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java index 35b6c9beac1..018369d7b31 100644 --- a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java +++ b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java @@ -25,7 +25,8 @@ import java.util.Map; import javax.ejb.Local; import javax.naming.ConfigurationException; -import org.apache.cloudstack.api.user.autoscale.command.*; +import org.apache.cloudstack.api.command.admin.autoscale.CreateCounterCmd; +import org.apache.cloudstack.api.command.user.autoscale.*; import org.apache.log4j.Logger; import com.cloud.acl.ControlledEntity; @@ -33,18 +34,14 @@ import org.apache.cloudstack.api.ApiConstants; import com.cloud.api.ApiDBUtils; import com.cloud.api.ApiDispatcher; import org.apache.cloudstack.api.BaseListAccountResourcesCmd; -import org.apache.cloudstack.api.user.autoscale.command.CreateAutoScalePolicyCmd; -import org.apache.cloudstack.api.user.autoscale.command.CreateAutoScaleVmGroupCmd; -import org.apache.cloudstack.api.user.autoscale.command.CreateAutoScaleVmProfileCmd; -import org.apache.cloudstack.api.user.autoscale.command.CreateConditionCmd; -import org.apache.cloudstack.api.admin.autoscale.command.CreateCounterCmd; +import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScalePolicyCmd; +import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScaleVmGroupCmd; +import org.apache.cloudstack.api.command.user.autoscale.CreateConditionCmd; import org.apache.cloudstack.api.user.vm.command.DeployVMCmd; -import org.apache.cloudstack.api.user.autoscale.command.ListAutoScalePoliciesCmd; -import org.apache.cloudstack.api.user.autoscale.command.ListAutoScaleVmGroupsCmd; -import org.apache.cloudstack.api.user.autoscale.command.ListConditionsCmd; -import org.apache.cloudstack.api.user.autoscale.command.ListCountersCmd; -import org.apache.cloudstack.api.user.autoscale.command.UpdateAutoScalePolicyCmd; -import org.apache.cloudstack.api.user.autoscale.command.UpdateAutoScaleVmProfileCmd; +import org.apache.cloudstack.api.command.user.autoscale.ListAutoScaleVmGroupsCmd; +import org.apache.cloudstack.api.command.user.autoscale.ListConditionsCmd; +import org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScalePolicyCmd; +import org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScaleVmProfileCmd; import com.cloud.configuration.Config; import com.cloud.configuration.ConfigurationManager; import com.cloud.configuration.dao.ConfigurationDao; diff --git a/server/src/com/cloud/network/element/VirtualRouterElement.java b/server/src/com/cloud/network/element/VirtualRouterElement.java index 5339b3f50a4..5167616f085 100755 --- a/server/src/com/cloud/network/element/VirtualRouterElement.java +++ b/server/src/com/cloud/network/element/VirtualRouterElement.java @@ -24,8 +24,8 @@ import java.util.Set; import javax.ejb.Local; -import org.apache.cloudstack.api.admin.router.command.ConfigureVirtualRouterElementCmd; -import org.apache.cloudstack.api.admin.router.command.ListVirtualRouterElementsCmd; +import org.apache.cloudstack.api.command.admin.router.ConfigureVirtualRouterElementCmd; +import org.apache.cloudstack.api.command.admin.router.ListVirtualRouterElementsCmd; import org.apache.log4j.Logger; import com.cloud.configuration.ConfigurationManager; diff --git a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java index f7ee1c7e719..340e872a9de 100644 --- a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java +++ b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java @@ -26,7 +26,7 @@ import java.util.Set; import javax.ejb.Local; import javax.naming.ConfigurationException; -import org.apache.cloudstack.api.user.firewall.command.ListFirewallRulesCmd; +import org.apache.cloudstack.api.command.user.firewall.ListFirewallRulesCmd; import org.apache.log4j.Logger; import com.cloud.configuration.Config; diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManager.java b/server/src/com/cloud/network/lb/LoadBalancingRulesManager.java index c6aba418556..c9b3f9336b8 100644 --- a/server/src/com/cloud/network/lb/LoadBalancingRulesManager.java +++ b/server/src/com/cloud/network/lb/LoadBalancingRulesManager.java @@ -18,7 +18,7 @@ package com.cloud.network.lb; import java.util.List; -import org.apache.cloudstack.api.user.lb.command.CreateLoadBalancerRuleCmd; +import org.apache.cloudstack.api.command.user.loadbalancer.CreateLoadBalancerRuleCmd; import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.lb.LoadBalancingRule.LbDestination; diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java index 7d0acfa3e2b..0a0ea005c69 100755 --- a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java +++ b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java @@ -30,12 +30,12 @@ import java.util.Set; import javax.ejb.Local; import javax.naming.ConfigurationException; -import org.apache.cloudstack.api.user.lb.command.*; +import org.apache.cloudstack.api.command.user.loadbalancer.*; import org.apache.log4j.Logger; -import org.apache.cloudstack.api.user.lb.command.CreateLBStickinessPolicyCmd; -import org.apache.cloudstack.api.user.lb.command.ListLoadBalancerRuleInstancesCmd; -import org.apache.cloudstack.api.user.lb.command.ListLoadBalancerRulesCmd; +import org.apache.cloudstack.api.command.user.loadbalancer.CreateLBStickinessPolicyCmd; +import org.apache.cloudstack.api.command.user.loadbalancer.ListLoadBalancerRuleInstancesCmd; +import org.apache.cloudstack.api.command.user.loadbalancer.ListLoadBalancerRulesCmd; import com.cloud.api.response.ServiceResponse; import com.cloud.configuration.Config; import com.cloud.configuration.ConfigurationManager; diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index d06c3263f0f..2026c8e6ba3 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -36,7 +36,7 @@ import java.util.concurrent.TimeUnit; import javax.ejb.Local; import javax.naming.ConfigurationException; -import org.apache.cloudstack.api.admin.router.command.UpgradeRouterCmd; +import org.apache.cloudstack.api.command.admin.router.UpgradeRouterCmd; import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; diff --git a/server/src/com/cloud/network/rules/RulesManagerImpl.java b/server/src/com/cloud/network/rules/RulesManagerImpl.java index 422dae1f39c..dced8f9ca97 100755 --- a/server/src/com/cloud/network/rules/RulesManagerImpl.java +++ b/server/src/com/cloud/network/rules/RulesManagerImpl.java @@ -25,9 +25,9 @@ import java.util.Set; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.apache.cloudstack.api.command.user.firewall.ListPortForwardingRulesCmd; import org.apache.log4j.Logger; -import org.apache.cloudstack.api.user.firewall.command.ListPortForwardingRulesCmd; import com.cloud.configuration.ConfigurationManager; import com.cloud.domain.dao.DomainDao; import com.cloud.event.ActionEvent; diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java index 8421a80cb04..b22f2446e6d 100755 --- a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java +++ b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java @@ -36,7 +36,7 @@ import java.util.concurrent.TimeUnit; import javax.ejb.Local; import javax.naming.ConfigurationException; -import org.apache.cloudstack.api.user.securitygroup.command.*; +import org.apache.cloudstack.api.command.user.securitygroup.*; import org.apache.commons.codec.digest.DigestUtils; import org.apache.log4j.Logger; @@ -45,9 +45,8 @@ import com.cloud.agent.api.NetworkRulesSystemVmCommand; import com.cloud.agent.api.SecurityGroupRulesCmd; import com.cloud.agent.api.SecurityGroupRulesCmd.IpPortAndProto; import com.cloud.agent.manager.Commands; -import org.apache.cloudstack.api.user.securitygroup.command.RevokeSecurityGroupEgressCmd; +import org.apache.cloudstack.api.command.user.securitygroup.RevokeSecurityGroupEgressCmd; import com.cloud.api.view.vo.SecurityGroupJoinVO; -import com.cloud.api.view.vo.UserVmJoinVO; import com.cloud.configuration.Config; import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.domain.dao.DomainDao; @@ -75,8 +74,6 @@ import com.cloud.network.security.dao.VmRulesetLogDao; import com.cloud.projects.Project.ListProjectResourcesCriteria; import com.cloud.projects.ProjectManager; import com.cloud.server.ManagementServer; -import com.cloud.server.ResourceTag.TaggedResourceType; -import com.cloud.tags.ResourceTagVO; import com.cloud.tags.dao.ResourceTagDao; import com.cloud.user.Account; import com.cloud.user.AccountManager; @@ -94,7 +91,6 @@ import com.cloud.utils.concurrency.NamedThreadFactory; import com.cloud.utils.db.DB; import com.cloud.utils.db.Filter; import com.cloud.utils.db.GlobalLock; -import com.cloud.utils.db.JoinBuilder; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; diff --git a/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java b/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java index dc08af23f9d..fcac5b7eb92 100644 --- a/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java +++ b/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java @@ -23,10 +23,10 @@ import java.util.Map; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.apache.cloudstack.api.command.user.network.ListNetworkACLsCmd; import org.apache.log4j.Logger; import com.cloud.acl.SecurityChecker.AccessType; -import org.apache.cloudstack.api.user.network.command.ListNetworkACLsCmd; import com.cloud.event.ActionEvent; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; diff --git a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java index 1c60251867f..2309cd3229e 100755 --- a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java +++ b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java @@ -23,7 +23,7 @@ import java.util.Map; import javax.ejb.Local; import javax.naming.ConfigurationException; -import org.apache.cloudstack.api.user.user.command.ListVpnUsersCmd; +import org.apache.cloudstack.api.command.user.user.ListVpnUsersCmd; import org.apache.log4j.Logger; import org.apache.cloudstack.api.user.vpn.command.ListRemoteAccessVpnsCmd; diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java index 10f0ea962c0..59873479eb1 100755 --- a/server/src/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/com/cloud/resource/ResourceManagerImpl.java @@ -30,9 +30,11 @@ import java.util.Set; import javax.ejb.Local; 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.cloudstack.api.command.admin.cluster.AddClusterCmd; +import org.apache.cloudstack.api.command.admin.swift.AddSwiftCmd; +import org.apache.cloudstack.api.command.admin.cluster.DeleteClusterCmd; +import org.apache.cloudstack.api.command.admin.host.*; +import org.apache.cloudstack.api.command.admin.swift.ListSwiftsCmd; import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; @@ -51,13 +53,10 @@ import com.cloud.agent.manager.allocator.PodAllocator; import com.cloud.agent.transport.Request; 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 org.apache.cloudstack.api.admin.host.command.CancelMaintenanceCmd; -import org.apache.cloudstack.api.admin.cluster.command.DeleteClusterCmd; -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 org.apache.cloudstack.api.command.admin.host.AddHostCmd; +import org.apache.cloudstack.api.command.admin.host.CancelMaintenanceCmd; +import org.apache.cloudstack.api.command.admin.host.PrepareForMaintenanceCmd; +import org.apache.cloudstack.api.command.admin.host.UpdateHostCmd; import com.cloud.capacity.Capacity; import com.cloud.capacity.CapacityVO; import com.cloud.capacity.dao.CapacityDao; diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 41727b68dfa..40b88c543fd 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -42,21 +42,27 @@ import java.util.concurrent.TimeUnit; import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; -import org.apache.cloudstack.api.admin.cluster.command.ListClustersCmd; -import org.apache.cloudstack.api.admin.config.command.ListCfgsByCmd; -import org.apache.cloudstack.api.admin.resource.command.ListAlertsCmd; -import org.apache.cloudstack.api.admin.router.command.ListRoutersCmd; -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; -import org.apache.cloudstack.api.user.job.command.ListAsyncJobsCmd; -import org.apache.cloudstack.api.user.offering.command.ListDiskOfferingsCmd; -import org.apache.cloudstack.api.user.offering.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; -import org.apache.cloudstack.api.user.template.command.UpdateTemplateCmd; +import org.apache.cloudstack.api.command.admin.cluster.ListClustersCmd; +import org.apache.cloudstack.api.command.admin.config.ListCfgsByCmd; +import org.apache.cloudstack.api.command.admin.resource.ListAlertsCmd; +import org.apache.cloudstack.api.command.admin.router.ListRoutersCmd; +import org.apache.cloudstack.api.command.admin.storagepool.ListStoragePoolsCmd; +import org.apache.cloudstack.api.command.admin.systemvm.DestroySystemVmCmd; +import org.apache.cloudstack.api.command.admin.systemvm.UpgradeSystemVMCmd; +import org.apache.cloudstack.api.command.user.address.ListPublicIpAddressesCmd; +import org.apache.cloudstack.api.command.user.config.ListCapabilitiesCmd; +import org.apache.cloudstack.api.command.user.guest.ListGuestOsCategoriesCmd; +import org.apache.cloudstack.api.command.user.guest.ListGuestOsCmd; +import org.apache.cloudstack.api.command.user.iso.ListIsosCmd; +import org.apache.cloudstack.api.command.user.iso.UpdateIsoCmd; +import org.apache.cloudstack.api.command.user.job.ListAsyncJobsCmd; +import org.apache.cloudstack.api.command.user.offering.ListDiskOfferingsCmd; +import org.apache.cloudstack.api.command.user.offering.ListServiceOfferingsCmd; +import org.apache.cloudstack.api.command.user.ssh.ListSSHKeyPairsCmd; +import org.apache.cloudstack.api.command.user.ssh.DeleteSSHKeyPairCmd; +import org.apache.cloudstack.api.command.user.ssh.RegisterSSHKeyPairCmd; +import org.apache.cloudstack.api.command.user.template.ListTemplatesCmd; +import org.apache.cloudstack.api.command.user.template.UpdateTemplateCmd; import org.apache.cloudstack.api.user.vmgroup.command.ListVMGroupsCmd; import org.apache.cloudstack.api.user.zone.command.ListZonesByCmd; import org.apache.commons.codec.binary.Base64; @@ -75,28 +81,22 @@ import com.cloud.alert.AlertVO; import com.cloud.alert.dao.AlertDao; import org.apache.cloudstack.api.ApiConstants; import com.cloud.api.ApiDBUtils; -import org.apache.cloudstack.api.user.ssh.command.CreateSSHKeyPairCmd; -import org.apache.cloudstack.api.admin.systemvm.command.DestroySystemVmCmd; +import org.apache.cloudstack.api.command.user.ssh.CreateSSHKeyPairCmd; import org.apache.cloudstack.api.user.volume.command.ExtractVolumeCmd; import org.apache.cloudstack.api.user.vm.command.GetVMPasswordCmd; -import org.apache.cloudstack.api.admin.resource.command.ListCapacityCmd; -import org.apache.cloudstack.api.user.event.command.ListEventsCmd; -import org.apache.cloudstack.api.admin.host.command.ListHostsCmd; -import org.apache.cloudstack.api.admin.pod.command.ListPodsByCmd; -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 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; -import org.apache.cloudstack.api.admin.host.command.UpdateHostPasswordCmd; -import org.apache.cloudstack.api.user.iso.command.UpdateIsoCmd; +import org.apache.cloudstack.api.command.admin.resource.ListCapacityCmd; +import org.apache.cloudstack.api.command.user.event.ListEventsCmd; +import org.apache.cloudstack.api.command.admin.host.ListHostsCmd; +import org.apache.cloudstack.api.command.admin.pod.ListPodsByCmd; +import org.apache.cloudstack.api.command.admin.systemvm.ListSystemVMsCmd; +import org.apache.cloudstack.api.command.admin.vlan.ListVlanIpRangesCmd; +import org.apache.cloudstack.api.command.admin.systemvm.RebootSystemVmCmd; +import org.apache.cloudstack.api.command.admin.systemvm.StopSystemVmCmd; +import org.apache.cloudstack.api.command.admin.domain.UpdateDomainCmd; +import org.apache.cloudstack.api.command.admin.host.UpdateHostPasswordCmd; import com.cloud.api.commands.UpdateTemplateOrIsoCmd; import org.apache.cloudstack.api.user.vmgroup.command.UpdateVMGroupCmd; -import org.apache.cloudstack.api.admin.systemvm.command.UpgradeSystemVMCmd; -import org.apache.cloudstack.api.admin.resource.command.UploadCustomCertificateCmd; +import org.apache.cloudstack.api.command.admin.resource.UploadCustomCertificateCmd; import com.cloud.api.response.ExtractResponse; import com.cloud.api.view.vo.DomainRouterJoinVO; import com.cloud.api.view.vo.EventJoinVO; diff --git a/server/src/com/cloud/server/api/response/ExternalFirewallResponse.java b/server/src/com/cloud/server/api/response/ExternalFirewallResponse.java index 6023ab61cad..a5913cf5e47 100644 --- a/server/src/com/cloud/server/api/response/ExternalFirewallResponse.java +++ b/server/src/com/cloud/server/api/response/ExternalFirewallResponse.java @@ -20,7 +20,7 @@ import org.apache.cloudstack.api.ApiConstants; import com.cloud.utils.IdentityProxy; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; -import org.apache.cloudstack.api.admin.network.response.NetworkDeviceResponse; +import org.apache.cloudstack.api.response.NetworkDeviceResponse; public class ExternalFirewallResponse extends NetworkDeviceResponse { diff --git a/server/src/com/cloud/server/api/response/ExternalLoadBalancerResponse.java b/server/src/com/cloud/server/api/response/ExternalLoadBalancerResponse.java index ed8d8be2605..c5dfa5a6949 100644 --- a/server/src/com/cloud/server/api/response/ExternalLoadBalancerResponse.java +++ b/server/src/com/cloud/server/api/response/ExternalLoadBalancerResponse.java @@ -20,7 +20,7 @@ import org.apache.cloudstack.api.ApiConstants; import com.cloud.utils.IdentityProxy; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; -import org.apache.cloudstack.api.admin.network.response.NetworkDeviceResponse; +import org.apache.cloudstack.api.response.NetworkDeviceResponse; public class ExternalLoadBalancerResponse extends NetworkDeviceResponse { diff --git a/server/src/com/cloud/server/api/response/NwDeviceDhcpResponse.java b/server/src/com/cloud/server/api/response/NwDeviceDhcpResponse.java index d4c0046163b..480107b1b9f 100644 --- a/server/src/com/cloud/server/api/response/NwDeviceDhcpResponse.java +++ b/server/src/com/cloud/server/api/response/NwDeviceDhcpResponse.java @@ -19,7 +19,7 @@ package com.cloud.server.api.response; import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; -import org.apache.cloudstack.api.admin.network.response.NetworkDeviceResponse; +import org.apache.cloudstack.api.response.NetworkDeviceResponse; public class NwDeviceDhcpResponse extends NetworkDeviceResponse { @SerializedName(ApiConstants.ZONE_ID) @Param(description="Zone where to add PXE server") diff --git a/server/src/com/cloud/server/api/response/NwDevicePxeServerResponse.java b/server/src/com/cloud/server/api/response/NwDevicePxeServerResponse.java index df1faec3519..a59e6c2eddf 100644 --- a/server/src/com/cloud/server/api/response/NwDevicePxeServerResponse.java +++ b/server/src/com/cloud/server/api/response/NwDevicePxeServerResponse.java @@ -20,7 +20,7 @@ import org.apache.cloudstack.api.ApiConstants; import com.cloud.utils.IdentityProxy; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; -import org.apache.cloudstack.api.admin.network.response.NetworkDeviceResponse; +import org.apache.cloudstack.api.response.NetworkDeviceResponse; public class NwDevicePxeServerResponse extends NetworkDeviceResponse { diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index 330d41eee9a..a86ec01c09a 100755 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/com/cloud/storage/StorageManagerImpl.java @@ -44,6 +44,7 @@ import java.util.concurrent.TimeUnit; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.apache.cloudstack.api.command.admin.storagepool.*; import org.apache.cloudstack.api.user.volume.command.CreateVolumeCmd; import org.apache.log4j.Logger; @@ -72,11 +73,10 @@ import com.cloud.agent.api.to.VolumeTO; import com.cloud.agent.manager.Commands; import com.cloud.alert.AlertManager; import com.cloud.api.ApiDBUtils; -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.command.admin.storagepool.CancelPrimaryStorageMaintenanceCmd; +import org.apache.cloudstack.api.command.admin.storagepool.CreateStoragePoolCmd; import org.apache.cloudstack.api.user.volume.command.ListVolumesCmd; -import org.apache.cloudstack.api.admin.storagepool.command.UpdateStoragePoolCmd; +import org.apache.cloudstack.api.command.admin.storagepool.UpdateStoragePoolCmd; import org.apache.cloudstack.api.user.volume.command.UploadVolumeCmd; import com.cloud.async.AsyncJobManager; import com.cloud.capacity.Capacity; diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java index d3ca3902813..242125f7f5b 100755 --- a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java +++ b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java @@ -25,7 +25,8 @@ import java.util.TimeZone; import javax.ejb.Local; import javax.naming.ConfigurationException; -import org.apache.cloudstack.api.user.snapshot.command.*; +import org.apache.cloudstack.api.command.user.snapshot.CreateSnapshotPolicyCmd; +import org.apache.cloudstack.api.command.user.snapshot.ListSnapshotsCmd; import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; @@ -40,9 +41,9 @@ import com.cloud.agent.api.ManageSnapshotCommand; import com.cloud.agent.api.downloadSnapshotFromSwiftCommand; import com.cloud.agent.api.to.SwiftTO; import com.cloud.alert.AlertManager; -import org.apache.cloudstack.api.user.snapshot.command.DeleteSnapshotPoliciesCmd; +import org.apache.cloudstack.api.command.user.snapshot.DeleteSnapshotPoliciesCmd; import com.cloud.api.commands.ListRecurringSnapshotScheduleCmd; -import org.apache.cloudstack.api.user.snapshot.command.ListSnapshotPoliciesCmd; +import org.apache.cloudstack.api.command.user.snapshot.ListSnapshotPoliciesCmd; import com.cloud.configuration.Config; import com.cloud.configuration.Resource.ResourceType; import com.cloud.configuration.dao.ConfigurationDao; diff --git a/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java index c42e5fbbeef..d7deb6fa74b 100644 --- a/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java +++ b/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java @@ -26,7 +26,7 @@ import java.util.TimerTask; import javax.ejb.Local; import javax.naming.ConfigurationException; -import org.apache.cloudstack.api.user.snapshot.command.CreateSnapshotCmd; +import org.apache.cloudstack.api.command.user.snapshot.CreateSnapshotCmd; import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; diff --git a/server/src/com/cloud/storage/swift/SwiftManager.java b/server/src/com/cloud/storage/swift/SwiftManager.java index 075c985defa..0dd6e1cf22a 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 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 org.apache.cloudstack.api.command.admin.swift.AddSwiftCmd; +import org.apache.cloudstack.api.command.admin.swift.ListSwiftsCmd; +import org.apache.cloudstack.api.command.user.iso.DeleteIsoCmd; +import org.apache.cloudstack.api.command.user.template.DeleteTemplateCmd; 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 e83d6cbb017..dab16ced985 100644 --- a/server/src/com/cloud/storage/swift/SwiftManagerImpl.java +++ b/server/src/com/cloud/storage/swift/SwiftManagerImpl.java @@ -25,16 +25,16 @@ 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.cloudstack.api.command.admin.swift.ListSwiftsCmd; +import org.apache.cloudstack.api.command.user.iso.DeleteIsoCmd; +import org.apache.cloudstack.api.command.user.template.DeleteTemplateCmd; import org.apache.log4j.Logger; 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 org.apache.cloudstack.api.admin.swift.command.AddSwiftCmd; +import org.apache.cloudstack.api.command.admin.swift.AddSwiftCmd; import com.cloud.configuration.Config; import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.dc.DataCenterVO; diff --git a/server/src/com/cloud/storage/upload/UploadListener.java b/server/src/com/cloud/storage/upload/UploadListener.java index 35bf732c2b1..a2d9f01c8f9 100755 --- a/server/src/com/cloud/storage/upload/UploadListener.java +++ b/server/src/com/cloud/storage/upload/UploadListener.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.Timer; import java.util.TimerTask; -import org.apache.cloudstack.api.user.iso.command.ExtractIsoCmd; +import org.apache.cloudstack.api.command.user.iso.ExtractIsoCmd; import org.apache.cloudstack.api.user.volume.command.ExtractVolumeCmd; import org.apache.log4j.Level; import org.apache.log4j.Logger; @@ -40,7 +40,7 @@ import com.cloud.agent.api.storage.UploadAnswer; import com.cloud.agent.api.storage.UploadCommand; import com.cloud.agent.api.storage.UploadProgressCommand; import com.cloud.agent.api.storage.UploadProgressCommand.RequestType; -import org.apache.cloudstack.api.user.template.command.ExtractTemplateCmd; +import org.apache.cloudstack.api.command.user.template.ExtractTemplateCmd; import com.cloud.api.response.ExtractResponse; import com.cloud.async.AsyncJobManager; import com.cloud.async.AsyncJobResult; diff --git a/server/src/com/cloud/tags/TaggedResourceManagerImpl.java b/server/src/com/cloud/tags/TaggedResourceManagerImpl.java index 966dfbd5764..56240117ee8 100644 --- a/server/src/com/cloud/tags/TaggedResourceManagerImpl.java +++ b/server/src/com/cloud/tags/TaggedResourceManagerImpl.java @@ -24,10 +24,9 @@ import java.util.Map; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.apache.cloudstack.api.command.user.tag.ListTagsCmd; import org.apache.log4j.Logger; -import org.apache.cloudstack.api.user.tag.command.ListTagsCmd; - import com.cloud.api.view.vo.ResourceTagJoinVO; import com.cloud.domain.Domain; import com.cloud.event.ActionEvent; diff --git a/server/src/com/cloud/template/HyervisorTemplateAdapter.java b/server/src/com/cloud/template/HyervisorTemplateAdapter.java index 4d5ee65eac5..c80d1de0fbf 100755 --- a/server/src/com/cloud/template/HyervisorTemplateAdapter.java +++ b/server/src/com/cloud/template/HyervisorTemplateAdapter.java @@ -25,15 +25,15 @@ import java.util.List; import javax.ejb.Local; -import org.apache.cloudstack.api.user.iso.command.DeleteIsoCmd; -import org.apache.cloudstack.api.user.iso.command.RegisterIsoCmd; +import org.apache.cloudstack.api.command.user.iso.DeleteIsoCmd; +import org.apache.cloudstack.api.command.user.iso.RegisterIsoCmd; import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; import com.cloud.agent.api.storage.DeleteTemplateCommand; -import org.apache.cloudstack.api.user.template.command.DeleteTemplateCmd; -import org.apache.cloudstack.api.user.template.command.RegisterTemplateCmd; +import org.apache.cloudstack.api.command.user.template.DeleteTemplateCmd; +import org.apache.cloudstack.api.command.user.template.RegisterTemplateCmd; import com.cloud.configuration.Resource.ResourceType; import com.cloud.dc.DataCenterVO; import com.cloud.event.EventTypes; diff --git a/server/src/com/cloud/template/TemplateAdapter.java b/server/src/com/cloud/template/TemplateAdapter.java index ec6ed46b4cf..a5eb42d1b84 100755 --- a/server/src/com/cloud/template/TemplateAdapter.java +++ b/server/src/com/cloud/template/TemplateAdapter.java @@ -18,10 +18,10 @@ package com.cloud.template; import java.util.Map; -import org.apache.cloudstack.api.user.iso.command.DeleteIsoCmd; -import org.apache.cloudstack.api.user.iso.command.RegisterIsoCmd; -import org.apache.cloudstack.api.user.template.command.DeleteTemplateCmd; -import org.apache.cloudstack.api.user.template.command.RegisterTemplateCmd; +import org.apache.cloudstack.api.command.user.iso.DeleteIsoCmd; +import org.apache.cloudstack.api.command.user.iso.RegisterIsoCmd; +import org.apache.cloudstack.api.command.user.template.DeleteTemplateCmd; +import org.apache.cloudstack.api.command.user.template.RegisterTemplateCmd; import com.cloud.exception.ResourceAllocationException; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.storage.VMTemplateVO; diff --git a/server/src/com/cloud/template/TemplateAdapterBase.java b/server/src/com/cloud/template/TemplateAdapterBase.java index 6ac11976ed9..c938daa9b27 100755 --- a/server/src/com/cloud/template/TemplateAdapterBase.java +++ b/server/src/com/cloud/template/TemplateAdapterBase.java @@ -21,14 +21,14 @@ import java.util.Map; import javax.naming.ConfigurationException; -import org.apache.cloudstack.api.user.iso.command.RegisterIsoCmd; -import org.apache.cloudstack.api.user.template.command.RegisterTemplateCmd; +import org.apache.cloudstack.api.command.user.iso.DeleteIsoCmd; +import org.apache.cloudstack.api.command.user.iso.RegisterIsoCmd; +import org.apache.cloudstack.api.command.user.template.RegisterTemplateCmd; import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; import com.cloud.api.ApiDBUtils; -import org.apache.cloudstack.api.user.iso.command.DeleteIsoCmd; -import org.apache.cloudstack.api.user.template.command.DeleteTemplateCmd; +import org.apache.cloudstack.api.command.user.template.DeleteTemplateCmd; import com.cloud.configuration.Resource.ResourceType; import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.dc.DataCenterVO; diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java index f789e46859c..74da1e23f8c 100755 --- a/server/src/com/cloud/template/TemplateManagerImpl.java +++ b/server/src/com/cloud/template/TemplateManagerImpl.java @@ -34,8 +34,8 @@ import java.util.concurrent.TimeUnit; import javax.ejb.Local; import javax.naming.ConfigurationException; -import org.apache.cloudstack.api.user.iso.command.*; -import org.apache.cloudstack.api.user.template.command.*; +import org.apache.cloudstack.api.command.user.iso.*; +import org.apache.cloudstack.api.command.user.template.*; import org.apache.log4j.Logger; import com.cloud.acl.SecurityChecker.AccessType; @@ -48,8 +48,8 @@ import com.cloud.agent.api.storage.PrimaryStorageDownloadAnswer; import com.cloud.agent.api.storage.PrimaryStorageDownloadCommand; import com.cloud.agent.api.to.SwiftTO; import com.cloud.api.commands.ListTemplateOrIsoPermissionsCmd; -import org.apache.cloudstack.api.user.iso.command.RegisterIsoCmd; -import org.apache.cloudstack.api.user.template.command.RegisterTemplateCmd; +import org.apache.cloudstack.api.command.user.iso.RegisterIsoCmd; +import org.apache.cloudstack.api.command.user.template.RegisterTemplateCmd; import com.cloud.api.commands.UpdateTemplateOrIsoPermissionsCmd; import com.cloud.async.AsyncJobManager; import com.cloud.async.AsyncJobVO; diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java index 980ee3a7ef2..36dc4989132 100755 --- a/server/src/com/cloud/user/AccountManagerImpl.java +++ b/server/src/com/cloud/user/AccountManagerImpl.java @@ -36,8 +36,9 @@ import javax.crypto.spec.SecretKeySpec; import javax.ejb.Local; import javax.naming.ConfigurationException; -import org.apache.cloudstack.api.admin.user.command.ListUsersCmd; -import org.apache.cloudstack.api.admin.user.command.RegisterCmd; +import org.apache.cloudstack.api.command.admin.user.*; +import org.apache.cloudstack.api.command.admin.account.UpdateAccountCmd; +import org.apache.cloudstack.api.command.admin.user.RegisterCmd; import org.apache.commons.codec.binary.Base64; import org.apache.log4j.Logger; @@ -46,10 +47,9 @@ import com.cloud.api.view.vo.ControlledViewEntity; import com.cloud.acl.SecurityChecker; import com.cloud.acl.SecurityChecker.AccessType; import com.cloud.api.ApiDBUtils; -import org.apache.cloudstack.api.admin.user.command.DeleteUserCmd; -import org.apache.cloudstack.api.user.account.command.ListAccountsCmd; -import org.apache.cloudstack.api.admin.account.command.UpdateAccountCmd; -import org.apache.cloudstack.api.admin.user.command.UpdateUserCmd; +import org.apache.cloudstack.api.command.admin.user.DeleteUserCmd; +import org.apache.cloudstack.api.command.user.account.ListAccountsCmd; +import org.apache.cloudstack.api.command.admin.user.UpdateUserCmd; import com.cloud.configuration.Config; import com.cloud.configuration.ConfigurationManager; import com.cloud.configuration.ResourceLimit; diff --git a/server/src/com/cloud/user/DomainManagerImpl.java b/server/src/com/cloud/user/DomainManagerImpl.java index 3e8e226fdaf..123b8951b2e 100644 --- a/server/src/com/cloud/user/DomainManagerImpl.java +++ b/server/src/com/cloud/user/DomainManagerImpl.java @@ -24,10 +24,10 @@ import java.util.Set; import javax.ejb.Local; import javax.naming.ConfigurationException; -import org.apache.cloudstack.api.admin.domain.command.ListDomainChildrenCmd; +import org.apache.cloudstack.api.command.admin.domain.ListDomainChildrenCmd; +import org.apache.cloudstack.api.command.admin.domain.ListDomainsCmd; import org.apache.log4j.Logger; -import org.apache.cloudstack.api.admin.domain.command.ListDomainsCmd; import com.cloud.configuration.ResourceLimit; import com.cloud.configuration.dao.ResourceCountDao; import com.cloud.domain.Domain; diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 5729035a1ff..e04f009e8d5 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -31,7 +31,7 @@ import java.util.concurrent.TimeUnit; import javax.ejb.Local; import javax.naming.ConfigurationException; -import org.apache.cloudstack.api.user.template.command.CreateTemplateCmd; +import org.apache.cloudstack.api.command.user.template.CreateTemplateCmd; import org.apache.cloudstack.api.user.vmgroup.command.DeleteVMGroupCmd; import org.apache.cloudstack.api.user.volume.command.AttachVolumeCmd; import org.apache.cloudstack.api.user.volume.command.DetachVolumeCmd; @@ -62,13 +62,13 @@ import com.cloud.agent.manager.Commands; import com.cloud.alert.AlertManager; import com.cloud.api.ApiDBUtils; import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.admin.vm.command.AssignVMCmd; +import org.apache.cloudstack.api.command.admin.vm.AssignVMCmd; import org.apache.cloudstack.api.user.vmgroup.command.CreateVMGroupCmd; import org.apache.cloudstack.api.user.vm.command.DeployVMCmd; import org.apache.cloudstack.api.user.vm.command.DestroyVMCmd; import org.apache.cloudstack.api.user.vm.command.ListVMsCmd; import org.apache.cloudstack.api.user.vm.command.RebootVMCmd; -import org.apache.cloudstack.api.admin.vm.command.RecoverVMCmd; +import org.apache.cloudstack.api.command.admin.vm.RecoverVMCmd; import org.apache.cloudstack.api.user.vm.command.ResetVMPasswordCmd; import org.apache.cloudstack.api.user.vm.command.RestoreVMCmd; import org.apache.cloudstack.api.user.vm.command.StartVMCmd; @@ -142,7 +142,6 @@ import com.cloud.network.security.SecurityGroupManager; import com.cloud.network.security.dao.SecurityGroupDao; import com.cloud.network.security.dao.SecurityGroupVMMapDao; import com.cloud.network.vpc.VpcManager; -import com.cloud.network.vpc.VpcVO; import com.cloud.network.vpc.dao.VpcDao; import com.cloud.offering.NetworkOffering; import com.cloud.offering.NetworkOffering.Availability; @@ -152,13 +151,10 @@ import com.cloud.offerings.dao.NetworkOfferingDao; import com.cloud.org.Cluster; import com.cloud.org.Grouping; import com.cloud.projects.Project.ListProjectResourcesCriteria; -import com.cloud.projects.Project; -import com.cloud.projects.ProjectInvitationVO; import com.cloud.projects.ProjectManager; import com.cloud.resource.ResourceManager; import com.cloud.resource.ResourceState; import com.cloud.server.Criteria; -import com.cloud.server.ResourceTag.TaggedResourceType; import com.cloud.service.ServiceOfferingVO; import com.cloud.service.dao.ServiceOfferingDao; import com.cloud.storage.DiskOfferingVO; @@ -192,7 +188,6 @@ import com.cloud.storage.dao.VMTemplateZoneDao; import com.cloud.storage.dao.VolumeDao; import com.cloud.storage.dao.VolumeHostDao; import com.cloud.storage.snapshot.SnapshotManager; -import com.cloud.tags.ResourceTagVO; import com.cloud.tags.dao.ResourceTagDao; import com.cloud.template.VirtualMachineTemplate; import com.cloud.template.VirtualMachineTemplate.BootloaderType; @@ -221,7 +216,6 @@ import com.cloud.utils.crypt.RSAHelper; import com.cloud.utils.db.DB; import com.cloud.utils.db.Filter; import com.cloud.utils.db.GlobalLock; -import com.cloud.utils.db.JoinBuilder; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; diff --git a/server/test/com/cloud/network/MockNetworkManagerImpl.java b/server/test/com/cloud/network/MockNetworkManagerImpl.java index 99e491f60b3..bcc9ba2b604 100755 --- a/server/test/com/cloud/network/MockNetworkManagerImpl.java +++ b/server/test/com/cloud/network/MockNetworkManagerImpl.java @@ -25,10 +25,10 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import com.cloud.acl.ControlledEntity.ACLType; -import org.apache.cloudstack.api.admin.usage.command.ListTrafficTypeImplementorsCmd; -import org.apache.cloudstack.api.user.network.command.CreateNetworkCmd; -import org.apache.cloudstack.api.user.network.command.ListNetworksCmd; -import org.apache.cloudstack.api.user.network.command.RestartNetworkCmd; +import org.apache.cloudstack.api.command.admin.usage.ListTrafficTypeImplementorsCmd; +import org.apache.cloudstack.api.command.user.network.CreateNetworkCmd; +import org.apache.cloudstack.api.command.user.network.ListNetworksCmd; +import org.apache.cloudstack.api.command.user.network.RestartNetworkCmd; import com.cloud.dc.DataCenter; import com.cloud.dc.Vlan; import com.cloud.dc.Vlan.VlanType; diff --git a/server/test/com/cloud/user/MockAccountManagerImpl.java b/server/test/com/cloud/user/MockAccountManagerImpl.java index 03e2c1adfd5..2c002fde9be 100644 --- a/server/test/com/cloud/user/MockAccountManagerImpl.java +++ b/server/test/com/cloud/user/MockAccountManagerImpl.java @@ -24,12 +24,12 @@ import javax.naming.ConfigurationException; import com.cloud.acl.ControlledEntity; import com.cloud.acl.SecurityChecker.AccessType; -import org.apache.cloudstack.api.admin.user.command.DeleteUserCmd; -import org.apache.cloudstack.api.admin.user.command.ListUsersCmd; -import org.apache.cloudstack.api.admin.user.command.RegisterCmd; -import org.apache.cloudstack.api.user.account.command.ListAccountsCmd; -import org.apache.cloudstack.api.admin.account.command.UpdateAccountCmd; -import org.apache.cloudstack.api.admin.user.command.UpdateUserCmd; +import org.apache.cloudstack.api.command.admin.user.DeleteUserCmd; +import org.apache.cloudstack.api.command.admin.user.ListUsersCmd; +import org.apache.cloudstack.api.command.admin.user.RegisterCmd; +import org.apache.cloudstack.api.command.user.account.ListAccountsCmd; +import org.apache.cloudstack.api.command.admin.account.UpdateAccountCmd; +import org.apache.cloudstack.api.command.admin.user.UpdateUserCmd; import com.cloud.api.view.vo.ControlledViewEntity; import com.cloud.domain.Domain; import com.cloud.exception.ConcurrentOperationException; diff --git a/server/test/com/cloud/user/MockDomainManagerImpl.java b/server/test/com/cloud/user/MockDomainManagerImpl.java index dc986926d03..6dc4d075b9e 100644 --- a/server/test/com/cloud/user/MockDomainManagerImpl.java +++ b/server/test/com/cloud/user/MockDomainManagerImpl.java @@ -23,8 +23,8 @@ import java.util.Set; import javax.ejb.Local; import javax.naming.ConfigurationException; -import org.apache.cloudstack.api.admin.domain.command.ListDomainChildrenCmd; -import org.apache.cloudstack.api.admin.domain.command.ListDomainsCmd; +import org.apache.cloudstack.api.command.admin.domain.ListDomainChildrenCmd; +import org.apache.cloudstack.api.command.admin.domain.ListDomainsCmd; import com.cloud.domain.Domain; import com.cloud.domain.DomainVO; import com.cloud.exception.PermissionDeniedException; diff --git a/server/test/com/cloud/vm/MockUserVmManagerImpl.java b/server/test/com/cloud/vm/MockUserVmManagerImpl.java index d9360959d6c..074000bc1a3 100644 --- a/server/test/com/cloud/vm/MockUserVmManagerImpl.java +++ b/server/test/com/cloud/vm/MockUserVmManagerImpl.java @@ -28,9 +28,10 @@ import com.cloud.agent.api.VmStatsEntry; import com.cloud.agent.api.to.NicTO; import com.cloud.agent.api.to.VirtualMachineTO; import com.cloud.agent.manager.Commands; -import org.apache.cloudstack.api.admin.vm.command.AssignVMCmd; +import org.apache.cloudstack.api.command.admin.vm.AssignVMCmd; +import org.apache.cloudstack.api.command.admin.vm.RecoverVMCmd; import org.apache.cloudstack.api.user.volume.command.AttachVolumeCmd; -import org.apache.cloudstack.api.user.template.command.CreateTemplateCmd; +import org.apache.cloudstack.api.command.user.template.CreateTemplateCmd; import org.apache.cloudstack.api.user.vmgroup.command.CreateVMGroupCmd; import org.apache.cloudstack.api.user.vmgroup.command.DeleteVMGroupCmd; import org.apache.cloudstack.api.user.vm.command.DeployVMCmd; @@ -38,7 +39,6 @@ import org.apache.cloudstack.api.user.vm.command.DestroyVMCmd; import org.apache.cloudstack.api.user.volume.command.DetachVolumeCmd; import org.apache.cloudstack.api.user.vm.command.ListVMsCmd; import org.apache.cloudstack.api.user.vm.command.RebootVMCmd; -import org.apache.cloudstack.api.admin.vm.command.RecoverVMCmd; import org.apache.cloudstack.api.user.vm.command.ResetVMPasswordCmd; import org.apache.cloudstack.api.user.vm.command.RestoreVMCmd; import org.apache.cloudstack.api.user.vm.command.StartVMCmd; diff --git a/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java b/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java index c303cfb5435..3989ecfd0e3 100644 --- a/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java +++ b/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java @@ -24,26 +24,24 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import javax.naming.NamingException; -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 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 org.apache.cloudstack.api.admin.zone.command.DeleteZoneCmd; -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; -import org.apache.cloudstack.api.admin.network.command.UpdateNetworkOfferingCmd; +import org.apache.cloudstack.api.command.admin.offering.*; +import org.apache.cloudstack.api.command.admin.config.UpdateCfgCmd; +import org.apache.cloudstack.api.command.admin.network.CreateNetworkOfferingCmd; +import org.apache.cloudstack.api.command.admin.offering.CreateServiceOfferingCmd; +import org.apache.cloudstack.api.command.admin.vlan.CreateVlanIpRangeCmd; +import org.apache.cloudstack.api.command.admin.offering.UpdateServiceOfferingCmd; +import org.apache.cloudstack.api.command.admin.pod.UpdatePodCmd; +import org.apache.cloudstack.api.command.admin.vlan.DeleteVlanIpRangeCmd; +import org.apache.cloudstack.api.command.admin.zone.CreateZoneCmd; +import org.apache.cloudstack.api.command.admin.network.DeleteNetworkOfferingCmd; +import org.apache.cloudstack.api.command.admin.pod.DeletePodCmd; +import org.apache.cloudstack.api.command.admin.offering.DeleteServiceOfferingCmd; +import org.apache.cloudstack.api.command.admin.zone.DeleteZoneCmd; +import org.apache.cloudstack.api.command.admin.ldap.LDAPConfigCmd; +import org.apache.cloudstack.api.command.admin.ldap.LDAPRemoveCmd; +import org.apache.cloudstack.api.command.admin.zone.UpdateZoneCmd; +import org.apache.cloudstack.api.command.user.network.ListNetworkOfferingsCmd; +import org.apache.cloudstack.api.command.admin.network.UpdateNetworkOfferingCmd; import com.cloud.configuration.Configuration; import com.cloud.configuration.ConfigurationManager; import com.cloud.configuration.ConfigurationService; diff --git a/server/test/com/cloud/vpc/MockNetworkManagerImpl.java b/server/test/com/cloud/vpc/MockNetworkManagerImpl.java index 8a7866e88cb..adb80f08178 100644 --- a/server/test/com/cloud/vpc/MockNetworkManagerImpl.java +++ b/server/test/com/cloud/vpc/MockNetworkManagerImpl.java @@ -25,13 +25,13 @@ import java.util.Set; import javax.ejb.Local; import javax.naming.ConfigurationException; -import org.apache.cloudstack.api.admin.usage.command.ListTrafficTypeImplementorsCmd; -import org.apache.cloudstack.api.user.network.command.ListNetworksCmd; +import org.apache.cloudstack.api.command.admin.usage.ListTrafficTypeImplementorsCmd; +import org.apache.cloudstack.api.command.user.network.ListNetworksCmd; import org.apache.log4j.Logger; import com.cloud.acl.ControlledEntity.ACLType; -import org.apache.cloudstack.api.user.network.command.CreateNetworkCmd; -import org.apache.cloudstack.api.user.network.command.RestartNetworkCmd; +import org.apache.cloudstack.api.command.user.network.CreateNetworkCmd; +import org.apache.cloudstack.api.command.user.network.RestartNetworkCmd; import com.cloud.dc.DataCenter; import com.cloud.dc.Vlan; import com.cloud.dc.Vlan.VlanType;