From e398b1e47a2558005c66b555e55d62bab2c7e149 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Fri, 7 Dec 2012 19:16:44 -0800 Subject: [PATCH] api: Refactor command and response classes to org.apache.cloudstack.api.* Signed-off-by: Rohit Yadav --- .../api/commands/CreatePrivateNetworkCmd.java | 2 +- .../api/commands/DestroyConsoleProxyCmd.java | 2 +- .../ListRecurringSnapshotScheduleCmd.java | 4 +- .../ListTemplateOrIsoPermissionsCmd.java | 2 +- .../UpdateTemplateOrIsoPermissionsCmd.java | 2 +- .../security/SecurityGroupService.java | 2 +- api/src/com/cloud/network/vpc/VpcService.java | 4 +- .../network/vpn/RemoteAccessVpnService.java | 2 +- .../network/vpn/Site2SiteVpnService.java | 22 +-- .../com/cloud/server/ManagementService.java | 14 +- .../cloud/server/TaggedResourceService.java | 2 +- api/src/com/cloud/storage/StorageService.java | 6 +- api/src/com/cloud/vm/UserVmService.java | 27 ++- .../apache/cloudstack/api/ApiConstants.java | 0 .../apache/cloudstack/api/BaseAsyncCmd.java | 2 +- .../cloudstack/api/BaseAsyncCreateCmd.java | 2 +- .../org/apache/cloudstack/api/BaseCmd.java | 0 .../apache/cloudstack/api/BaseListCmd.java | 0 .../apache/cloudstack/api}/BaseResponse.java | 2 +- api/src/org/apache/cloudstack/api/Entity.java | 2 +- .../apache/cloudstack/api/Implementation.java | 2 - .../cloudstack/api/ResponseGenerator.java | 142 ++++++++-------- .../admin/account/CreateAccountCmd.java | 4 +- .../admin/account/DeleteAccountCmd.java | 2 +- .../admin/account/DisableAccountCmd.java | 2 +- .../admin/account/EnableAccountCmd.java | 2 +- .../command/admin/account/LockAccountCmd.java | 2 +- .../admin/account/UpdateAccountCmd.java | 2 +- .../admin/autoscale/CreateCounterCmd.java | 2 +- .../admin/autoscale/DeleteCounterCmd.java | 2 +- .../command/admin/cluster/AddClusterCmd.java | 4 +- .../admin/cluster/DeleteClusterCmd.java | 2 +- .../admin/cluster/ListClustersCmd.java | 4 +- .../admin/cluster/UpdateClusterCmd.java | 2 +- .../command/admin/config/ListCfgsByCmd.java | 4 +- .../config/ListHypervisorCapabilitiesCmd.java | 4 +- .../command/admin/config/UpdateCfgCmd.java | 2 +- .../UpdateHypervisorCapabilitiesCmd.java | 4 +- .../command/admin/domain/CreateDomainCmd.java | 2 +- .../command/admin/domain/DeleteDomainCmd.java | 2 +- .../admin/domain/ListDomainChildrenCmd.java | 4 +- .../command/admin/domain/ListDomainsCmd.java | 4 +- .../command/admin/domain/UpdateDomainCmd.java | 2 +- .../api/command/admin/host/AddHostCmd.java | 4 +- .../admin/host/AddSecondaryStorageCmd.java | 2 +- .../admin/host/CancelMaintenanceCmd.java | 2 +- .../api/command/admin/host/DeleteHostCmd.java | 2 +- .../api/command/admin/host/ListHostsCmd.java | 4 +- .../admin/host/PrepareForMaintenanceCmd.java | 2 +- .../command/admin/host/ReconnectHostCmd.java | 2 +- .../api/command/admin/host/UpdateHostCmd.java | 2 +- .../admin/host/UpdateHostPasswordCmd.java | 2 +- .../api/command/admin/ldap/LDAPConfigCmd.java | 2 +- .../api/command/admin/ldap/LDAPRemoveCmd.java | 4 +- .../admin/network/AddNetworkDeviceCmd.java | 90 +++++----- .../network/AddNetworkServiceProviderCmd.java | 2 +- .../network/CreateNetworkOfferingCmd.java | 2 +- .../network/CreatePhysicalNetworkCmd.java | 2 +- .../CreateStorageNetworkIpRangeCmd.java | 2 +- .../admin/network/DeleteNetworkDeviceCmd.java | 84 +++++----- .../network/DeleteNetworkOfferingCmd.java | 2 +- .../DeleteNetworkServiceProviderCmd.java | 2 +- .../network/DeletePhysicalNetworkCmd.java | 2 +- .../DeleteStorageNetworkIpRangeCmd.java | 2 +- .../admin/network/ListNetworkDeviceCmd.java | 94 +++++------ .../ListNetworkServiceProvidersCmd.java | 4 +- .../network/ListPhysicalNetworksCmd.java | 4 +- .../network/ListStorageNetworkIpRangeCmd.java | 4 +- .../ListSupportedNetworkServicesCmd.java | 4 +- .../network/UpdateNetworkOfferingCmd.java | 2 +- .../UpdateNetworkServiceProviderCmd.java | 2 +- .../network/UpdatePhysicalNetworkCmd.java | 2 +- .../UpdateStorageNetworkIpRangeCmd.java | 2 +- .../admin/offering/CreateDiskOfferingCmd.java | 2 +- .../offering/CreateServiceOfferingCmd.java | 2 +- .../admin/offering/DeleteDiskOfferingCmd.java | 2 +- .../offering/DeleteServiceOfferingCmd.java | 2 +- .../admin/offering/UpdateDiskOfferingCmd.java | 2 +- .../offering/UpdateServiceOfferingCmd.java | 2 +- .../api/command/admin/pod/CreatePodCmd.java | 2 +- .../api/command/admin/pod/DeletePodCmd.java | 2 +- .../api/command/admin/pod/ListPodsByCmd.java | 4 +- .../api/command/admin/pod/UpdatePodCmd.java | 2 +- .../command/admin/resource/ListAlertsCmd.java | 4 +- .../admin/resource/ListCapacityCmd.java | 4 +- .../resource/UploadCustomCertificateCmd.java | 2 +- .../ConfigureVirtualRouterElementCmd.java | 2 +- .../router/CreateVirtualRouterElementCmd.java | 2 +- .../admin/router/DestroyRouterCmd.java | 2 +- .../command/admin/router/ListRoutersCmd.java | 6 +- .../router/ListVirtualRouterElementsCmd.java | 4 +- .../command/admin/router/RebootRouterCmd.java | 2 +- .../command/admin/router/StartRouterCmd.java | 2 +- .../command/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 | 4 +- ...reparePrimaryStorageForMaintenanceCmd.java | 2 +- .../storagepool/UpdateStoragePoolCmd.java | 2 +- .../api/command/admin/swift/AddSwiftCmd.java | 4 +- .../command/admin/swift/ListSwiftsCmd.java | 6 +- .../admin/systemvm/DestroySystemVmCmd.java | 2 +- .../admin/systemvm/ListSystemVMsCmd.java | 4 +- .../admin/systemvm/MigrateSystemVMCmd.java | 2 +- .../admin/systemvm/RebootSystemVmCmd.java | 2 +- .../admin/systemvm/StartSystemVMCmd.java | 2 +- .../admin/systemvm/StopSystemVmCmd.java | 2 +- .../admin/systemvm/UpgradeSystemVMCmd.java | 4 +- .../admin/template/PrepareTemplateCmd.java | 4 +- .../admin/usage/AddTrafficTypeCmd.java | 2 +- .../admin/usage/DeleteTrafficTypeCmd.java | 2 +- .../usage/ListTrafficTypeImplementorsCmd.java | 4 +- .../admin/usage/ListTrafficTypesCmd.java | 6 +- .../admin/usage/UpdateTrafficTypeCmd.java | 2 +- .../api/command/admin/user/CreateUserCmd.java | 2 +- .../api/command/admin/user/DeleteUserCmd.java | 4 +- .../command/admin/user/DisableUserCmd.java | 2 +- .../api/command/admin/user/EnableUserCmd.java | 2 +- .../api/command/admin/user/GetUserCmd.java | 2 +- .../api/command/admin/user/ListUsersCmd.java | 4 +- .../api/command/admin/user/LockUserCmd.java | 2 +- .../api/command/admin/user/RegisterCmd.java | 2 +- .../api/command/admin/user/UpdateUserCmd.java | 2 +- .../admin/vlan/CreateVlanIpRangeCmd.java | 2 +- .../admin/vlan/DeleteVlanIpRangeCmd.java | 2 +- .../admin/vlan/ListVlanIpRangesCmd.java | 4 +- .../api/command/admin/vm/AssignVMCmd.java | 10 +- .../api/command/admin/vm/MigrateVMCmd.java | 6 +- .../api/command/admin/vm/RecoverVMCmd.java | 2 +- .../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 +- .../api/command/admin/zone/CreateZoneCmd.java | 4 +- .../api/command/admin/zone/DeleteZoneCmd.java | 4 +- .../zone/MarkDefaultZoneForAccountCmd.java | 6 +- .../api/command/admin/zone/UpdateZoneCmd.java | 2 +- .../user/account/AddAccountToProjectCmd.java | 2 +- .../account/DeleteAccountFromProjectCmd.java | 2 +- .../command/user/account/ListAccountsCmd.java | 4 +- .../user/account/ListProjectAccountsCmd.java | 6 +- .../user/address/AssociateIPAddrCmd.java | 2 +- .../user/address/DisassociateIPAddrCmd.java | 2 +- .../address/ListPublicIpAddressesCmd.java | 4 +- .../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 +- .../autoscale/DisableAutoScaleVmGroupCmd.java | 2 +- .../autoscale/EnableAutoScaleVmGroupCmd.java | 2 +- .../autoscale/ListAutoScalePoliciesCmd.java | 4 +- .../autoscale/ListAutoScaleVmGroupsCmd.java | 4 +- .../autoscale/ListAutoScaleVmProfilesCmd.java | 4 +- .../user/autoscale/ListConditionsCmd.java | 6 +- .../user/autoscale/ListCountersCmd.java | 4 +- .../autoscale/UpdateAutoScalePolicyCmd.java | 2 +- .../autoscale/UpdateAutoScaleVmGroupCmd.java | 2 +- .../UpdateAutoScaleVmProfileCmd.java | 2 +- .../user/config/ListCapabilitiesCmd.java | 2 +- .../command/user/event/ListEventTypesCmd.java | 4 +- .../api/command/user/event/ListEventsCmd.java | 6 +- .../user/firewall/CreateFirewallRuleCmd.java | 2 +- .../firewall/CreatePortForwardingRuleCmd.java | 2 +- .../user/firewall/DeleteFirewallRuleCmd.java | 2 +- .../firewall/DeletePortForwardingRuleCmd.java | 2 +- .../user/firewall/ListFirewallRulesCmd.java | 4 +- .../firewall/ListPortForwardingRulesCmd.java | 4 +- .../firewall/UpdatePortForwardingRuleCmd.java | 2 +- .../user/guest/ListGuestOsCategoriesCmd.java | 4 +- .../command/user/guest/ListGuestOsCmd.java | 4 +- .../api/command/user/iso/AttachIsoCmd.java | 4 +- .../api/command/user/iso/DeleteIsoCmd.java | 2 +- .../api/command/user/iso/DetachIsoCmd.java | 4 +- .../api/command/user/iso/ExtractIsoCmd.java | 2 +- .../user/iso/ListIsoPermissionsCmd.java | 20 +-- .../api/command/user/iso/ListIsosCmd.java | 4 +- .../api/command/user/iso/RegisterIsoCmd.java | 4 +- .../api/command/user/iso/UpdateIsoCmd.java | 2 +- .../user/iso/UpdateIsoPermissionsCmd.java | 2 +- .../command/user/job/ListAsyncJobsCmd.java | 4 +- .../user/job/QueryAsyncJobResultCmd.java | 2 +- .../AssignToLoadBalancerRuleCmd.java | 2 +- .../CreateLBStickinessPolicyCmd.java | 2 +- .../CreateLoadBalancerRuleCmd.java | 2 +- .../DeleteLBStickinessPolicyCmd.java | 2 +- .../DeleteLoadBalancerRuleCmd.java | 2 +- .../ListLBStickinessPoliciesCmd.java | 4 +- .../ListLoadBalancerRuleInstancesCmd.java | 4 +- .../ListLoadBalancerRulesCmd.java | 4 +- .../RemoveFromLoadBalancerRuleCmd.java | 2 +- .../UpdateLoadBalancerRuleCmd.java | 2 +- .../user/nat/CreateIpForwardingRuleCmd.java | 4 +- .../user/nat/DeleteIpForwardingRuleCmd.java | 2 +- .../command/user/nat/DisableStaticNatCmd.java | 2 +- .../command/user/nat/EnableStaticNatCmd.java | 2 +- .../user/nat/ListIpForwardingRulesCmd.java | 6 +- .../user/network/CreateNetworkACLCmd.java | 2 +- .../user/network/CreateNetworkCmd.java | 2 +- .../user/network/DeleteNetworkACLCmd.java | 2 +- .../user/network/DeleteNetworkCmd.java | 2 +- .../user/network/ListNetworkACLsCmd.java | 4 +- .../user/network/ListNetworkOfferingsCmd.java | 4 +- .../command/user/network/ListNetworksCmd.java | 4 +- .../user/network/RestartNetworkCmd.java | 4 +- .../user/network/UpdateNetworkCmd.java | 2 +- .../user/offering/ListDiskOfferingsCmd.java | 4 +- .../offering/ListServiceOfferingsCmd.java | 4 +- .../user/project/ActivateProjectCmd.java | 2 +- .../user/project/CreateProjectCmd.java | 2 +- .../user/project/DeleteProjectCmd.java | 2 +- .../project/DeleteProjectInvitationCmd.java | 2 +- .../project/ListProjectInvitationsCmd.java | 4 +- .../command/user/project/ListProjectsCmd.java | 4 +- .../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 | 4 +- .../user/resource/UpdateResourceCountCmd.java | 4 +- .../user/resource/UpdateResourceLimitCmd.java | 2 +- .../AuthorizeSecurityGroupEgressCmd.java | 4 +- .../AuthorizeSecurityGroupIngressCmd.java | 4 +- .../securitygroup/CreateSecurityGroupCmd.java | 2 +- .../securitygroup/DeleteSecurityGroupCmd.java | 2 +- .../securitygroup/ListSecurityGroupsCmd.java | 6 +- .../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 | 4 +- .../user/snapshot/ListSnapshotsCmd.java | 4 +- .../command/user/ssh/CreateSSHKeyPairCmd.java | 2 +- .../command/user/ssh/DeleteSSHKeyPairCmd.java | 2 +- .../command/user/ssh/ListSSHKeyPairsCmd.java | 4 +- .../user/ssh/RegisterSSHKeyPairCmd.java | 2 +- .../api/command/user/tag/CreateTagsCmd.java | 2 +- .../api/command/user/tag/DeleteTagsCmd.java | 2 +- .../api/command/user/tag/ListTagsCmd.java | 8 +- .../user/template/CopyTemplateCmd.java | 2 +- .../user/template/CreateTemplateCmd.java | 4 +- .../user/template/DeleteTemplateCmd.java | 2 +- .../user/template/ExtractTemplateCmd.java | 2 +- .../template/ListTemplatePermissionsCmd.java | 20 +-- .../user/template/ListTemplatesCmd.java | 4 +- .../user/template/RegisterTemplateCmd.java | 4 +- .../user/template/UpdateTemplateCmd.java | 2 +- .../UpdateTemplatePermissionsCmd.java | 2 +- .../api/command/user/user/AddVpnUserCmd.java | 2 +- .../command/user/user/ListVpnUsersCmd.java | 4 +- .../command/user/user/RemoveVpnUserCmd.java | 2 +- .../user/vm}/DeployVMCmd.java | 24 ++- .../user/vm}/DestroyVMCmd.java | 5 +- .../user/vm}/GetVMPasswordCmd.java | 7 +- .../user/vm}/ListVMsCmd.java | 27 ++- .../user/vm}/RebootVMCmd.java | 4 +- .../user/vm}/ResetVMPasswordCmd.java | 4 +- .../user/vm}/RestoreVMCmd.java | 4 +- .../user/vm}/StartVMCmd.java | 6 +- .../user/vm}/StopVMCmd.java | 4 +- .../user/vm}/UpdateVMCmd.java | 6 +- .../user/vm}/UpgradeVMCmd.java | 6 +- .../user/vmgroup}/CreateVMGroupCmd.java | 9 +- .../user/vmgroup}/DeleteVMGroupCmd.java | 7 +- .../user/vmgroup}/ListVMGroupsCmd.java | 6 +- .../user/vmgroup}/UpdateVMGroupCmd.java | 5 +- .../user/volume}/AttachVolumeCmd.java | 4 +- .../user/volume}/CreateVolumeCmd.java | 4 +- .../user/volume}/DeleteVolumeCmd.java | 4 +- .../user/volume}/DetachVolumeCmd.java | 4 +- .../user/volume}/ExtractVolumeCmd.java | 4 +- .../user/volume}/ListVolumesCmd.java | 6 +- .../user/volume}/MigrateVolumeCmd.java | 4 +- .../user/volume}/UploadVolumeCmd.java | 4 +- .../user/vpc}/CreateStaticRouteCmd.java | 4 +- .../user/vpc}/CreateVPCCmd.java | 4 +- .../user/vpc}/DeleteStaticRouteCmd.java | 4 +- .../user/vpc}/DeleteVPCCmd.java | 4 +- .../user/vpc}/ListPrivateGatewaysCmd.java | 6 +- .../user/vpc}/ListStaticRoutesCmd.java | 6 +- .../user/vpc}/ListVPCOfferingsCmd.java | 6 +- .../user/vpc}/ListVPCsCmd.java | 6 +- .../user/vpc}/RestartVPCCmd.java | 6 +- .../user/vpc}/UpdateVPCCmd.java | 4 +- .../user/vpn}/CreateRemoteAccessVpnCmd.java | 4 +- .../user/vpn}/CreateVpnConnectionCmd.java | 4 +- .../vpn}/CreateVpnCustomerGatewayCmd.java | 4 +- .../user/vpn}/CreateVpnGatewayCmd.java | 4 +- .../user/vpn}/DeleteRemoteAccessVpnCmd.java | 4 +- .../user/vpn}/DeleteVpnConnectionCmd.java | 4 +- .../vpn}/DeleteVpnCustomerGatewayCmd.java | 4 +- .../user/vpn}/DeleteVpnGatewayCmd.java | 4 +- .../user/vpn}/ListRemoteAccessVpnsCmd.java | 6 +- .../user/vpn}/ListVpnConnectionsCmd.java | 6 +- .../user/vpn}/ListVpnCustomerGatewaysCmd.java | 6 +- .../user/vpn}/ListVpnGatewaysCmd.java | 6 +- .../user/vpn}/ResetVpnConnectionCmd.java | 4 +- .../vpn}/UpdateVpnCustomerGatewayCmd.java | 4 +- .../user/zone}/ListZonesByCmd.java | 6 +- .../api/response/AccountResponse.java | 3 +- .../api/response/AlertResponse.java | 3 +- .../api/response/AsyncJobResponse.java | 3 +- .../api/response/AutoScalePolicyResponse.java | 3 +- .../response/AutoScaleVmGroupResponse.java | 3 +- .../response/AutoScaleVmProfileResponse.java | 3 +- .../api/response/CapabilitiesResponse.java | 3 +- .../api/response/CapabilityResponse.java | 3 +- .../api/response/CapacityResponse.java | 3 +- .../api/response/CloudIdentifierResponse.java | 3 +- .../api/response/ClusterResponse.java | 3 +- .../api/response/ConditionResponse.java | 3 +- .../api/response/ConfigurationResponse.java | 3 +- .../response/ControlledEntityResponse.java | 2 +- .../ControlledViewEntityResponse.java | 2 +- .../api/response/CounterResponse.java | 3 +- .../api/response/CreateCmdResponse.java | 3 +- .../response/CustomCertificateResponse.java | 15 +- .../api/response/DiskOfferingResponse.java | 3 +- .../api/response/DomainResponse.java | 3 +- .../api/response/DomainRouterResponse.java | 5 +- .../api/response/EventResponse.java | 4 +- .../api/response/EventTypeResponse.java | 3 +- .../api/response/ExceptionResponse.java | 3 +- .../api/response/ExtractResponse.java | 3 +- .../api/response/FirewallResponse.java | 3 +- .../api/response/FirewallRuleResponse.java | 5 +- .../api/response/GetVMPasswordResponse.java | 31 ++-- .../api/response/GuestOSCategoryResponse.java | 3 +- .../api/response/GuestOSResponse.java | 3 +- .../api/response/HostResponse.java | 3 +- .../HypervisorCapabilitiesResponse.java | 3 +- .../api/response/HypervisorResponse.java | 3 +- .../api/response/IPAddressResponse.java | 3 +- .../api/response/InstanceGroupResponse.java | 3 +- .../response/IpForwardingRuleResponse.java | 3 +- .../api/response/IsoVmResponse.java | 3 +- .../response/LBStickinessPolicyResponse.java | 3 +- .../api/response/LBStickinessResponse.java | 3 +- .../api/response/LDAPConfigResponse.java | 3 +- .../api/response/LDAPRemoveResponse.java | 10 +- .../api/response/ListResponse.java | 3 +- .../api/response/LoadBalancerResponse.java | 3 +- .../api/response/NetworkACLResponse.java | 3 +- .../api/response/NetworkDeviceResponse.java | 20 +-- .../api/response/NetworkOfferingResponse.java | 5 +- .../api/response/NetworkResponse.java | 3 +- .../cloudstack}/api/response/NicResponse.java | 3 +- .../api/response/PhysicalNetworkResponse.java | 5 +- .../cloudstack}/api/response/PodResponse.java | 3 +- .../api/response/PrivateGatewayResponse.java | 3 +- .../api/response/ProjectAccountResponse.java | 3 +- .../response/ProjectInvitationResponse.java | 3 +- .../api/response/ProjectResponse.java | 5 +- .../api/response/ProviderResponse.java | 3 +- .../api/response/RegisterResponse.java | 3 +- .../api/response/RemoteAccessVpnResponse.java | 3 +- .../api/response/ResourceCountResponse.java | 3 +- .../api/response/ResourceLimitResponse.java | 3 +- .../api/response/ResourceTagResponse.java | 4 +- .../api/response/SSHKeyPairResponse.java | 3 +- .../api/response/SecurityGroupResponse.java | 6 +- .../response/SecurityGroupRuleResponse.java | 4 +- .../api/response/ServiceOfferingResponse.java | 3 +- .../api/response/ServiceResponse.java | 3 +- .../Site2SiteCustomerGatewayResponse.java | 3 +- .../Site2SiteVpnConnectionResponse.java | 3 +- .../response/Site2SiteVpnGatewayResponse.java | 3 +- .../api/response/SnapshotPolicyResponse.java | 3 +- .../api/response/SnapshotResponse.java | 3 +- .../response/SnapshotScheduleResponse.java | 3 +- .../api/response/StaticRouteResponse.java | 3 +- .../api/response/StatusResponse.java | 3 +- .../StorageNetworkIpRangeResponse.java | 3 +- .../api/response/StoragePoolResponse.java | 3 +- .../api/response/SuccessResponse.java | 27 +-- .../api/response/SwiftResponse.java | 3 +- .../response/SystemVmInstanceResponse.java | 5 +- .../api/response/SystemVmResponse.java | 3 +- .../response/TemplatePermissionsResponse.java | 3 +- .../api/response/TemplateResponse.java | 3 +- .../TrafficTypeImplementorResponse.java | 3 +- .../api/response/TrafficTypeResponse.java | 3 +- .../api/response/UpgradeVmResponse.java | 3 +- .../api/response/UserResponse.java | 3 +- .../api/response/UserVmResponse.java | 4 +- .../VirtualRouterProviderResponse.java | 3 +- .../api/response/VlanIpRangeResponse.java | 3 +- .../api/response/VolumeResponse.java | 3 +- .../api/response/VpcOfferingResponse.java | 5 +- .../cloudstack}/api/response/VpcResponse.java | 3 +- .../api/response/VpnUsersResponse.java | 37 +++-- .../api/response/ZoneResponse.java | 35 ++-- .../api/view/vo/ControlledViewEntity.java | 2 +- .../api/view/vo/DomainRouterJoinVO.java | 2 +- .../cloudstack}/api/view/vo/EventJoinVO.java | 2 +- .../api/view/vo/ResourceTagJoinVO.java | 2 +- .../api/view/vo/SecurityGroupJoinVO.java | 2 +- .../cloudstack}/api/view/vo/UserVmJoinVO.java | 2 +- .../network/ExternalNetworkDeviceManager.java | 12 +- .../api/commands/test/AddHostCmdTest.java | 4 +- .../test/AddSecondaryStorageCmdTest.java | 2 +- .../api/commands/test/AddSwiftCmdTest.java | 2 +- .../api/commands/test/ListRoutersCmdTest.java | 6 +- .../api/commands/test/ListVmsCmdTest.java | 13 +- client/tomcatconf/commands.properties.in | 96 +++++------ .../api/commands/netapp/ListLunsCmd.java | 2 +- .../commands/netapp/ListVolumePoolsCmd.java | 2 +- .../netapp/ListVolumesOnFilerCmd.java | 2 +- .../api/commands/DeleteCiscoNexusVSMCmd.java | 2 +- .../api/commands/ListCiscoNexusVSMsCmd.java | 2 +- .../api/response/CiscoNexusVSMResponse.java | 1 + .../DeleteExternalLoadBalancerCmd.java | 2 +- .../api/commands/DeleteF5LoadBalancerCmd.java | 2 +- .../ListExternalLoadBalancersCmd.java | 4 +- .../ListF5LoadBalancerNetworksCmd.java | 4 +- .../api/commands/ListF5LoadBalancersCmd.java | 2 +- .../api/response/F5LoadBalancerResponse.java | 1 + .../commands/DeleteExternalFirewallCmd.java | 2 +- .../api/commands/DeleteSrxFirewallCmd.java | 2 +- .../commands/ListExternalFirewallsCmd.java | 2 +- .../commands/ListSrxFirewallNetworksCmd.java | 4 +- .../api/commands/ListSrxFirewallsCmd.java | 2 +- .../api/response/SrxFirewallResponse.java | 1 + .../DeleteNetscalerLoadBalancerCmd.java | 2 +- .../ListNetscalerLoadBalancerNetworksCmd.java | 4 +- .../ListNetscalerLoadBalancersCmd.java | 2 +- .../NetscalerLoadBalancerResponse.java | 1 + .../commands/DeleteNiciraNvpDeviceCmd.java | 2 +- .../ListNiciraNvpDeviceNetworksCmd.java | 4 +- .../api/commands/ListNiciraNvpDevicesCmd.java | 2 +- .../api/response/NiciraNvpDeviceResponse.java | 1 + server/src/com/cloud/api/ApiDBUtils.java | 21 ++- .../src/com/cloud/api/ApiResponseHelper.java | 154 +++++++++--------- server/src/com/cloud/api/ApiServer.java | 6 +- .../cloud/api/ResponseObjectTypeAdapter.java | 4 +- .../api/commands/DeleteTrafficMonitorCmd.java | 2 +- .../api/commands/GenerateUsageRecordsCmd.java | 2 +- .../api/commands/GetUsageRecordsCmd.java | 2 +- .../api/commands/ListTrafficMonitorsCmd.java | 2 +- .../cloud/api/commands/ListUsageTypesCmd.java | 2 +- .../com/cloud/api/doc/ApiXmlDocWriter.java | 20 +-- .../api/response/ApiResponseSerializer.java | 4 +- .../com/cloud/async/AsyncJobManagerImpl.java | 2 +- .../baremetal/BareMetalVmManagerImpl.java | 10 +- .../cloud/baremetal/DhcpServerResponse.java | 2 +- .../cloud/baremetal/PxeServerResponse.java | 2 +- .../src/com/cloud/event/dao/EventJoinDao.java | 5 +- .../com/cloud/event/dao/EventJoinDaoImpl.java | 35 +--- .../network/as/AutoScaleManagerImpl.java | 2 +- .../lb/LoadBalancingRulesManagerImpl.java | 2 +- .../security/SecurityGroupManagerImpl.java | 2 +- .../security/dao/SecurityGroupJoinDao.java | 4 +- .../dao/SecurityGroupJoinDaoImpl.java | 32 +--- .../com/cloud/network/vpc/VpcManagerImpl.java | 4 +- .../vpn/RemoteAccessVpnManagerImpl.java | 2 +- .../network/vpn/Site2SiteVpnManagerImpl.java | 22 +-- .../cloud/server/ManagementServerImpl.java | 16 +- .../response/BaremetalTemplateResponse.java | 2 +- .../api/response/TrafficMonitorResponse.java | 2 +- .../api/response/UsageRecordResponse.java | 4 +- .../api/response/UsageTypeResponse.java | 2 +- .../netapp/AssociateLunCmdResponse.java | 2 +- .../response/netapp/CreateLunCmdResponse.java | 2 +- .../CreateVolumeOnFilerCmdResponse.java | 2 +- .../netapp/CreateVolumePoolCmdResponse.java | 2 +- .../response/netapp/DeleteLUNCmdResponse.java | 2 +- .../DeleteVolumeOnFilerCmdResponse.java | 2 +- .../netapp/DeleteVolumePoolCmdResponse.java | 2 +- .../netapp/DissociateLunCmdResponse.java | 2 +- .../response/netapp/ListLunsCmdResponse.java | 2 +- .../netapp/ListVolumePoolsCmdResponse.java | 2 +- .../netapp/ListVolumesOnFilerCmdResponse.java | 2 +- .../netapp/ModifyVolumePoolCmdResponse.java | 2 +- .../com/cloud/storage/StorageManagerImpl.java | 6 +- .../cloud/storage/upload/UploadListener.java | 4 +- .../cloud/tags/TaggedResourceManagerImpl.java | 2 +- .../cloud/tags/dao/ResourceTagJoinDao.java | 5 +- .../tags/dao/ResourceTagJoinDaoImpl.java | 31 +--- server/src/com/cloud/user/AccountManager.java | 5 +- .../com/cloud/user/AccountManagerImpl.java | 2 +- server/src/com/cloud/vm/UserVmManager.java | 2 +- .../src/com/cloud/vm/UserVmManagerImpl.java | 28 ++-- .../com/cloud/vm/dao/DomainRouterJoinDao.java | 4 +- .../cloud/vm/dao/DomainRouterJoinDaoImpl.java | 27 +-- server/src/com/cloud/vm/dao/UserVmData.java | 2 +- .../src/com/cloud/vm/dao/UserVmJoinDao.java | 4 +- .../com/cloud/vm/dao/UserVmJoinDaoImpl.java | 22 +-- .../test/com/cloud/keystore/KeystoreTest.java | 4 +- .../cloud/user/MockAccountManagerImpl.java | 2 +- .../com/cloud/vm/MockUserVmManagerImpl.java | 28 ++-- .../vpc/MockSite2SiteVpnManagerImpl.java | 21 ++- .../com/cloud/vpc/MockVpcManagerImpl.java | 4 +- 501 files changed, 1346 insertions(+), 1397 deletions(-) mode change 100755 => 100644 api/src/org/apache/cloudstack/api/ApiConstants.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/BaseCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/BaseListCmd.java rename api/src/{com/cloud/api/response => org/apache/cloudstack/api}/BaseResponse.java (98%) mode change 100755 => 100644 mode change 100755 => 100644 api/src/org/apache/cloudstack/api/ResponseGenerator.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java mode change 100755 => 100644 api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java rename api/src/org/apache/cloudstack/api/{user/vm/command => command/user/vm}/DeployVMCmd.java (96%) rename api/src/org/apache/cloudstack/api/{user/vm/command => command/user/vm}/DestroyVMCmd.java (96%) rename api/src/org/apache/cloudstack/api/{user/vm/command => command/user/vm}/GetVMPasswordCmd.java (93%) rename api/src/org/apache/cloudstack/api/{user/vm/command => command/user/vm}/ListVMsCmd.java (91%) rename api/src/org/apache/cloudstack/api/{user/vm/command => command/user/vm}/RebootVMCmd.java (97%) rename api/src/org/apache/cloudstack/api/{user/vm/command => command/user/vm}/ResetVMPasswordCmd.java (97%) rename api/src/org/apache/cloudstack/api/{user/vm/command => command/user/vm}/RestoreVMCmd.java (96%) rename api/src/org/apache/cloudstack/api/{user/vm/command => command/user/vm}/StartVMCmd.java (97%) rename api/src/org/apache/cloudstack/api/{user/vm/command => command/user/vm}/StopVMCmd.java (97%) rename api/src/org/apache/cloudstack/api/{user/vm/command => command/user/vm}/UpdateVMCmd.java (96%) rename api/src/org/apache/cloudstack/api/{user/vm/command => command/user/vm}/UpgradeVMCmd.java (96%) rename api/src/org/apache/cloudstack/api/{user/vmgroup/command => command/user/vmgroup}/CreateVMGroupCmd.java (93%) rename api/src/org/apache/cloudstack/api/{user/vmgroup/command => command/user/vmgroup}/DeleteVMGroupCmd.java (93%) rename api/src/org/apache/cloudstack/api/{user/vmgroup/command => command/user/vmgroup}/ListVMGroupsCmd.java (95%) rename api/src/org/apache/cloudstack/api/{user/vmgroup/command => command/user/vmgroup}/UpdateVMGroupCmd.java (95%) rename api/src/org/apache/cloudstack/api/{user/volume/command => command/user/volume}/AttachVolumeCmd.java (97%) mode change 100755 => 100644 rename api/src/org/apache/cloudstack/api/{user/volume/command => command/user/volume}/CreateVolumeCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/volume/command => command/user/volume}/DeleteVolumeCmd.java (96%) rename api/src/org/apache/cloudstack/api/{user/volume/command => command/user/volume}/DetachVolumeCmd.java (97%) mode change 100755 => 100644 rename api/src/org/apache/cloudstack/api/{user/volume/command => command/user/volume}/ExtractVolumeCmd.java (97%) mode change 100755 => 100644 rename api/src/org/apache/cloudstack/api/{user/volume/command => command/user/volume}/ListVolumesCmd.java (96%) mode change 100755 => 100644 rename api/src/org/apache/cloudstack/api/{user/volume/command => command/user/volume}/MigrateVolumeCmd.java (97%) rename api/src/org/apache/cloudstack/api/{user/volume/command => command/user/volume}/UploadVolumeCmd.java (97%) mode change 100755 => 100644 rename api/src/org/apache/cloudstack/api/{user/vpc/command => command/user/vpc}/CreateStaticRouteCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/vpc/command => command/user/vpc}/CreateVPCCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/vpc/command => command/user/vpc}/DeleteStaticRouteCmd.java (97%) rename api/src/org/apache/cloudstack/api/{user/vpc/command => command/user/vpc}/DeleteVPCCmd.java (97%) rename api/src/org/apache/cloudstack/api/{user/vpc/command => command/user/vpc}/ListPrivateGatewaysCmd.java (95%) rename api/src/org/apache/cloudstack/api/{user/vpc/command => command/user/vpc}/ListStaticRoutesCmd.java (95%) rename api/src/org/apache/cloudstack/api/{user/vpc/command => command/user/vpc}/ListVPCOfferingsCmd.java (96%) rename api/src/org/apache/cloudstack/api/{user/vpc/command => command/user/vpc}/ListVPCsCmd.java (97%) rename api/src/org/apache/cloudstack/api/{user/vpc/command => command/user/vpc}/RestartVPCCmd.java (96%) rename api/src/org/apache/cloudstack/api/{user/vpc/command => command/user/vpc}/UpdateVPCCmd.java (97%) rename api/src/org/apache/cloudstack/api/{user/vpn/command => command/user/vpn}/CreateRemoteAccessVpnCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/vpn/command => command/user/vpn}/CreateVpnConnectionCmd.java (97%) rename api/src/org/apache/cloudstack/api/{user/vpn/command => command/user/vpn}/CreateVpnCustomerGatewayCmd.java (97%) rename api/src/org/apache/cloudstack/api/{user/vpn/command => command/user/vpn}/CreateVpnGatewayCmd.java (96%) rename api/src/org/apache/cloudstack/api/{user/vpn/command => command/user/vpn}/DeleteRemoteAccessVpnCmd.java (97%) rename api/src/org/apache/cloudstack/api/{user/vpn/command => command/user/vpn}/DeleteVpnConnectionCmd.java (97%) rename api/src/org/apache/cloudstack/api/{user/vpn/command => command/user/vpn}/DeleteVpnCustomerGatewayCmd.java (96%) rename api/src/org/apache/cloudstack/api/{user/vpn/command => command/user/vpn}/DeleteVpnGatewayCmd.java (96%) rename api/src/org/apache/cloudstack/api/{user/vpn/command => command/user/vpn}/ListRemoteAccessVpnsCmd.java (94%) rename api/src/org/apache/cloudstack/api/{user/vpn/command => command/user/vpn}/ListVpnConnectionsCmd.java (95%) rename api/src/org/apache/cloudstack/api/{user/vpn/command => command/user/vpn}/ListVpnCustomerGatewaysCmd.java (94%) rename api/src/org/apache/cloudstack/api/{user/vpn/command => command/user/vpn}/ListVpnGatewaysCmd.java (95%) rename api/src/org/apache/cloudstack/api/{user/vpn/command => command/user/vpn}/ResetVpnConnectionCmd.java (97%) rename api/src/org/apache/cloudstack/api/{user/vpn/command => command/user/vpn}/UpdateVpnCustomerGatewayCmd.java (98%) rename api/src/org/apache/cloudstack/api/{user/zone/command => command/user/zone}/ListZonesByCmd.java (95%) mode change 100755 => 100644 rename api/src/{com/cloud => org/apache/cloudstack}/api/response/AccountResponse.java (99%) mode change 100755 => 100644 rename api/src/{com/cloud => org/apache/cloudstack}/api/response/AlertResponse.java (96%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/AsyncJobResponse.java (98%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/AutoScalePolicyResponse.java (97%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/AutoScaleVmGroupResponse.java (98%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/AutoScaleVmProfileResponse.java (98%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/CapabilitiesResponse.java (97%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/CapabilityResponse.java (95%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/CapacityResponse.java (97%) mode change 100755 => 100644 rename api/src/{com/cloud => org/apache/cloudstack}/api/response/CloudIdentifierResponse.java (95%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/ClusterResponse.java (97%) mode change 100755 => 100644 rename api/src/{com/cloud => org/apache/cloudstack}/api/response/ConditionResponse.java (97%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/ConfigurationResponse.java (95%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/ControlledEntityResponse.java (96%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/ControlledViewEntityResponse.java (96%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/CounterResponse.java (95%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/CreateCmdResponse.java (93%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/CustomCertificateResponse.java (81%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/DiskOfferingResponse.java (97%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/DomainResponse.java (97%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/DomainRouterResponse.java (99%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/EventResponse.java (97%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/EventTypeResponse.java (93%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/ExceptionResponse.java (96%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/ExtractResponse.java (98%) mode change 100755 => 100644 rename api/src/{com/cloud => org/apache/cloudstack}/api/response/FirewallResponse.java (97%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/FirewallRuleResponse.java (97%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/GetVMPasswordResponse.java (58%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/GuestOSCategoryResponse.java (94%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/GuestOSResponse.java (95%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/HostResponse.java (99%) mode change 100755 => 100644 rename api/src/{com/cloud => org/apache/cloudstack}/api/response/HypervisorCapabilitiesResponse.java (96%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/HypervisorResponse.java (93%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/IPAddressResponse.java (98%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/InstanceGroupResponse.java (97%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/IpForwardingRuleResponse.java (97%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/IsoVmResponse.java (97%) mode change 100755 => 100644 rename api/src/{com/cloud => org/apache/cloudstack}/api/response/LBStickinessPolicyResponse.java (97%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/LBStickinessResponse.java (97%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/LDAPConfigResponse.java (97%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/LDAPRemoveResponse.java (85%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/ListResponse.java (94%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/LoadBalancerResponse.java (98%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/NetworkACLResponse.java (97%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/NetworkOfferingResponse.java (97%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/NetworkResponse.java (99%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/NicResponse.java (97%) mode change 100755 => 100644 rename api/src/{com/cloud => org/apache/cloudstack}/api/response/PhysicalNetworkResponse.java (96%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/PodResponse.java (97%) mode change 100755 => 100644 rename api/src/{com/cloud => org/apache/cloudstack}/api/response/PrivateGatewayResponse.java (98%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/ProjectAccountResponse.java (97%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/ProjectInvitationResponse.java (97%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/ProjectResponse.java (95%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/ProviderResponse.java (97%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/RegisterResponse.java (94%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/RemoteAccessVpnResponse.java (97%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/ResourceCountResponse.java (97%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/ResourceLimitResponse.java (96%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/ResourceTagResponse.java (97%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/SSHKeyPairResponse.java (95%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/SecurityGroupResponse.java (97%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/SecurityGroupRuleResponse.java (97%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/ServiceOfferingResponse.java (98%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/ServiceResponse.java (95%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/Site2SiteCustomerGatewayResponse.java (98%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/Site2SiteVpnConnectionResponse.java (98%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/Site2SiteVpnGatewayResponse.java (97%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/SnapshotPolicyResponse.java (96%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/SnapshotResponse.java (98%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/SnapshotScheduleResponse.java (96%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/StaticRouteResponse.java (97%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/StatusResponse.java (92%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/StorageNetworkIpRangeResponse.java (97%) mode change 100755 => 100644 rename api/src/{com/cloud => org/apache/cloudstack}/api/response/StoragePoolResponse.java (98%) mode change 100755 => 100644 rename api/src/{com/cloud => org/apache/cloudstack}/api/response/SuccessResponse.java (72%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/SwiftResponse.java (96%) mode change 100755 => 100644 rename api/src/{com/cloud => org/apache/cloudstack}/api/response/SystemVmInstanceResponse.java (95%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/SystemVmResponse.java (99%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/TemplatePermissionsResponse.java (96%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/TemplateResponse.java (99%) mode change 100755 => 100644 rename api/src/{com/cloud => org/apache/cloudstack}/api/response/TrafficTypeImplementorResponse.java (94%) mode change 100755 => 100644 rename api/src/{com/cloud => org/apache/cloudstack}/api/response/TrafficTypeResponse.java (97%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/UpgradeVmResponse.java (98%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/UserResponse.java (98%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/UserVmResponse.java (99%) mode change 100755 => 100644 rename api/src/{com/cloud => org/apache/cloudstack}/api/response/VirtualRouterProviderResponse.java (97%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/VlanIpRangeResponse.java (98%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/VolumeResponse.java (99%) mode change 100755 => 100644 rename api/src/{com/cloud => org/apache/cloudstack}/api/response/VpcOfferingResponse.java (94%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/VpcResponse.java (98%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/VpnUsersResponse.java (78%) rename api/src/{com/cloud => org/apache/cloudstack}/api/response/ZoneResponse.java (89%) mode change 100755 => 100644 rename api/src/{com/cloud => org/apache/cloudstack}/api/view/vo/ControlledViewEntity.java (96%) rename api/src/{com/cloud => org/apache/cloudstack}/api/view/vo/DomainRouterJoinVO.java (99%) rename api/src/{com/cloud => org/apache/cloudstack}/api/view/vo/EventJoinVO.java (99%) rename api/src/{com/cloud => org/apache/cloudstack}/api/view/vo/ResourceTagJoinVO.java (99%) rename api/src/{com/cloud => org/apache/cloudstack}/api/view/vo/SecurityGroupJoinVO.java (99%) rename api/src/{com/cloud => org/apache/cloudstack}/api/view/vo/UserVmJoinVO.java (99%) diff --git a/api/src/com/cloud/api/commands/CreatePrivateNetworkCmd.java b/api/src/com/cloud/api/commands/CreatePrivateNetworkCmd.java index 46ab2d29189..7f97f51f75e 100644 --- a/api/src/com/cloud/api/commands/CreatePrivateNetworkCmd.java +++ b/api/src/com/cloud/api/commands/CreatePrivateNetworkCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.NetworkResponse; +import org.apache.cloudstack.api.response.NetworkResponse; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; diff --git a/api/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java b/api/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java index 7e5db636cc2..ef9be6b0598 100644 --- a/api/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java +++ b/api/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.user.Account; import com.cloud.user.UserContext; diff --git a/api/src/com/cloud/api/commands/ListRecurringSnapshotScheduleCmd.java b/api/src/com/cloud/api/commands/ListRecurringSnapshotScheduleCmd.java index 85aa7e84d78..065383fff93 100644 --- a/api/src/com/cloud/api/commands/ListRecurringSnapshotScheduleCmd.java +++ b/api/src/com/cloud/api/commands/ListRecurringSnapshotScheduleCmd.java @@ -23,8 +23,8 @@ import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.SnapshotScheduleResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.SnapshotScheduleResponse; import com.cloud.storage.snapshot.SnapshotSchedule; @Implementation(description="Lists recurring snapshot schedule", responseObject=SnapshotScheduleResponse.class) diff --git a/api/src/com/cloud/api/commands/ListTemplateOrIsoPermissionsCmd.java b/api/src/com/cloud/api/commands/ListTemplateOrIsoPermissionsCmd.java index bbae302522b..031f2437bc2 100644 --- a/api/src/com/cloud/api/commands/ListTemplateOrIsoPermissionsCmd.java +++ b/api/src/com/cloud/api/commands/ListTemplateOrIsoPermissionsCmd.java @@ -25,7 +25,7 @@ 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 com.cloud.api.response.TemplatePermissionsResponse; +import org.apache.cloudstack.api.response.TemplatePermissionsResponse; import com.cloud.template.VirtualMachineTemplate; import com.cloud.user.Account; import com.cloud.user.UserContext; diff --git a/api/src/com/cloud/api/commands/UpdateTemplateOrIsoPermissionsCmd.java b/api/src/com/cloud/api/commands/UpdateTemplateOrIsoPermissionsCmd.java index 94c8d2b252e..f9123006b97 100755 --- a/api/src/com/cloud/api/commands/UpdateTemplateOrIsoPermissionsCmd.java +++ b/api/src/com/cloud/api/commands/UpdateTemplateOrIsoPermissionsCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.exception.InvalidParameterValueException; public abstract class UpdateTemplateOrIsoPermissionsCmd extends BaseCmd { diff --git a/api/src/com/cloud/network/security/SecurityGroupService.java b/api/src/com/cloud/network/security/SecurityGroupService.java index be86efda1bb..dac42505c7d 100644 --- a/api/src/com/cloud/network/security/SecurityGroupService.java +++ b/api/src/com/cloud/network/security/SecurityGroupService.java @@ -23,7 +23,7 @@ import org.apache.cloudstack.api.command.user.securitygroup.AuthorizeSecurityGro import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.PermissionDeniedException; import com.cloud.exception.ResourceInUseException; -import com.cloud.api.view.vo.SecurityGroupJoinVO; +import org.apache.cloudstack.api.view.vo.SecurityGroupJoinVO; import com.cloud.utils.Pair; public interface SecurityGroupService { diff --git a/api/src/com/cloud/network/vpc/VpcService.java b/api/src/com/cloud/network/vpc/VpcService.java index 18e4fa1e371..68e062c7d79 100644 --- a/api/src/com/cloud/network/vpc/VpcService.java +++ b/api/src/com/cloud/network/vpc/VpcService.java @@ -20,8 +20,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.cloudstack.api.user.vpc.command.ListPrivateGatewaysCmd; -import org.apache.cloudstack.api.user.vpc.command.ListStaticRoutesCmd; +import org.apache.cloudstack.api.command.user.vpc.ListPrivateGatewaysCmd; +import org.apache.cloudstack.api.command.user.vpc.ListStaticRoutesCmd; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientAddressCapacityException; import com.cloud.exception.InsufficientCapacityException; diff --git a/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java b/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java index fdc1ee960c5..b5828acbc7e 100644 --- a/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java +++ b/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java @@ -19,7 +19,7 @@ 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.command.user.vpn.ListRemoteAccessVpnsCmd; import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.RemoteAccessVpn; diff --git a/api/src/com/cloud/network/vpn/Site2SiteVpnService.java b/api/src/com/cloud/network/vpn/Site2SiteVpnService.java index 94863cf45f7..7ac567774d8 100644 --- a/api/src/com/cloud/network/vpn/Site2SiteVpnService.java +++ b/api/src/com/cloud/network/vpn/Site2SiteVpnService.java @@ -18,17 +18,17 @@ package com.cloud.network.vpn; import java.util.List; -import org.apache.cloudstack.api.user.vpn.command.CreateVpnConnectionCmd; -import org.apache.cloudstack.api.user.vpn.command.CreateVpnCustomerGatewayCmd; -import org.apache.cloudstack.api.user.vpn.command.CreateVpnGatewayCmd; -import org.apache.cloudstack.api.user.vpn.command.DeleteVpnConnectionCmd; -import org.apache.cloudstack.api.user.vpn.command.DeleteVpnCustomerGatewayCmd; -import org.apache.cloudstack.api.user.vpn.command.DeleteVpnGatewayCmd; -import org.apache.cloudstack.api.user.vpn.command.ListVpnConnectionsCmd; -import org.apache.cloudstack.api.user.vpn.command.ListVpnCustomerGatewaysCmd; -import org.apache.cloudstack.api.user.vpn.command.ListVpnGatewaysCmd; -import org.apache.cloudstack.api.user.vpn.command.ResetVpnConnectionCmd; -import org.apache.cloudstack.api.user.vpn.command.UpdateVpnCustomerGatewayCmd; +import org.apache.cloudstack.api.command.user.vpn.*; +import org.apache.cloudstack.api.command.user.vpn.CreateVpnConnectionCmd; +import org.apache.cloudstack.api.command.user.vpn.CreateVpnCustomerGatewayCmd; +import org.apache.cloudstack.api.command.user.vpn.CreateVpnGatewayCmd; +import org.apache.cloudstack.api.command.user.vpn.DeleteVpnConnectionCmd; +import org.apache.cloudstack.api.command.user.vpn.DeleteVpnCustomerGatewayCmd; +import org.apache.cloudstack.api.command.user.vpn.DeleteVpnGatewayCmd; +import org.apache.cloudstack.api.command.user.vpn.ListVpnConnectionsCmd; +import org.apache.cloudstack.api.command.user.vpn.ListVpnGatewaysCmd; +import org.apache.cloudstack.api.command.user.vpn.ResetVpnConnectionCmd; +import org.apache.cloudstack.api.command.user.vpn.UpdateVpnCustomerGatewayCmd; import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.Site2SiteCustomerGateway; diff --git a/api/src/com/cloud/server/ManagementService.java b/api/src/com/cloud/server/ManagementService.java index 06df410be49..75c042d0dd4 100755 --- a/api/src/com/cloud/server/ManagementService.java +++ b/api/src/com/cloud/server/ManagementService.java @@ -44,26 +44,26 @@ 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.command.user.vm.GetVMPasswordCmd; +import org.apache.cloudstack.api.command.user.volume.ExtractVolumeCmd; import org.apache.cloudstack.api.command.user.template.UpdateTemplateCmd; -import org.apache.cloudstack.api.user.vm.command.GetVMPasswordCmd; 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.user.zone.command.ListZonesByCmd; +import org.apache.cloudstack.api.command.user.vmgroup.ListVMGroupsCmd; +import org.apache.cloudstack.api.command.user.zone.ListZonesByCmd; 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.command.user.vmgroup.UpdateVMGroupCmd; 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 org.apache.cloudstack.api.view.vo.DomainRouterJoinVO; +import org.apache.cloudstack.api.view.vo.EventJoinVO; import com.cloud.async.AsyncJob; import com.cloud.capacity.Capacity; import com.cloud.configuration.Configuration; diff --git a/api/src/com/cloud/server/TaggedResourceService.java b/api/src/com/cloud/server/TaggedResourceService.java index 2549f79587e..f28d9e9828e 100644 --- a/api/src/com/cloud/server/TaggedResourceService.java +++ b/api/src/com/cloud/server/TaggedResourceService.java @@ -21,7 +21,7 @@ import java.util.Map; import org.apache.cloudstack.api.command.user.tag.ListTagsCmd; -import com.cloud.api.view.vo.ResourceTagJoinVO; +import org.apache.cloudstack.api.view.vo.ResourceTagJoinVO; import com.cloud.server.ResourceTag.TaggedResourceType; import com.cloud.utils.Pair; diff --git a/api/src/com/cloud/storage/StorageService.java b/api/src/com/cloud/storage/StorageService.java index a5f9261c2c1..80f64d875d0 100644 --- a/api/src/com/cloud/storage/StorageService.java +++ b/api/src/com/cloud/storage/StorageService.java @@ -23,9 +23,9 @@ import org.apache.cloudstack.api.command.admin.storagepool.CancelPrimaryStorageM 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.user.volume.command.ListVolumesCmd; -import org.apache.cloudstack.api.user.volume.command.UploadVolumeCmd; +import org.apache.cloudstack.api.command.user.volume.CreateVolumeCmd; +import org.apache.cloudstack.api.command.user.volume.ListVolumesCmd; +import org.apache.cloudstack.api.command.user.volume.UploadVolumeCmd; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.PermissionDeniedException; diff --git a/api/src/com/cloud/vm/UserVmService.java b/api/src/com/cloud/vm/UserVmService.java index c926f26775a..bf02c5c3bcc 100755 --- a/api/src/com/cloud/vm/UserVmService.java +++ b/api/src/com/cloud/vm/UserVmService.java @@ -23,21 +23,20 @@ import javax.naming.InsufficientResourcesException; 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.vmgroup.command.CreateVMGroupCmd; -import org.apache.cloudstack.api.user.vmgroup.command.DeleteVMGroupCmd; -import org.apache.cloudstack.api.user.vm.command.DeployVMCmd; -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.command.user.vm.*; +import org.apache.cloudstack.api.command.user.volume.AttachVolumeCmd; +import org.apache.cloudstack.api.command.user.vmgroup.CreateVMGroupCmd; +import org.apache.cloudstack.api.command.user.vmgroup.DeleteVMGroupCmd; +import org.apache.cloudstack.api.command.user.vm.DeployVMCmd; +import org.apache.cloudstack.api.command.user.vm.DestroyVMCmd; +import org.apache.cloudstack.api.command.user.volume.DetachVolumeCmd; +import org.apache.cloudstack.api.command.user.vm.ListVMsCmd; +import org.apache.cloudstack.api.command.user.vm.RebootVMCmd; 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; -import org.apache.cloudstack.api.user.vm.command.UpdateVMCmd; -import org.apache.cloudstack.api.user.vm.command.UpgradeVMCmd; -import com.cloud.api.view.vo.UserVmJoinVO; +import org.apache.cloudstack.api.command.user.vm.ResetVMPasswordCmd; +import org.apache.cloudstack.api.command.user.vm.RestoreVMCmd; +import org.apache.cloudstack.api.command.user.vm.UpgradeVMCmd; +import org.apache.cloudstack.api.view.vo.UserVmJoinVO; import com.cloud.dc.DataCenter; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; diff --git a/api/src/org/apache/cloudstack/api/ApiConstants.java b/api/src/org/apache/cloudstack/api/ApiConstants.java old mode 100755 new mode 100644 diff --git a/api/src/org/apache/cloudstack/api/BaseAsyncCmd.java b/api/src/org/apache/cloudstack/api/BaseAsyncCmd.java index 4bcd9ebc40d..2bc8a6e8002 100644 --- a/api/src/org/apache/cloudstack/api/BaseAsyncCmd.java +++ b/api/src/org/apache/cloudstack/api/BaseAsyncCmd.java @@ -16,7 +16,7 @@ // under the License. package org.apache.cloudstack.api; -import com.cloud.api.response.AsyncJobResponse; +import org.apache.cloudstack.api.response.AsyncJobResponse; import com.cloud.async.AsyncJob; import com.cloud.user.User; import com.cloud.user.UserContext; diff --git a/api/src/org/apache/cloudstack/api/BaseAsyncCreateCmd.java b/api/src/org/apache/cloudstack/api/BaseAsyncCreateCmd.java index 44b05ed4785..63cab8be63b 100644 --- a/api/src/org/apache/cloudstack/api/BaseAsyncCreateCmd.java +++ b/api/src/org/apache/cloudstack/api/BaseAsyncCreateCmd.java @@ -16,7 +16,7 @@ // under the License. package org.apache.cloudstack.api; -import com.cloud.api.response.CreateCmdResponse; +import org.apache.cloudstack.api.response.CreateCmdResponse; import com.cloud.exception.ResourceAllocationException; public abstract class BaseAsyncCreateCmd extends BaseAsyncCmd { diff --git a/api/src/org/apache/cloudstack/api/BaseCmd.java b/api/src/org/apache/cloudstack/api/BaseCmd.java old mode 100755 new mode 100644 diff --git a/api/src/org/apache/cloudstack/api/BaseListCmd.java b/api/src/org/apache/cloudstack/api/BaseListCmd.java old mode 100755 new mode 100644 diff --git a/api/src/com/cloud/api/response/BaseResponse.java b/api/src/org/apache/cloudstack/api/BaseResponse.java old mode 100755 new mode 100644 similarity index 98% rename from api/src/com/cloud/api/response/BaseResponse.java rename to api/src/org/apache/cloudstack/api/BaseResponse.java index dbe84202e39..06171d9d944 --- a/api/src/com/cloud/api/response/BaseResponse.java +++ b/api/src/org/apache/cloudstack/api/BaseResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api; import org.apache.cloudstack.api.ApiConstants; import com.cloud.utils.IdentityProxy; diff --git a/api/src/org/apache/cloudstack/api/Entity.java b/api/src/org/apache/cloudstack/api/Entity.java index 58c27bacc36..f6e6235770d 100644 --- a/api/src/org/apache/cloudstack/api/Entity.java +++ b/api/src/org/apache/cloudstack/api/Entity.java @@ -25,4 +25,4 @@ import java.lang.annotation.RetentionPolicy; @Retention(RetentionPolicy.RUNTIME) public @interface Entity { Class[] value() default {}; -} \ No newline at end of file +} diff --git a/api/src/org/apache/cloudstack/api/Implementation.java b/api/src/org/apache/cloudstack/api/Implementation.java index ec8e867f256..b1c1b774629 100644 --- a/api/src/org/apache/cloudstack/api/Implementation.java +++ b/api/src/org/apache/cloudstack/api/Implementation.java @@ -22,8 +22,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.cloud.api.response.BaseResponse; - @Retention(RetentionPolicy.RUNTIME) @Target({ TYPE }) public @interface Implementation { diff --git a/api/src/org/apache/cloudstack/api/ResponseGenerator.java b/api/src/org/apache/cloudstack/api/ResponseGenerator.java old mode 100755 new mode 100644 index 3578be353df..b0a2fafa33c --- a/api/src/org/apache/cloudstack/api/ResponseGenerator.java +++ b/api/src/org/apache/cloudstack/api/ResponseGenerator.java @@ -23,72 +23,72 @@ import java.util.List; import org.apache.cloudstack.api.ApiConstants.HostDetails; import org.apache.cloudstack.api.ApiConstants.VMDetails; 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; -import com.cloud.api.response.AutoScaleVmGroupResponse; -import com.cloud.api.response.AutoScaleVmProfileResponse; -import com.cloud.api.response.CapacityResponse; -import com.cloud.api.response.ClusterResponse; -import com.cloud.api.response.ConditionResponse; -import com.cloud.api.response.ConfigurationResponse; -import com.cloud.api.response.CounterResponse; -import com.cloud.api.response.CreateCmdResponse; -import com.cloud.api.response.DiskOfferingResponse; -import com.cloud.api.response.DomainResponse; -import com.cloud.api.response.DomainRouterResponse; -import com.cloud.api.response.EventResponse; -import com.cloud.api.response.ExtractResponse; -import com.cloud.api.response.FirewallResponse; -import com.cloud.api.response.FirewallRuleResponse; -import com.cloud.api.response.HostResponse; -import com.cloud.api.response.HypervisorCapabilitiesResponse; -import com.cloud.api.response.IPAddressResponse; -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.LoadBalancerResponse; -import com.cloud.api.response.NetworkACLResponse; -import com.cloud.api.response.NetworkOfferingResponse; -import com.cloud.api.response.NetworkResponse; -import com.cloud.api.response.PhysicalNetworkResponse; -import com.cloud.api.response.PodResponse; -import com.cloud.api.response.PrivateGatewayResponse; -import com.cloud.api.response.ProjectAccountResponse; -import com.cloud.api.response.ProjectInvitationResponse; -import com.cloud.api.response.ProjectResponse; -import com.cloud.api.response.ProviderResponse; -import com.cloud.api.response.RemoteAccessVpnResponse; -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.ServiceOfferingResponse; -import com.cloud.api.response.ServiceResponse; -import com.cloud.api.response.Site2SiteCustomerGatewayResponse; -import com.cloud.api.response.Site2SiteVpnConnectionResponse; -import com.cloud.api.response.Site2SiteVpnGatewayResponse; -import com.cloud.api.response.SnapshotPolicyResponse; -import com.cloud.api.response.SnapshotResponse; -import com.cloud.api.response.StaticRouteResponse; -import com.cloud.api.response.StorageNetworkIpRangeResponse; -import com.cloud.api.response.StoragePoolResponse; -import com.cloud.api.response.SwiftResponse; -import com.cloud.api.response.SystemVmInstanceResponse; -import com.cloud.api.response.SystemVmResponse; -import com.cloud.api.response.TemplatePermissionsResponse; -import com.cloud.api.response.TemplateResponse; -import com.cloud.api.response.TrafficTypeResponse; -import com.cloud.api.response.UserResponse; -import com.cloud.api.response.UserVmResponse; -import com.cloud.api.response.VirtualRouterProviderResponse; -import com.cloud.api.response.VlanIpRangeResponse; -import com.cloud.api.response.VolumeResponse; -import com.cloud.api.response.VpcOfferingResponse; -import com.cloud.api.response.VpcResponse; -import com.cloud.api.response.VpnUsersResponse; -import com.cloud.api.response.ZoneResponse; +import org.apache.cloudstack.api.response.AccountResponse; +import org.apache.cloudstack.api.response.AsyncJobResponse; +import org.apache.cloudstack.api.response.AutoScalePolicyResponse; +import org.apache.cloudstack.api.response.AutoScaleVmGroupResponse; +import org.apache.cloudstack.api.response.AutoScaleVmProfileResponse; +import org.apache.cloudstack.api.response.CapacityResponse; +import org.apache.cloudstack.api.response.ClusterResponse; +import org.apache.cloudstack.api.response.ConditionResponse; +import org.apache.cloudstack.api.response.ConfigurationResponse; +import org.apache.cloudstack.api.response.CounterResponse; +import org.apache.cloudstack.api.response.CreateCmdResponse; +import org.apache.cloudstack.api.response.DiskOfferingResponse; +import org.apache.cloudstack.api.response.DomainResponse; +import org.apache.cloudstack.api.response.DomainRouterResponse; +import org.apache.cloudstack.api.response.EventResponse; +import org.apache.cloudstack.api.response.ExtractResponse; +import org.apache.cloudstack.api.response.FirewallResponse; +import org.apache.cloudstack.api.response.FirewallRuleResponse; +import org.apache.cloudstack.api.response.HostResponse; +import org.apache.cloudstack.api.response.HypervisorCapabilitiesResponse; +import org.apache.cloudstack.api.response.IPAddressResponse; +import org.apache.cloudstack.api.response.InstanceGroupResponse; +import org.apache.cloudstack.api.response.IpForwardingRuleResponse; +import org.apache.cloudstack.api.response.LBStickinessResponse; +import org.apache.cloudstack.api.response.LDAPConfigResponse; +import org.apache.cloudstack.api.response.LoadBalancerResponse; +import org.apache.cloudstack.api.response.NetworkACLResponse; +import org.apache.cloudstack.api.response.NetworkOfferingResponse; +import org.apache.cloudstack.api.response.NetworkResponse; +import org.apache.cloudstack.api.response.PhysicalNetworkResponse; +import org.apache.cloudstack.api.response.PodResponse; +import org.apache.cloudstack.api.response.PrivateGatewayResponse; +import org.apache.cloudstack.api.response.ProjectAccountResponse; +import org.apache.cloudstack.api.response.ProjectInvitationResponse; +import org.apache.cloudstack.api.response.ProjectResponse; +import org.apache.cloudstack.api.response.ProviderResponse; +import org.apache.cloudstack.api.response.RemoteAccessVpnResponse; +import org.apache.cloudstack.api.response.ResourceCountResponse; +import org.apache.cloudstack.api.response.ResourceLimitResponse; +import org.apache.cloudstack.api.response.ResourceTagResponse; +import org.apache.cloudstack.api.response.SecurityGroupResponse; +import org.apache.cloudstack.api.response.ServiceOfferingResponse; +import org.apache.cloudstack.api.response.ServiceResponse; +import org.apache.cloudstack.api.response.Site2SiteCustomerGatewayResponse; +import org.apache.cloudstack.api.response.Site2SiteVpnConnectionResponse; +import org.apache.cloudstack.api.response.Site2SiteVpnGatewayResponse; +import org.apache.cloudstack.api.response.SnapshotPolicyResponse; +import org.apache.cloudstack.api.response.SnapshotResponse; +import org.apache.cloudstack.api.response.StaticRouteResponse; +import org.apache.cloudstack.api.response.StorageNetworkIpRangeResponse; +import org.apache.cloudstack.api.response.StoragePoolResponse; +import org.apache.cloudstack.api.response.SwiftResponse; +import org.apache.cloudstack.api.response.SystemVmInstanceResponse; +import org.apache.cloudstack.api.response.SystemVmResponse; +import org.apache.cloudstack.api.response.TemplatePermissionsResponse; +import org.apache.cloudstack.api.response.TemplateResponse; +import org.apache.cloudstack.api.response.TrafficTypeResponse; +import org.apache.cloudstack.api.response.UserResponse; +import org.apache.cloudstack.api.response.UserVmResponse; +import org.apache.cloudstack.api.response.VirtualRouterProviderResponse; +import org.apache.cloudstack.api.response.VlanIpRangeResponse; +import org.apache.cloudstack.api.response.VolumeResponse; +import org.apache.cloudstack.api.response.VpcOfferingResponse; +import org.apache.cloudstack.api.response.VpcResponse; +import org.apache.cloudstack.api.response.VpnUsersResponse; +import org.apache.cloudstack.api.response.ZoneResponse; import com.cloud.async.AsyncJob; import com.cloud.capacity.Capacity; import com.cloud.configuration.Configuration; @@ -150,11 +150,11 @@ import com.cloud.user.User; import com.cloud.user.UserAccount; import com.cloud.uservm.UserVm; import com.cloud.vm.InstanceGroup; -import com.cloud.api.view.vo.DomainRouterJoinVO; -import com.cloud.api.view.vo.EventJoinVO; -import com.cloud.api.view.vo.ResourceTagJoinVO; -import com.cloud.api.view.vo.SecurityGroupJoinVO; -import com.cloud.api.view.vo.UserVmJoinVO; +import org.apache.cloudstack.api.view.vo.DomainRouterJoinVO; +import org.apache.cloudstack.api.view.vo.EventJoinVO; +import org.apache.cloudstack.api.view.vo.ResourceTagJoinVO; +import org.apache.cloudstack.api.view.vo.SecurityGroupJoinVO; +import org.apache.cloudstack.api.view.vo.UserVmJoinVO; import com.cloud.vm.VirtualMachine; public interface ResponseGenerator { diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java old mode 100755 new mode 100644 index 28187258c28..1d40f9dc056 --- a/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java @@ -27,8 +27,8 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.AccountResponse; -import com.cloud.api.response.UserResponse; +import org.apache.cloudstack.api.response.AccountResponse; +import org.apache.cloudstack.api.response.UserResponse; import com.cloud.user.Account; import com.cloud.user.UserAccount; import com.cloud.user.UserContext; diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java old mode 100755 new mode 100644 index 81e2efde059..66780c8c778 --- a/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java index cf519df5ef7..8666bfe8e0e 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.AccountResponse; +import org.apache.cloudstack.api.response.AccountResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java index 91e24b05237..a8336b11cb8 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.AccountResponse; +import org.apache.cloudstack.api.response.AccountResponse; import com.cloud.user.Account; @Implementation(description="Enables an account", responseObject=AccountResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java index 6f9bea05e53..d088abf8710 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java @@ -23,7 +23,7 @@ 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 com.cloud.api.response.AccountResponse; +import org.apache.cloudstack.api.response.AccountResponse; import com.cloud.user.Account; @Implementation(description="Locks an account", responseObject=AccountResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java old mode 100755 new mode 100644 index 6463265effc..1c61be19c69 --- a/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java @@ -27,7 +27,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.AccountResponse; +import org.apache.cloudstack.api.response.AccountResponse; import com.cloud.user.Account; @Implementation(description="Updates account information for the authenticated user", responseObject=AccountResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java index c97ddca5ba8..c68ed9ff94a 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.CounterResponse; +import org.apache.cloudstack.api.response.CounterResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.network.as.Counter; diff --git a/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java index 750d2abca1f..1e7f70a4f9e 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.ResourceInUseException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java old mode 100755 new mode 100644 index d5e6aee689a..595963e651a --- a/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java @@ -28,8 +28,8 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ClusterResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.ClusterResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.exception.DiscoveryException; import com.cloud.exception.ResourceInUseException; import com.cloud.org.Cluster; diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java old mode 100755 new mode 100644 index 70eeb9a35c6..1a16ebceee1 --- a/api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java b/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java old mode 100755 new mode 100644 index 7a01ba60299..06dba9d827d --- a/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java @@ -27,8 +27,8 @@ import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.ClusterResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.ClusterResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.org.Cluster; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java old mode 100755 new mode 100644 index 81c3114a866..6695db283c8 --- a/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ClusterResponse; +import org.apache.cloudstack.api.response.ClusterResponse; import com.cloud.exception.InvalidParameterValueException; import com.cloud.org.Cluster; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java index ba583e8fd44..c7ef7737b25 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java @@ -25,8 +25,8 @@ import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.ConfigurationResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.ConfigurationResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.configuration.Configuration; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java index d8e2ac55ce0..924e4d4cecd 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java @@ -26,8 +26,8 @@ import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.HypervisorCapabilitiesResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.HypervisorCapabilitiesResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.hypervisor.HypervisorCapabilities; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java index dc25e4dbaa5..ced4b7911ee 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java @@ -23,7 +23,7 @@ import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ConfigurationResponse; +import org.apache.cloudstack.api.response.ConfigurationResponse; import com.cloud.configuration.Configuration; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java index 3f4f234cd0c..9f4e11088be 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java @@ -24,8 +24,8 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.HypervisorCapabilitiesResponse; -import com.cloud.api.response.ServiceOfferingResponse; +import org.apache.cloudstack.api.response.HypervisorCapabilitiesResponse; +import org.apache.cloudstack.api.response.ServiceOfferingResponse; import com.cloud.hypervisor.HypervisorCapabilities; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java b/api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java index c8a653d5273..e789c175c76 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.DomainResponse; +import org.apache.cloudstack.api.response.DomainResponse; import com.cloud.domain.Domain; import com.cloud.user.Account; import com.cloud.user.UserContext; diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java b/api/src/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java index 6b9831b8743..b18cb7420a8 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.domain.Domain; import com.cloud.event.EventTypes; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java b/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java index 553247851a7..d653ccd9b69 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java @@ -26,8 +26,8 @@ import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.DomainResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.DomainResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.domain.Domain; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java index cb7d65a8ec9..45bd236571d 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java @@ -26,8 +26,8 @@ import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.DomainResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.DomainResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.domain.Domain; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java b/api/src/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java index 41070976a30..78535d89876 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.DomainResponse; +import org.apache.cloudstack.api.response.DomainResponse; import com.cloud.domain.Domain; import com.cloud.user.Account; import com.cloud.user.UserContext; diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java old mode 100755 new mode 100644 index e3ac4aaccbc..9b06bdd5656 --- a/api/src/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java @@ -27,8 +27,8 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.HostResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.HostResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.exception.DiscoveryException; import com.cloud.host.Host; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java index 31ab929a72c..39162e965bf 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.HostResponse; +import org.apache.cloudstack.api.response.HostResponse; import com.cloud.exception.DiscoveryException; import com.cloud.host.Host; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java index 74b16d84617..354e9a9d234 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.HostResponse; +import org.apache.cloudstack.api.response.HostResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.host.Host; diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java index cff893d193f..168dcb8e2c4 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.user.Account; @Implementation(description = "Deletes a host.", responseObject = SuccessResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java old mode 100755 new mode 100644 index e163ada2736..7c33c52713c --- a/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java @@ -28,8 +28,8 @@ import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.HostResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.HostResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.async.AsyncJob; import com.cloud.exception.InvalidParameterValueException; import com.cloud.host.Host; diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java index cf4326a00b1..cb728270f91 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.HostResponse; +import org.apache.cloudstack.api.response.HostResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.host.Host; diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java old mode 100755 new mode 100644 index d8f245c676f..b1a95883284 --- a/api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.HostResponse; +import org.apache.cloudstack.api.response.HostResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.host.Host; diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java old mode 100755 new mode 100644 index 07af547e04f..5e0f125066f --- a/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.HostResponse; +import org.apache.cloudstack.api.response.HostResponse; import com.cloud.host.Host; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java index 96cdaaeb88e..c3059236d81 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java @@ -24,7 +24,7 @@ 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 com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.user.Account; @Implementation(description = "Update password of a host/pool on management server.", responseObject = SuccessResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPConfigCmd.java b/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPConfigCmd.java index a84c2c4d2aa..d5e0d2f2175 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPConfigCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPConfigCmd.java @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.LDAPConfigResponse; +import org.apache.cloudstack.api.response.LDAPConfigResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceAllocationException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPRemoveCmd.java b/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPRemoveCmd.java index e4f713f2960..666e1545f7d 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPRemoveCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPRemoveCmd.java @@ -21,8 +21,8 @@ import org.apache.log4j.Logger; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Implementation; -import com.cloud.api.response.LDAPConfigResponse; -import com.cloud.api.response.LDAPRemoveResponse; +import org.apache.cloudstack.api.response.LDAPConfigResponse; +import org.apache.cloudstack.api.response.LDAPRemoveResponse; import com.cloud.user.Account; @Implementation(description="Remove the LDAP context for this site.", responseObject=LDAPConfigResponse.class, since="3.0.1") diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java index 5c0f2ff2bae..111cd8db506 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java @@ -39,57 +39,57 @@ import com.cloud.utils.exception.CloudRuntimeException; @Implementation(description="Adds a network device of one of the following types: ExternalDhcp, ExternalFirewall, ExternalLoadBalancer, PxeServer", responseObject = NetworkDeviceResponse.class) public class AddNetworkDeviceCmd extends BaseCmd { - public static final Logger s_logger = Logger.getLogger(AddNetworkDeviceCmd.class); - private static final String s_name = "addnetworkdeviceresponse"; - - // /////////////////////////////////////////////////// + public static final Logger s_logger = Logger.getLogger(AddNetworkDeviceCmd.class); + private static final String s_name = "addnetworkdeviceresponse"; + + // /////////////////////////////////////////////////// // ////////////// API parameters ///////////////////// // /////////////////////////////////////////////////// - - @Parameter(name = ApiConstants.NETWORK_DEVICE_TYPE, type = CommandType.STRING, description = "Network device type, now supports ExternalDhcp, PxeServer, NetscalerMPXLoadBalancer, NetscalerVPXLoadBalancer, NetscalerSDXLoadBalancer, F5BigIpLoadBalancer, JuniperSRXFirewall") + + @Parameter(name = ApiConstants.NETWORK_DEVICE_TYPE, type = CommandType.STRING, description = "Network device type, now supports ExternalDhcp, PxeServer, NetscalerMPXLoadBalancer, NetscalerVPXLoadBalancer, NetscalerSDXLoadBalancer, F5BigIpLoadBalancer, JuniperSRXFirewall") private String type; - - @Parameter(name = ApiConstants.NETWORK_DEVICE_PARAMETER_LIST, type = CommandType.MAP, description = "parameters for network device") + + @Parameter(name = ApiConstants.NETWORK_DEVICE_PARAMETER_LIST, type = CommandType.MAP, description = "parameters for network device") private Map paramList; - - - public String getDeviceType() { - return type; - } - - public Map getParamList() { - return paramList; - } - - @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, - ResourceAllocationException { - try { - ExternalNetworkDeviceManager nwDeviceMgr; - ComponentLocator locator = ComponentLocator.getLocator(ManagementService.Name); - nwDeviceMgr = locator.getManager(ExternalNetworkDeviceManager.class); - Host device = nwDeviceMgr.addNetworkDevice(this); - NetworkDeviceResponse response = nwDeviceMgr.getApiResponse(device); - response.setObjectName("networkdevice"); - response.setResponseName(getCommandName()); - this.setResponseObject(response); - } catch (InvalidParameterValueException ipve) { - throw new ServerApiException(BaseCmd.PARAM_ERROR, ipve.getMessage()); - } catch (CloudRuntimeException cre) { - throw new ServerApiException(BaseCmd.INTERNAL_ERROR, cre.getMessage()); - } - } - @Override - public String getCommandName() { - return s_name; - } + public String getDeviceType() { + return type; + } - @Override - public long getEntityOwnerId() { - // TODO Auto-generated method stub - return 0; - } + public Map getParamList() { + return paramList; + } + + @Override + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { + try { + ExternalNetworkDeviceManager nwDeviceMgr; + ComponentLocator locator = ComponentLocator.getLocator(ManagementService.Name); + nwDeviceMgr = locator.getManager(ExternalNetworkDeviceManager.class); + Host device = nwDeviceMgr.addNetworkDevice(this); + NetworkDeviceResponse response = nwDeviceMgr.getApiResponse(device); + response.setObjectName("networkdevice"); + response.setResponseName(getCommandName()); + this.setResponseObject(response); + } catch (InvalidParameterValueException ipve) { + throw new ServerApiException(BaseCmd.PARAM_ERROR, ipve.getMessage()); + } catch (CloudRuntimeException cre) { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, cre.getMessage()); + } + + } + + @Override + public String getCommandName() { + return s_name; + } + + @Override + public long getEntityOwnerId() { + // TODO Auto-generated method stub + return 0; + } } diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java index f24e0d70b99..6146a93020e 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java @@ -27,7 +27,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ProviderResponse; +import org.apache.cloudstack.api.response.ProviderResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.ResourceAllocationException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java index c7c4e53e2c2..0c1a2bdfbb6 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java @@ -31,7 +31,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.NetworkOfferingResponse; +import org.apache.cloudstack.api.response.NetworkOfferingResponse; import com.cloud.exception.InvalidParameterValueException; import com.cloud.network.Network.Capability; import com.cloud.network.Network.Service; diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java index 601d0971740..fc9a1662a98 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java @@ -27,7 +27,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.PhysicalNetworkResponse; +import org.apache.cloudstack.api.response.PhysicalNetworkResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.ResourceAllocationException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java old mode 100755 new mode 100644 index 05f68d93393..dda92af8ba0 --- a/api/src/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.StorageNetworkIpRangeResponse; +import org.apache.cloudstack.api.response.StorageNetworkIpRangeResponse; import com.cloud.dc.StorageNetworkIpRange; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java index 0afe40284b0..0a83118f1d1 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java @@ -25,7 +25,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 com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; @@ -37,54 +37,54 @@ import com.cloud.utils.exception.CloudRuntimeException; @Implementation(description="Deletes network device.", responseObject=SuccessResponse.class) public class DeleteNetworkDeviceCmd extends BaseCmd { - public static final Logger s_logger = Logger.getLogger(DeleteNetworkDeviceCmd.class); - private static final String s_name = "deletenetworkdeviceresponse"; - - ///////////////////////////////////////////////////// + public static final Logger s_logger = Logger.getLogger(DeleteNetworkDeviceCmd.class); + private static final String s_name = "deletenetworkdeviceresponse"; + + ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// @IdentityMapper(entityTableName="host") - @Parameter(name = ApiConstants.ID, type = CommandType.LONG, required=true, description = "Id of network device to delete") + @Parameter(name = ApiConstants.ID, type = CommandType.LONG, required=true, description = "Id of network device to delete") private Long id; - - - public Long getId() { - return id; - } - - @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, - ResourceAllocationException { - try { - ExternalNetworkDeviceManager nwDeviceMgr; - ComponentLocator locator = ComponentLocator.getLocator(ManagementService.Name); - nwDeviceMgr = locator.getManager(ExternalNetworkDeviceManager.class); - boolean result = nwDeviceMgr.deleteNetworkDevice(this); - if (result) { - SuccessResponse response = new SuccessResponse(getCommandName()); - response.setResponseName(getCommandName()); - this.setResponseObject(response); - } else { - throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete network device:" + getId()); - } - } catch (InvalidParameterValueException ipve) { - throw new ServerApiException(BaseCmd.PARAM_ERROR, ipve.getMessage()); - } catch (CloudRuntimeException cre) { - throw new ServerApiException(BaseCmd.INTERNAL_ERROR, cre.getMessage()); - } - } - @Override - public String getCommandName() { - return s_name; - } + public Long getId() { + return id; + } - @Override - public long getEntityOwnerId() { - // TODO Auto-generated method stub - return 0; - } + @Override + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { + try { + ExternalNetworkDeviceManager nwDeviceMgr; + ComponentLocator locator = ComponentLocator.getLocator(ManagementService.Name); + nwDeviceMgr = locator.getManager(ExternalNetworkDeviceManager.class); + boolean result = nwDeviceMgr.deleteNetworkDevice(this); + if (result) { + SuccessResponse response = new SuccessResponse(getCommandName()); + response.setResponseName(getCommandName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete network device:" + getId()); + } + } catch (InvalidParameterValueException ipve) { + throw new ServerApiException(BaseCmd.PARAM_ERROR, ipve.getMessage()); + } catch (CloudRuntimeException cre) { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, cre.getMessage()); + } + + } + + @Override + public String getCommandName() { + return s_name; + } + + @Override + public long getEntityOwnerId() { + // TODO Auto-generated method stub + return 0; + } } diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java index cf76044ef0d..8914e016a41 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.user.Account; @Implementation(description="Deletes a network offering.", responseObject=SuccessResponse.class, since="3.0.0") diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java index 1c366953d1f..c44e21f5c6e 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java index a2eaad82141..8f2be210acf 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java old mode 100755 new mode 100644 index cfcd6b43357..def8dacdcde --- a/api/src/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkDeviceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkDeviceCmd.java index 384b59541fb..ebe5ef9b7b5 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkDeviceCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkDeviceCmd.java @@ -30,7 +30,7 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.network.ExternalNetworkDeviceManager; import org.apache.cloudstack.api.response.NetworkDeviceResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; @@ -43,57 +43,57 @@ import com.cloud.utils.exception.CloudRuntimeException; @Implementation(description="List network devices", responseObject = NetworkDeviceResponse.class) public class ListNetworkDeviceCmd extends BaseListCmd { - public static final Logger s_logger = Logger.getLogger(ListNetworkDeviceCmd.class); - private static final String s_name = "listnetworkdevice"; - + public static final Logger s_logger = Logger.getLogger(ListNetworkDeviceCmd.class); + private static final String s_name = "listnetworkdevice"; + ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.NETWORK_DEVICE_TYPE, type = CommandType.STRING, description = "Network device type, now supports ExternalDhcp, PxeServer, NetscalerMPXLoadBalancer, NetscalerVPXLoadBalancer, NetscalerSDXLoadBalancer, F5BigIpLoadBalancer, JuniperSRXFirewall") + @Parameter(name = ApiConstants.NETWORK_DEVICE_TYPE, type = CommandType.STRING, description = "Network device type, now supports ExternalDhcp, PxeServer, NetscalerMPXLoadBalancer, NetscalerVPXLoadBalancer, NetscalerSDXLoadBalancer, F5BigIpLoadBalancer, JuniperSRXFirewall") private String type; - - @Parameter(name = ApiConstants.NETWORK_DEVICE_PARAMETER_LIST, type = CommandType.MAP, description = "parameters for network device") - private Map paramList; - - public String getDeviceType() { - return type; - } - - public Map getParamList() { - return paramList; - } - - @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, - ResourceAllocationException { - try { - ExternalNetworkDeviceManager nwDeviceMgr; - ComponentLocator locator = ComponentLocator.getLocator(ManagementService.Name); - nwDeviceMgr = locator.getManager(ExternalNetworkDeviceManager.class); - List devices = nwDeviceMgr.listNetworkDevice(this); - List nwdeviceResponses = new ArrayList(); - ListResponse listResponse = new ListResponse(); - for (Host d : devices) { - NetworkDeviceResponse response = nwDeviceMgr.getApiResponse(d); - response.setObjectName("networkdevice"); - response.setResponseName(getCommandName()); - nwdeviceResponses.add(response); - } - - listResponse.setResponses(nwdeviceResponses); - listResponse.setResponseName(getCommandName()); - this.setResponseObject(listResponse); - } catch (InvalidParameterValueException ipve) { - throw new ServerApiException(BaseCmd.PARAM_ERROR, ipve.getMessage()); - } catch (CloudRuntimeException cre) { - throw new ServerApiException(BaseCmd.INTERNAL_ERROR, cre.getMessage()); - } - } - @Override - public String getCommandName() { - return s_name; - } + @Parameter(name = ApiConstants.NETWORK_DEVICE_PARAMETER_LIST, type = CommandType.MAP, description = "parameters for network device") + private Map paramList; + + public String getDeviceType() { + return type; + } + + public Map getParamList() { + return paramList; + } + + @Override + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException { + try { + ExternalNetworkDeviceManager nwDeviceMgr; + ComponentLocator locator = ComponentLocator.getLocator(ManagementService.Name); + nwDeviceMgr = locator.getManager(ExternalNetworkDeviceManager.class); + List devices = nwDeviceMgr.listNetworkDevice(this); + List nwdeviceResponses = new ArrayList(); + ListResponse listResponse = new ListResponse(); + for (Host d : devices) { + NetworkDeviceResponse response = nwDeviceMgr.getApiResponse(d); + response.setObjectName("networkdevice"); + response.setResponseName(getCommandName()); + nwdeviceResponses.add(response); + } + + listResponse.setResponses(nwdeviceResponses); + listResponse.setResponseName(getCommandName()); + this.setResponseObject(listResponse); + } catch (InvalidParameterValueException ipve) { + throw new ServerApiException(BaseCmd.PARAM_ERROR, ipve.getMessage()); + } catch (CloudRuntimeException cre) { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, cre.getMessage()); + } + } + + @Override + public String getCommandName() { + return s_name; + } } diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java index 24119156900..c4713784593 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java @@ -26,8 +26,8 @@ import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.ProviderResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.ProviderResponse; import com.cloud.network.PhysicalNetworkServiceProvider; import com.cloud.user.Account; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java index eb2515505b3..099adf80ebc 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java @@ -28,8 +28,8 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.PhysicalNetworkResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.PhysicalNetworkResponse; import com.cloud.network.PhysicalNetwork; import com.cloud.user.Account; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java old mode 100755 new mode 100644 index 4e0e844a434..96c9737682a --- a/api/src/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java @@ -28,8 +28,8 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.StorageNetworkIpRangeResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.StorageNetworkIpRangeResponse; import com.cloud.dc.StorageNetworkIpRange; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java index a422242b6b3..6326bc8d4eb 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java @@ -25,8 +25,8 @@ import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.ServiceResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.ServiceResponse; import com.cloud.exception.InvalidParameterValueException; import com.cloud.network.Network; import com.cloud.network.Network.Service; diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java old mode 100755 new mode 100644 index a3400fb918e..adf52b32bc0 --- a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.NetworkOfferingResponse; +import org.apache.cloudstack.api.response.NetworkOfferingResponse; import com.cloud.offering.NetworkOffering; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java index 2b9c83f44f3..6b642410e11 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java @@ -27,7 +27,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ProviderResponse; +import org.apache.cloudstack.api.response.ProviderResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.network.PhysicalNetworkServiceProvider; diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java index ef224bf93af..fc43d5133c2 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.BaseAsyncCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.PhysicalNetworkResponse; +import org.apache.cloudstack.api.response.PhysicalNetworkResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.network.PhysicalNetwork; diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java old mode 100755 new mode 100644 index 057b1b87cd3..094a908bdf2 --- a/api/src/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.StorageNetworkIpRangeResponse; +import org.apache.cloudstack.api.response.StorageNetworkIpRangeResponse; import com.cloud.dc.StorageNetworkIpRange; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java old mode 100755 new mode 100644 index 915de5d0671..e8496288aee --- a/api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.DiskOfferingResponse; +import org.apache.cloudstack.api.response.DiskOfferingResponse; import com.cloud.offering.DiskOffering; import com.cloud.offering.ServiceOffering; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java index cb439e3c333..020eee4f713 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ServiceOfferingResponse; +import org.apache.cloudstack.api.response.ServiceOfferingResponse; import com.cloud.offering.ServiceOffering; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java index 2cb5307b8dd..7640928aa2d 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.user.Account; @Implementation(description="Updates a disk offering.", responseObject=SuccessResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java index 1ddbf74f933..e58e6316173 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.user.Account; @Implementation(description="Deletes a service offering.", responseObject=SuccessResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java old mode 100755 new mode 100644 index dd69d9bda2f..fbcda617e11 --- a/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java @@ -23,7 +23,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.DiskOfferingResponse; +import org.apache.cloudstack.api.response.DiskOfferingResponse; import com.cloud.offering.DiskOffering; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java old mode 100755 new mode 100644 index 1bb8346881d..fb5d47e7600 --- a/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ServiceOfferingResponse; +import org.apache.cloudstack.api.response.ServiceOfferingResponse; import com.cloud.offering.ServiceOffering; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java b/api/src/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java old mode 100755 new mode 100644 index c735698c77a..f1763b411e8 --- a/api/src/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.PodResponse; +import org.apache.cloudstack.api.response.PodResponse; import com.cloud.dc.Pod; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java b/api/src/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java index 62688f8365c..fcf22df8011 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.user.Account; @Implementation(description="Deletes a Pod.", responseObject=SuccessResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java b/api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java old mode 100755 new mode 100644 index 8b2b731935c..1516c0e5434 --- a/api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java @@ -26,8 +26,8 @@ import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.PodResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.PodResponse; import com.cloud.dc.Pod; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java b/api/src/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java old mode 100755 new mode 100644 index 48afb09232f..30b8a2ffe5f --- a/api/src/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.PodResponse; +import org.apache.cloudstack.api.response.PodResponse; import com.cloud.dc.Pod; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java index db3b55c5ce3..f58744a7c99 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java @@ -27,8 +27,8 @@ import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.AlertResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.AlertResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.utils.Pair; @Implementation(description = "Lists all alerts.", responseObject = AlertResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java b/api/src/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java old mode 100755 new mode 100644 index 9f1b69642f0..bd3634a8a9b --- a/api/src/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java @@ -26,8 +26,8 @@ import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.CapacityResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.CapacityResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.capacity.Capacity; import com.cloud.exception.InvalidParameterValueException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java b/api/src/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java index 09bfd12ba45..6588c0a047c 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.CustomCertificateResponse; +import org.apache.cloudstack.api.response.CustomCertificateResponse; import com.cloud.event.EventTypes; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java index dcf4f6389f3..ca6108c0085 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.PlugService; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.VirtualRouterProviderResponse; +import org.apache.cloudstack.api.response.VirtualRouterProviderResponse; import com.cloud.network.VirtualRouterProvider; import com.cloud.network.element.VirtualRouterElementService; import com.cloud.async.AsyncJob; diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java index 4d8c492bbf7..41990250a15 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.PlugService; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.VirtualRouterProviderResponse; +import org.apache.cloudstack.api.response.VirtualRouterProviderResponse; import com.cloud.event.EventTypes; import com.cloud.exception.ResourceAllocationException; import com.cloud.network.VirtualRouterProvider; diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java index 13e16b540bc..f9a19e1f79a 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.DomainRouterResponse; +import org.apache.cloudstack.api.response.DomainRouterResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java index 1119463c4c3..ca4ad727da0 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java @@ -26,10 +26,10 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.view.vo.DomainRouterJoinVO; +import org.apache.cloudstack.api.view.vo.DomainRouterJoinVO; -import com.cloud.api.response.DomainRouterResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.DomainRouterResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.async.AsyncJob; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java index cfd7db573f1..6528733a98f 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java @@ -29,8 +29,8 @@ import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.PlugService; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.VirtualRouterProviderResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.VirtualRouterProviderResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceAllocationException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java index 74bad42b5ce..d3474e54e73 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.DomainRouterResponse; +import org.apache.cloudstack.api.response.DomainRouterResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java index 0b56068f0d5..37ee33141da 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.DomainRouterResponse; +import org.apache.cloudstack.api.response.DomainRouterResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java index bb300b29808..823453a302c 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.DomainRouterResponse; +import org.apache.cloudstack.api.response.DomainRouterResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java index e941a897852..f5b5fcef4b9 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.DomainRouterResponse; +import org.apache.cloudstack.api.response.DomainRouterResponse; import com.cloud.network.router.VirtualRouter; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/storagepool/CancelPrimaryStorageMaintenanceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storagepool/CancelPrimaryStorageMaintenanceCmd.java index a50db6abeb8..66fe965f0e9 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/storagepool/CancelPrimaryStorageMaintenanceCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storagepool/CancelPrimaryStorageMaintenanceCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.StoragePoolResponse; +import org.apache.cloudstack.api.response.StoragePoolResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.ResourceUnavailableException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/storagepool/CreateStoragePoolCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storagepool/CreateStoragePoolCmd.java index 563e2ae856b..506f766840a 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/storagepool/CreateStoragePoolCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storagepool/CreateStoragePoolCmd.java @@ -27,7 +27,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.StoragePoolResponse; +import org.apache.cloudstack.api.response.StoragePoolResponse; import com.cloud.exception.ResourceInUseException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.storage.StoragePool; diff --git a/api/src/org/apache/cloudstack/api/command/admin/storagepool/DeletePoolCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storagepool/DeletePoolCmd.java index fcabb4ced48..f2ab4d2f66c 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/storagepool/DeletePoolCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storagepool/DeletePoolCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.storage.StoragePool; import com.cloud.storage.StoragePoolStatus; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/storagepool/ListStoragePoolsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storagepool/ListStoragePoolsCmd.java index e96ffd382a3..74ea191795b 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/storagepool/ListStoragePoolsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storagepool/ListStoragePoolsCmd.java @@ -26,8 +26,8 @@ import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.StoragePoolResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.StoragePoolResponse; import com.cloud.async.AsyncJob; import com.cloud.storage.StoragePool; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/admin/storagepool/PreparePrimaryStorageForMaintenanceCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storagepool/PreparePrimaryStorageForMaintenanceCmd.java index eb7aaaeeecb..2b269346b0d 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/storagepool/PreparePrimaryStorageForMaintenanceCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storagepool/PreparePrimaryStorageForMaintenanceCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.StoragePoolResponse; +import org.apache.cloudstack.api.response.StoragePoolResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.InsufficientCapacityException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/storagepool/UpdateStoragePoolCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storagepool/UpdateStoragePoolCmd.java index 3ba7676870c..62aa5da5d5a 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/storagepool/UpdateStoragePoolCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storagepool/UpdateStoragePoolCmd.java @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.StoragePoolResponse; +import org.apache.cloudstack.api.response.StoragePoolResponse; import com.cloud.storage.StoragePool; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java b/api/src/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java index fd3c15424e6..11c8e04868a 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java @@ -23,8 +23,8 @@ import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.HostResponse; -import com.cloud.api.response.SwiftResponse; +import org.apache.cloudstack.api.response.HostResponse; +import org.apache.cloudstack.api.response.SwiftResponse; import com.cloud.exception.DiscoveryException; import com.cloud.storage.Swift; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java index 625054d2247..9121a9f142f 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java @@ -25,9 +25,9 @@ import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.HostResponse; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.SwiftResponse; +import org.apache.cloudstack.api.response.HostResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.SwiftResponse; import com.cloud.storage.Swift; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java index c45922fa3ca..816cbe418d0 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SystemVmResponse; +import org.apache.cloudstack.api.response.SystemVmResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java index 187ca6efc47..279e1a4697c 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java @@ -26,8 +26,8 @@ import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.SystemVmResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.SystemVmResponse; import com.cloud.async.AsyncJob; import com.cloud.utils.Pair; import com.cloud.vm.VirtualMachine; diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java index b1c9587df13..1d20496a376 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SystemVmInstanceResponse; +import org.apache.cloudstack.api.response.SystemVmInstanceResponse; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InvalidParameterValueException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java index ac295cffcf9..97015985fd2 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SystemVmResponse; +import org.apache.cloudstack.api.response.SystemVmResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java index ea3917f8345..9414c641981 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SystemVmResponse; +import org.apache.cloudstack.api.response.SystemVmResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java index 36f22c3d0b2..654ba4fc256 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SystemVmResponse; +import org.apache.cloudstack.api.response.SystemVmResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java index 3a4f97ba0f9..3383c562a3e 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java @@ -16,7 +16,7 @@ // under the License. package org.apache.cloudstack.api.command.admin.systemvm; -import org.apache.cloudstack.api.user.vm.command.UpgradeVMCmd; +import org.apache.cloudstack.api.command.user.vm.UpgradeVMCmd; import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SystemVmResponse; +import org.apache.cloudstack.api.response.SystemVmResponse; import com.cloud.exception.InvalidParameterValueException; import com.cloud.offering.ServiceOffering; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java index 7951a7647a3..cc543c86f7d 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java @@ -25,8 +25,8 @@ 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 com.cloud.api.response.ListResponse; -import com.cloud.api.response.TemplateResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.TemplateResponse; import com.cloud.template.VirtualMachineTemplate; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java index 4c8cefaf31f..25786e08d80 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.TrafficTypeResponse; +import org.apache.cloudstack.api.response.TrafficTypeResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.ResourceAllocationException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java index 56499f32fe0..0f994298a8b 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java old mode 100755 new mode 100644 index 54faadd9ede..b96b7454bd3 --- a/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java @@ -26,8 +26,8 @@ import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.TrafficTypeImplementorResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.TrafficTypeImplementorResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceAllocationException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java old mode 100755 new mode 100644 index 23819dee1a9..e97d1e1527e --- a/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java @@ -26,9 +26,9 @@ import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.ProviderResponse; -import com.cloud.api.response.TrafficTypeResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.ProviderResponse; +import org.apache.cloudstack.api.response.TrafficTypeResponse; import com.cloud.network.PhysicalNetworkTrafficType; import com.cloud.user.Account; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java index de2938f2ae9..389ed09f977 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.TrafficTypeResponse; +import org.apache.cloudstack.api.response.TrafficTypeResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.network.PhysicalNetworkTrafficType; diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java index 0ecefd344c7..e7cd44be04a 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.UserResponse; +import org.apache.cloudstack.api.response.UserResponse; import com.cloud.user.Account; import com.cloud.user.User; import com.cloud.user.UserContext; diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java index 99aafc498c1..ba9cafb32e3 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java @@ -24,8 +24,8 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; -import com.cloud.api.response.UserResponse; +import org.apache.cloudstack.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.UserResponse; import com.cloud.user.Account; import com.cloud.user.User; import com.cloud.user.UserContext; diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java index ab5831bc619..b726b913d2f 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.UserResponse; +import org.apache.cloudstack.api.response.UserResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java index 066eae845f9..0ac28c33089 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.UserResponse; +import org.apache.cloudstack.api.response.UserResponse; import com.cloud.user.Account; import com.cloud.user.User; import com.cloud.user.UserAccount; diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java index 5083a492e57..420de6a290d 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java @@ -22,7 +22,7 @@ import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.UserResponse; +import org.apache.cloudstack.api.response.UserResponse; import com.cloud.exception.InvalidParameterValueException; import com.cloud.user.UserAccount; diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java index 84b85c0141f..c7f0cbbf321 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java @@ -26,8 +26,8 @@ import org.apache.cloudstack.api.BaseListAccountResourcesCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.UserResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.UserResponse; import com.cloud.user.UserAccount; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java index 3eee1da77be..30cfd15650b 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.UserResponse; +import org.apache.cloudstack.api.response.UserResponse; import com.cloud.user.Account; import com.cloud.user.User; import com.cloud.user.UserAccount; diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java index 5a38fdca5f8..becba814bc4 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java @@ -23,7 +23,7 @@ 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 com.cloud.api.response.RegisterResponse; +import org.apache.cloudstack.api.response.RegisterResponse; import com.cloud.user.Account; import com.cloud.user.User; diff --git a/api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java b/api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java index 021a93e23b5..8a6789d34d6 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.UserResponse; +import org.apache.cloudstack.api.response.UserResponse; import com.cloud.user.Account; import com.cloud.user.User; import com.cloud.user.UserAccount; diff --git a/api/src/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java index f50820b1a1e..2ae907b42ed 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.VlanIpRangeResponse; +import org.apache.cloudstack.api.response.VlanIpRangeResponse; import com.cloud.dc.Vlan; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java index 55272a67582..5286152f9cb 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.user.Account; @Implementation(description="Creates a VLAN IP range.", responseObject=SuccessResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java index 3554c4fafd6..6f7186a9187 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java @@ -26,8 +26,8 @@ import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.VlanIpRangeResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.VlanIpRangeResponse; import com.cloud.dc.Vlan; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java index 12647dc01d0..73d9c9dc7c0 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java @@ -19,7 +19,7 @@ package org.apache.cloudstack.api.command.admin.vm; import java.util.List; -import org.apache.cloudstack.api.user.vm.command.DeployVMCmd; +import org.apache.cloudstack.api.command.user.vm.DeployVMCmd; import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; @@ -28,10 +28,10 @@ import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.DomainResponse; -import com.cloud.api.response.NetworkResponse; -import com.cloud.api.response.SecurityGroupResponse; -import com.cloud.api.response.UserVmResponse; +import org.apache.cloudstack.api.response.DomainResponse; +import org.apache.cloudstack.api.response.NetworkResponse; +import org.apache.cloudstack.api.response.SecurityGroupResponse; +import org.apache.cloudstack.api.response.UserVmResponse; import com.cloud.user.Account; import com.cloud.uservm.UserVm; diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java index 011ff7868ca..1d2f87ff5a1 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java @@ -26,9 +26,9 @@ import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.HostResponse; -import com.cloud.api.response.StoragePoolResponse; -import com.cloud.api.response.UserVmResponse; +import org.apache.cloudstack.api.response.HostResponse; +import org.apache.cloudstack.api.response.StoragePoolResponse; +import org.apache.cloudstack.api.response.UserVmResponse; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InvalidParameterValueException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java index c08c30b93be..9e32768c459 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java @@ -23,7 +23,7 @@ import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.UserVmResponse; +import org.apache.cloudstack.api.response.UserVmResponse; import com.cloud.exception.ResourceAllocationException; import com.cloud.user.Account; import com.cloud.uservm.UserVm; diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java index 300ffa09308..800a54c0d35 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.PrivateGatewayResponse; +import org.apache.cloudstack.api.response.PrivateGatewayResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java index c2fcb22a6d7..8e64087e432 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.VpcOfferingResponse; +import org.apache.cloudstack.api.response.VpcOfferingResponse; import com.cloud.event.EventTypes; import com.cloud.exception.ResourceAllocationException; import com.cloud.network.vpc.VpcOffering; diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java index b6a921af249..01576e85ce4 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java index ed91dfea621..6d81f2e80ae 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java index 81affa1386e..0fa03cab189 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.VpcOfferingResponse; +import org.apache.cloudstack.api.response.VpcOfferingResponse; import com.cloud.event.EventTypes; import com.cloud.network.vpc.VpcOffering; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java b/api/src/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java old mode 100755 new mode 100644 index 6b59f936517..c3d8ef9d1b4 --- a/api/src/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java @@ -24,8 +24,8 @@ import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.DomainResponse; -import com.cloud.api.response.ZoneResponse; +import org.apache.cloudstack.api.response.DomainResponse; +import org.apache.cloudstack.api.response.ZoneResponse; import com.cloud.dc.DataCenter; import com.cloud.user.Account; import com.cloud.user.UserContext; diff --git a/api/src/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java b/api/src/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java index c62c5362f5a..fb64a263e7e 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java @@ -23,8 +23,8 @@ import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; -import com.cloud.api.response.ZoneResponse; +import org.apache.cloudstack.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.ZoneResponse; import com.cloud.user.Account; import com.cloud.user.UserContext; diff --git a/api/src/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java index 22ddfbfdaa1..c488d135501 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java @@ -26,9 +26,9 @@ import org.apache.cloudstack.api.ApiConstants; import com.cloud.user.Account; import com.cloud.event.EventTypes; import com.cloud.async.AsyncJob; -import com.cloud.api.response.AccountResponse; -import com.cloud.api.response.DomainResponse; -import com.cloud.api.response.ZoneResponse; +import org.apache.cloudstack.api.response.AccountResponse; +import org.apache.cloudstack.api.response.DomainResponse; +import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.BaseCmd; diff --git a/api/src/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java b/api/src/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java old mode 100755 new mode 100644 index c67607fd34d..20fff448485 --- a/api/src/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ZoneResponse; +import org.apache.cloudstack.api.response.ZoneResponse; import com.cloud.dc.DataCenter; import com.cloud.user.Account; import com.cloud.user.UserContext; diff --git a/api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java index ba94d4d3e28..d0103215a8b 100644 --- a/api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.projects.Project; diff --git a/api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java index 29c247f9968..74e43857c03 100644 --- a/api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.projects.Project; diff --git a/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java b/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java old mode 100755 new mode 100644 index c6d9adb6a35..d4c08f7b5f2 --- a/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java @@ -26,8 +26,8 @@ import org.apache.cloudstack.api.BaseListDomainResourcesCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.AccountResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.AccountResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.user.Account; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java b/api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java index f4850165cc5..b0cdcd94da0 100644 --- a/api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java @@ -26,9 +26,9 @@ import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.ProjectAccountResponse; -import com.cloud.api.response.ProjectResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.ProjectAccountResponse; +import org.apache.cloudstack.api.response.ProjectResponse; import com.cloud.projects.ProjectAccount; import com.cloud.user.Account; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java b/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java index 806a90d504c..594dff56da1 100644 --- a/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java @@ -28,7 +28,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.IPAddressResponse; +import org.apache.cloudstack.api.response.IPAddressResponse; import com.cloud.async.AsyncJob; import com.cloud.dc.DataCenter; import com.cloud.dc.DataCenter.NetworkType; diff --git a/api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java b/api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java index de0a5d894ce..bcdf09d7fd7 100644 --- a/api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.InsufficientAddressCapacityException; diff --git a/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java b/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java index f889a9d3018..fdd19efc738 100644 --- a/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java @@ -26,8 +26,8 @@ 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.IPAddressResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.IPAddressResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.async.AsyncJob; import com.cloud.network.IpAddress; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java index d88fe4f51b4..47549aba6d7 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScalePolicyCmd.java @@ -27,7 +27,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.AutoScalePolicyResponse; +import org.apache.cloudstack.api.response.AutoScalePolicyResponse; import com.cloud.async.AsyncJob; import com.cloud.domain.Domain; import com.cloud.event.EventTypes; diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java index 411458cc472..70ec7d57928 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmGroupCmd.java @@ -27,7 +27,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.AutoScaleVmGroupResponse; +import org.apache.cloudstack.api.response.AutoScaleVmGroupResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java index d152c61122b..6ad4c61a0aa 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java @@ -28,7 +28,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.AutoScaleVmProfileResponse; +import org.apache.cloudstack.api.response.AutoScaleVmProfileResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java index f48653d6efc..fbc610abd59 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/CreateConditionCmd.java @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ConditionResponse; +import org.apache.cloudstack.api.response.ConditionResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.ResourceAllocationException; diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java index d13783b1f8b..33c758cf6fd 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.network.as.AutoScalePolicy; diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java index cb4de7f524d..e78cced0172 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.network.as.AutoScaleVmGroup; diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java index 1d6caf2b3c9..a1ae31bb187 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.network.as.AutoScaleVmProfile; diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java index 43f0fc1cdd5..a300ee553a2 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.ResourceInUseException; diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java index 7552e41182a..fdf5fb45696 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/DisableAutoScaleVmGroupCmd.java @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.AutoScaleVmGroupResponse; +import org.apache.cloudstack.api.response.AutoScaleVmGroupResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.network.as.AutoScaleVmGroup; diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java index 9c63327aad3..cc76e6c3bef 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/EnableAutoScaleVmGroupCmd.java @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.AutoScaleVmGroupResponse; +import org.apache.cloudstack.api.response.AutoScaleVmGroupResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.network.as.AutoScaleVmGroup; diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java index e8bc8318b75..b7df018df91 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java @@ -26,8 +26,8 @@ import org.apache.cloudstack.api.BaseListAccountResourcesCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.AutoScalePolicyResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.AutoScalePolicyResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.network.as.AutoScalePolicy; @Implementation(description = "Lists autoscale policies.", responseObject = AutoScalePolicyResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java index 37d0945a788..63719ac2de8 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java @@ -26,8 +26,8 @@ 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 com.cloud.api.response.AutoScaleVmGroupResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.AutoScaleVmGroupResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.exception.InvalidParameterValueException; import com.cloud.network.as.AutoScaleVmGroup; diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java index e8554d965b7..71459849c84 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java @@ -26,8 +26,8 @@ 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 com.cloud.api.response.AutoScaleVmProfileResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.AutoScaleVmProfileResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.network.as.AutoScaleVmProfile; @Implementation(description = "Lists autoscale vm profiles.", responseObject = AutoScaleVmProfileResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java index be5b17ef16b..7686910cb44 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java @@ -27,9 +27,9 @@ import org.apache.cloudstack.api.BaseListAccountResourcesCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.ConditionResponse; -import com.cloud.api.response.CounterResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.ConditionResponse; +import org.apache.cloudstack.api.response.CounterResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.network.as.Condition; @Implementation(description = "List Conditions for the specific user", responseObject = CounterResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java index abb2fc0504f..47803c54541 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/ListCountersCmd.java @@ -27,8 +27,8 @@ import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.CounterResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.CounterResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.network.as.Counter; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java index 17ee90d6132..918aa8e7c7e 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java @@ -28,7 +28,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.AutoScalePolicyResponse; +import org.apache.cloudstack.api.response.AutoScalePolicyResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.network.as.AutoScalePolicy; diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java index d0f84e50232..ecc86ab4554 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java @@ -28,7 +28,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.AutoScaleVmGroupResponse; +import org.apache.cloudstack.api.response.AutoScaleVmGroupResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.network.as.AutoScaleVmGroup; diff --git a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java index 5f5d808e63f..45911c1bb64 100644 --- a/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java @@ -28,7 +28,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.AutoScaleVmProfileResponse; +import org.apache.cloudstack.api.response.AutoScaleVmProfileResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.network.as.AutoScaleVmProfile; diff --git a/api/src/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java b/api/src/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java index d9f2195d76c..c72e8a03b2c 100644 --- a/api/src/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java @@ -22,7 +22,7 @@ import org.apache.log4j.Logger; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Implementation; -import com.cloud.api.response.CapabilitiesResponse; +import org.apache.cloudstack.api.response.CapabilitiesResponse; import com.cloud.user.Account; @Implementation(description="Lists capabilities", responseObject=CapabilitiesResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java b/api/src/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java index 2828b32a82b..42520d4a026 100644 --- a/api/src/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java @@ -22,8 +22,8 @@ import org.apache.log4j.Logger; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Implementation; -import com.cloud.api.response.EventTypeResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.EventTypeResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.user.Account; @Implementation(description = "List Event Types", responseObject = EventTypeResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java b/api/src/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java old mode 100755 new mode 100644 index 769c97e17ac..42b08d4be08 --- a/api/src/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java @@ -26,9 +26,9 @@ 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 com.cloud.api.response.EventResponse; -import com.cloud.api.response.ListResponse; -import com.cloud.api.view.vo.EventJoinVO; +import org.apache.cloudstack.api.response.EventResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.view.vo.EventJoinVO; import com.cloud.utils.Pair; @Implementation(description="A command to list events.", responseObject=EventResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java index 4daf3f6ae75..89fd14c3f16 100644 --- a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java @@ -29,7 +29,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.FirewallResponse; +import org.apache.cloudstack.api.response.FirewallResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java index 97ec651cd4c..4389e8e6b68 100644 --- a/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java @@ -28,7 +28,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.FirewallRuleResponse; +import org.apache.cloudstack.api.response.FirewallRuleResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java index 6f714b078db..e23f8384a24 100644 --- a/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java index 10b5f27fa29..e993c55804c 100644 --- a/api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java index 20c908b8175..cf9a3ed95b6 100644 --- a/api/src/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java @@ -26,8 +26,8 @@ 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.FirewallResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.FirewallResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.network.rules.FirewallRule; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java index 930133d00c2..b752b305c12 100644 --- a/api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java @@ -26,8 +26,8 @@ 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.FirewallRuleResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.FirewallRuleResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.network.rules.PortForwardingRule; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java index d7599c65993..135455219ad 100644 --- a/api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java @@ -23,7 +23,7 @@ import org.apache.cloudstack.api.BaseAsyncCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.FirewallRuleResponse; +import org.apache.cloudstack.api.response.FirewallRuleResponse; import com.cloud.event.EventTypes; import com.cloud.network.IpAddress; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java b/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java index 6a8d00bfc84..06c2208b06f 100644 --- a/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java @@ -27,8 +27,8 @@ import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.GuestOSCategoryResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.GuestOSCategoryResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.storage.GuestOsCategory; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java b/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java index 1bed7cabe2e..7a43f2bda7d 100644 --- a/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java @@ -27,8 +27,8 @@ import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.GuestOSResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.GuestOSResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.storage.GuestOS; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java old mode 100755 new mode 100644 index 8fdfb3dbee8..d2026ea49db --- a/api/src/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/iso/AttachIsoCmd.java @@ -16,7 +16,7 @@ // under the License. package org.apache.cloudstack.api.command.user.iso; -import org.apache.cloudstack.api.user.vm.command.DeployVMCmd; +import org.apache.cloudstack.api.command.user.vm.DeployVMCmd; import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.UserVmResponse; +import org.apache.cloudstack.api.response.UserVmResponse; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.user.UserContext; diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java old mode 100755 new mode 100644 index b3c47202bc3..3d6122e6c27 --- a/api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.template.VirtualMachineTemplate; diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java old mode 100755 new mode 100644 index 58c6bc4959b..36555f290c8 --- a/api/src/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/iso/DetachIsoCmd.java @@ -16,7 +16,7 @@ // under the License. package org.apache.cloudstack.api.command.user.iso; -import org.apache.cloudstack.api.user.vm.command.DeployVMCmd; +import org.apache.cloudstack.api.command.user.vm.DeployVMCmd; import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.UserVmResponse; +import org.apache.cloudstack.api.response.UserVmResponse; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.uservm.UserVm; diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java old mode 100755 new mode 100644 index ac595503225..1fbb7e83710 --- a/api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ExtractResponse; +import org.apache.cloudstack.api.response.ExtractResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.InternalErrorException; diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java index 45ca87552a7..a2e17121750 100644 --- a/api/src/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/iso/ListIsoPermissionsCmd.java @@ -23,21 +23,21 @@ import com.cloud.storage.Storage.ImageFormat; import com.cloud.template.VirtualMachineTemplate; public class ListIsoPermissionsCmd extends ListTemplateOrIsoPermissionsCmd { - protected String getResponseName() { - return "listisopermissionsresponse"; + protected String getResponseName() { + return "listisopermissionsresponse"; } - @Override + @Override public String getMediaType() { - return "iso"; + return "iso"; } - @Override + @Override protected Logger getLogger() { - return Logger.getLogger(ListIsoPermissionsCmd.class.getName()); - } + return Logger.getLogger(ListIsoPermissionsCmd.class.getName()); + } - protected boolean templateIsCorrectType(VirtualMachineTemplate template) { - return template.getFormat().equals(ImageFormat.ISO); - } + protected boolean templateIsCorrectType(VirtualMachineTemplate template) { + return template.getFormat().equals(ImageFormat.ISO); + } } diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java old mode 100755 new mode 100644 index 0c1ae2223cf..8b641f2e4da --- a/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java @@ -27,8 +27,8 @@ 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.ListResponse; -import com.cloud.api.response.TemplateResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.TemplateResponse; import com.cloud.async.AsyncJob; import com.cloud.template.VirtualMachineTemplate.TemplateFilter; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java old mode 100755 new mode 100644 index 3aea186c9fd..0961800e892 --- a/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java @@ -26,8 +26,8 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.TemplateResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.TemplateResponse; import com.cloud.exception.ResourceAllocationException; import com.cloud.template.VirtualMachineTemplate; import com.cloud.user.UserContext; diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java old mode 100755 new mode 100644 index f2c8dbfaf5b..629cdb8bb1e --- a/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoCmd.java @@ -22,7 +22,7 @@ import org.apache.log4j.Logger; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.TemplateResponse; +import org.apache.cloudstack.api.response.TemplateResponse; import com.cloud.template.VirtualMachineTemplate; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java index d5199d8be04..f0f9c468810 100644 --- a/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/iso/UpdateIsoPermissionsCmd.java @@ -20,7 +20,7 @@ import com.cloud.api.commands.UpdateTemplateOrIsoPermissionsCmd; import org.apache.log4j.Logger; import org.apache.cloudstack.api.Implementation; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.template.VirtualMachineTemplate; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/user/job/ListAsyncJobsCmd.java b/api/src/org/apache/cloudstack/api/command/user/job/ListAsyncJobsCmd.java index 471c5436113..a07e8be785f 100644 --- a/api/src/org/apache/cloudstack/api/command/user/job/ListAsyncJobsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/job/ListAsyncJobsCmd.java @@ -24,8 +24,8 @@ import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListAccountResourcesCmd; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.AsyncJobResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.AsyncJobResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.async.AsyncJob; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java b/api/src/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java index 0eb7e345cd0..74a8a177ca4 100644 --- a/api/src/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java @@ -23,7 +23,7 @@ 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 com.cloud.api.response.AsyncJobResponse; +import org.apache.cloudstack.api.response.AsyncJobResponse; import com.cloud.user.Account; @Implementation(description="Retrieves the current status of asynchronous job.", responseObject=AsyncJobResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java index 8395bb1d5cb..82ff8ebaea9 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java @@ -27,7 +27,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.network.rules.LoadBalancer; diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java index 99aeed7bd8c..3583bfabeec 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBStickinessPolicyCmd.java @@ -33,7 +33,7 @@ import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.rules.StickinessPolicy; -import com.cloud.api.response.LBStickinessResponse; +import org.apache.cloudstack.api.response.LBStickinessResponse; import com.cloud.network.rules.LoadBalancer; import com.cloud.user.Account; import com.cloud.user.UserContext; diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java index 1183f5b49c6..669fd01c04a 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java @@ -27,7 +27,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.LoadBalancerResponse; +import org.apache.cloudstack.api.response.LoadBalancerResponse; import com.cloud.async.AsyncJob; import com.cloud.dc.DataCenter; import com.cloud.dc.DataCenter.NetworkType; diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java index 8b5601fd828..99abf2e2ffa 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBStickinessPolicyCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.network.rules.StickinessPolicy; diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java index 7713dc74b2c..c8e6479f77b 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java index c0cb77af976..683b12aa11d 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java @@ -26,8 +26,8 @@ import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.LBStickinessResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.LBStickinessResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.network.rules.LoadBalancer; import com.cloud.network.rules.StickinessPolicy; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java index 8e84e9c5ff0..1fc082672d0 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRuleInstancesCmd.java @@ -26,8 +26,8 @@ import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.UserVmResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.UserVmResponse; import com.cloud.uservm.UserVm; @Implementation(description="List all virtual machine instances that are assigned to a load balancer rule.", responseObject=UserVmResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java index 2f014f6833a..a0d0f9d8a97 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java @@ -26,8 +26,8 @@ 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.ListResponse; -import com.cloud.api.response.LoadBalancerResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.LoadBalancerResponse; import com.cloud.network.rules.LoadBalancer; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java index ae65d8d5ab6..e20aae94723 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java @@ -27,7 +27,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.network.rules.LoadBalancer; diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java index 6c1b5a2a75e..34f78be83b2 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.LoadBalancerResponse; +import org.apache.cloudstack.api.response.LoadBalancerResponse; import com.cloud.event.EventTypes; import com.cloud.network.rules.LoadBalancer; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java index 6afa8fa7b61..da435ec12d7 100644 --- a/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java @@ -28,8 +28,8 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.FirewallRuleResponse; -import com.cloud.api.response.IpForwardingRuleResponse; +import org.apache.cloudstack.api.response.FirewallRuleResponse; +import org.apache.cloudstack.api.response.IpForwardingRuleResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java index 0986f98463f..d8fa878600d 100644 --- a/api/src/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java b/api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java index 228cbd89fea..e3c2ede55a9 100644 --- a/api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.exception.InsufficientAddressCapacityException; import com.cloud.exception.InvalidParameterValueException; diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java b/api/src/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java index b5fa549a145..5a77a0a395f 100644 --- a/api/src/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceUnavailableException; diff --git a/api/src/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java b/api/src/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java index 337a8795a3b..1560111e64f 100644 --- a/api/src/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java @@ -26,9 +26,9 @@ 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 com.cloud.api.response.FirewallRuleResponse; -import com.cloud.api.response.IpForwardingRuleResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.FirewallRuleResponse; +import org.apache.cloudstack.api.response.IpForwardingRuleResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.network.rules.FirewallRule; import com.cloud.network.rules.StaticNatRule; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java index 0e6a0838e1e..04406278f84 100644 --- a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java @@ -29,7 +29,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.NetworkACLResponse; +import org.apache.cloudstack.api.response.NetworkACLResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; diff --git a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java index 331664e21f0..2a10447a18e 100644 --- a/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.NetworkResponse; +import org.apache.cloudstack.api.response.NetworkResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; diff --git a/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java index 6aeed16d7f4..2cd9dc89035 100644 --- a/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; diff --git a/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java index 8e47e7699b1..b5912503991 100644 --- a/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.network.Network; diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java index a14066a689d..47329f4338a 100644 --- a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java @@ -27,8 +27,8 @@ 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.ListResponse; -import com.cloud.api.response.NetworkACLResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.NetworkACLResponse; import com.cloud.network.rules.FirewallRule; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java index 33003423d8b..63b9d002872 100644 --- a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java @@ -26,8 +26,8 @@ import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.NetworkOfferingResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.NetworkOfferingResponse; import com.cloud.offering.NetworkOffering; diff --git a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java index e9be8c41439..d1688c00fce 100644 --- a/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java @@ -26,8 +26,8 @@ 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.ListResponse; -import com.cloud.api.response.NetworkResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.NetworkResponse; import com.cloud.network.Network; diff --git a/api/src/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java index f73fc5691e2..2f3466439dd 100644 --- a/api/src/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/network/RestartNetworkCmd.java @@ -25,8 +25,8 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.IPAddressResponse; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.IPAddressResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; diff --git a/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java index 4aafee5bc52..56142a9726e 100644 --- a/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.NetworkResponse; +import org.apache.cloudstack.api.response.NetworkResponse; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; diff --git a/api/src/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java b/api/src/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java index a9a4eb69eda..31b03e80485 100644 --- a/api/src/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java @@ -26,8 +26,8 @@ import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.DiskOfferingResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.DiskOfferingResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.offering.DiskOffering; @Implementation(description="Lists all available disk offerings.", responseObject=DiskOfferingResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java b/api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java index 42aabc205aa..9dfa82da78a 100644 --- a/api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java @@ -26,8 +26,8 @@ import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.ServiceOfferingResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.ServiceOfferingResponse; import com.cloud.offering.ServiceOffering; @Implementation(description="Lists all available service offerings.", responseObject=ServiceOfferingResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/user/project/ActivateProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/ActivateProjectCmd.java index c44c0241988..40535d84d30 100644 --- a/api/src/org/apache/cloudstack/api/command/user/project/ActivateProjectCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/project/ActivateProjectCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ProjectResponse; +import org.apache.cloudstack.api.response.ProjectResponse; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.projects.Project; diff --git a/api/src/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java index 9154b2633bb..c979158d916 100644 --- a/api/src/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ProjectResponse; +import org.apache.cloudstack.api.response.ProjectResponse; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceAllocationException; diff --git a/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java index b0fb2b97763..0c489fbfdc7 100644 --- a/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.projects.Project; diff --git a/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.java index 76740734edd..0efe491587d 100644 --- a/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/project/DeleteProjectInvitationCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.user.Account; import com.cloud.user.UserContext; diff --git a/api/src/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.java index 9083f03b61b..206a9a9e80f 100644 --- a/api/src/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/project/ListProjectInvitationsCmd.java @@ -26,8 +26,8 @@ import org.apache.cloudstack.api.BaseListAccountResourcesCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.ProjectInvitationResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.ProjectInvitationResponse; import com.cloud.projects.ProjectInvitation; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java index 649746664b1..2350a2c0af4 100644 --- a/api/src/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/project/ListProjectsCmd.java @@ -30,8 +30,8 @@ import org.apache.cloudstack.api.BaseListAccountResourcesCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.ProjectResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.ProjectResponse; import com.cloud.exception.InvalidParameterValueException; import com.cloud.projects.Project; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.java index 9542fa9dc78..4de4f04fac7 100644 --- a/api/src/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/project/SuspendProjectCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ProjectResponse; +import org.apache.cloudstack.api.response.ProjectResponse; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InvalidParameterValueException; diff --git a/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.java index 071571b8f45..8b3e6365457 100644 --- a/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ProjectResponse; +import org.apache.cloudstack.api.response.ProjectResponse; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceAllocationException; diff --git a/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.java b/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.java index 1d9d7318d9e..279e4a27d61 100644 --- a/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/project/UpdateProjectInvitationCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.user.Account; import com.cloud.user.UserContext; diff --git a/api/src/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.java b/api/src/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.java index ca33036ad4c..feec81fa1c8 100644 --- a/api/src/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/resource/GetCloudIdentifierCmd.java @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.CloudIdentifierResponse; +import org.apache.cloudstack.api.response.CloudIdentifierResponse; import com.cloud.user.Account; @Implementation(description="Retrieves a cloud identifier.", responseObject=CloudIdentifierResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java b/api/src/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java index dd4bf989179..4ee11113d45 100644 --- a/api/src/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java @@ -27,8 +27,8 @@ 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 com.cloud.api.response.HypervisorResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.HypervisorResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.user.Account; @Implementation(description = "List hypervisors", responseObject = HypervisorResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java b/api/src/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java index 3e0d9a2ed08..72f96095ced 100644 --- a/api/src/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java @@ -25,8 +25,8 @@ import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.ResourceLimitResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.ResourceLimitResponse; import com.cloud.configuration.ResourceLimit; @Implementation(description="Lists resource limits.", responseObject=ResourceLimitResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java b/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java index 30888c7c2d7..3db1b987fd6 100644 --- a/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java @@ -27,8 +27,8 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.ResourceCountResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.ResourceCountResponse; import com.cloud.configuration.ResourceCount; import com.cloud.user.Account; import com.cloud.user.UserContext; diff --git a/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java b/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java index 743c8244911..0e74d50a4bb 100644 --- a/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ResourceLimitResponse; +import org.apache.cloudstack.api.response.ResourceLimitResponse; import com.cloud.configuration.ResourceLimit; import com.cloud.user.UserContext; diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java index ab9631810ab..566e5c0b5e1 100644 --- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java @@ -29,8 +29,8 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SecurityGroupRuleResponse; -import com.cloud.api.response.SecurityGroupResponse; +import org.apache.cloudstack.api.response.SecurityGroupRuleResponse; +import org.apache.cloudstack.api.response.SecurityGroupResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java index 43e419a947a..b5e6aa24dc6 100644 --- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java @@ -31,8 +31,8 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SecurityGroupResponse; -import com.cloud.api.response.SecurityGroupRuleResponse; +import org.apache.cloudstack.api.response.SecurityGroupResponse; +import org.apache.cloudstack.api.response.SecurityGroupRuleResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java index 965df1972a0..b83a9722fb6 100644 --- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/CreateSecurityGroupCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SecurityGroupResponse; +import org.apache.cloudstack.api.response.SecurityGroupResponse; import com.cloud.network.security.SecurityGroup; import com.cloud.user.Account; import com.cloud.user.UserContext; diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java index 1300464b7e3..5ca76ef5a72 100644 --- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceInUseException; import com.cloud.user.UserContext; diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java index c375c7a1970..0149a0a6f16 100644 --- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/ListSecurityGroupsCmd.java @@ -25,9 +25,9 @@ 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.ListResponse; -import com.cloud.api.response.SecurityGroupResponse; -import com.cloud.api.view.vo.SecurityGroupJoinVO; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.SecurityGroupResponse; +import org.apache.cloudstack.api.view.vo.SecurityGroupJoinVO; import com.cloud.async.AsyncJob; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java index 809e089aa27..97832181a12 100644 --- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.network.security.SecurityGroup; diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java index b319d842697..34c0004ded1 100644 --- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.network.security.SecurityGroup; diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java old mode 100755 new mode 100644 index a685bd0abc7..9d9c7475e07 --- a/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SnapshotResponse; +import org.apache.cloudstack.api.response.SnapshotResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java index 14cf553e1f2..53a84d32010 100644 --- a/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SnapshotPolicyResponse; +import org.apache.cloudstack.api.response.SnapshotPolicyResponse; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.PermissionDeniedException; import com.cloud.projects.Project; diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java index 3e380a00464..92e8d38be35 100644 --- a/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.storage.Snapshot; diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java old mode 100755 new mode 100644 index 053de7f2496..f3a3baa4de5 --- a/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/DeleteSnapshotPoliciesCmd.java @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.user.Account; @Implementation(description="Deletes snapshot policies for the account.", responseObject=SuccessResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.java index 0b01e5ed41b..e1a6fd692d3 100644 --- a/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmd.java @@ -26,8 +26,8 @@ import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.SnapshotPolicyResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.SnapshotPolicyResponse; import com.cloud.storage.snapshot.SnapshotPolicy; @Implementation(description="Lists snapshot policies.", responseObject=SnapshotPolicyResponse.class) diff --git a/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java b/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java index bfda3ade4fa..ae152b39f75 100644 --- a/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotsCmd.java @@ -26,8 +26,8 @@ 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.ListResponse; -import com.cloud.api.response.SnapshotResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.SnapshotResponse; import com.cloud.async.AsyncJob; import com.cloud.storage.Snapshot; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java b/api/src/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java index 9be649d5ded..b296acd4512 100644 --- a/api/src/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java @@ -23,7 +23,7 @@ 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 com.cloud.api.response.SSHKeyPairResponse; +import org.apache.cloudstack.api.response.SSHKeyPairResponse; import com.cloud.user.SSHKeyPair; import com.cloud.user.UserContext; diff --git a/api/src/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java b/api/src/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java index 768a4dd082c..f8d2946a5c9 100644 --- a/api/src/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java @@ -23,7 +23,7 @@ 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 com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.user.Account; import com.cloud.user.UserContext; diff --git a/api/src/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java b/api/src/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java index ee2aa1894fc..336825b8bd6 100644 --- a/api/src/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/ssh/ListSSHKeyPairsCmd.java @@ -25,8 +25,8 @@ import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.SSHKeyPairResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.SSHKeyPairResponse; import com.cloud.user.SSHKeyPair; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java b/api/src/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java index 6603578b721..f31d2d892fa 100644 --- a/api/src/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/ssh/RegisterSSHKeyPairCmd.java @@ -23,7 +23,7 @@ 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 com.cloud.api.response.SSHKeyPairResponse; +import org.apache.cloudstack.api.response.SSHKeyPairResponse; import com.cloud.user.SSHKeyPair; import com.cloud.user.UserContext; diff --git a/api/src/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java b/api/src/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java index 0a2d3b3d3df..14c6167ff84 100644 --- a/api/src/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java @@ -31,7 +31,7 @@ import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.server.ResourceTag; import com.cloud.server.ResourceTag.TaggedResourceType; diff --git a/api/src/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java b/api/src/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java index 2278384fc82..f5de4a3d6ea 100644 --- a/api/src/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java @@ -31,7 +31,7 @@ import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.server.ResourceTag.TaggedResourceType; @Implementation(description = "Deleting resource tag(s)", responseObject = SuccessResponse.class, since = "Burbank") diff --git a/api/src/org/apache/cloudstack/api/command/user/tag/ListTagsCmd.java b/api/src/org/apache/cloudstack/api/command/user/tag/ListTagsCmd.java index e0abc17460a..94194dbf230 100644 --- a/api/src/org/apache/cloudstack/api/command/user/tag/ListTagsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/tag/ListTagsCmd.java @@ -17,17 +17,15 @@ package org.apache.cloudstack.api.command.user.tag; -import java.util.ArrayList; import java.util.List; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.ResourceTagResponse; -import com.cloud.api.view.vo.ResourceTagJoinVO; -import com.cloud.server.ResourceTag; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.ResourceTagResponse; +import org.apache.cloudstack.api.view.vo.ResourceTagJoinVO; import com.cloud.utils.Pair; @Implementation(description = "List resource tag(s)", responseObject = ResourceTagResponse.class, since = "Burbank") diff --git a/api/src/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java old mode 100755 new mode 100644 index 0b8f7e43b84..31003be9794 --- a/api/src/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/CopyTemplateCmd.java @@ -27,7 +27,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.TemplateResponse; +import org.apache.cloudstack.api.response.TemplateResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.ResourceAllocationException; diff --git a/api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java old mode 100755 new mode 100644 index 0a52e3058fc..8ce2ad92718 --- a/api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java @@ -29,8 +29,8 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.StoragePoolResponse; -import com.cloud.api.response.TemplateResponse; +import org.apache.cloudstack.api.response.StoragePoolResponse; +import org.apache.cloudstack.api.response.TemplateResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; diff --git a/api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java old mode 100755 new mode 100644 index 56d6f846c7d..fc830fa462b --- a/api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.template.VirtualMachineTemplate; diff --git a/api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java old mode 100755 new mode 100644 index 0adfdd82c42..9be1297358e --- a/api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ExtractResponse; +import org.apache.cloudstack.api.response.ExtractResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.InternalErrorException; diff --git a/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java index 934e2e8a1a0..cd38215ca4f 100644 --- a/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatePermissionsCmd.java @@ -23,21 +23,21 @@ import com.cloud.storage.Storage.ImageFormat; import com.cloud.template.VirtualMachineTemplate; public class ListTemplatePermissionsCmd extends ListTemplateOrIsoPermissionsCmd { - protected String getResponseName() { - return "listtemplatepermissionsresponse"; + protected String getResponseName() { + return "listtemplatepermissionsresponse"; } - @Override + @Override public String getMediaType() { - return "template"; + return "template"; } - @Override + @Override protected Logger getLogger() { - return Logger.getLogger(ListTemplatePermissionsCmd.class.getName()); - } + return Logger.getLogger(ListTemplatePermissionsCmd.class.getName()); + } - protected boolean templateIsCorrectType(VirtualMachineTemplate template) { - return !template.getFormat().equals(ImageFormat.ISO); - } + protected boolean templateIsCorrectType(VirtualMachineTemplate template) { + return !template.getFormat().equals(ImageFormat.ISO); + } } diff --git a/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java old mode 100755 new mode 100644 index f16b7e27c4d..52051b291ed --- a/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java @@ -27,8 +27,8 @@ 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.ListResponse; -import com.cloud.api.response.TemplateResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.TemplateResponse; import com.cloud.async.AsyncJob; import com.cloud.template.VirtualMachineTemplate.TemplateFilter; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java old mode 100755 new mode 100644 index 54269ac975e..802e23327a5 --- a/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java @@ -29,8 +29,8 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.TemplateResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.TemplateResponse; import com.cloud.async.AsyncJob; import com.cloud.exception.ResourceAllocationException; import com.cloud.template.VirtualMachineTemplate; diff --git a/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java old mode 100755 new mode 100644 index 5d2af34b9d3..92c608c29c0 --- a/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java @@ -22,7 +22,7 @@ import org.apache.log4j.Logger; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.TemplateResponse; +import org.apache.cloudstack.api.response.TemplateResponse; import com.cloud.template.VirtualMachineTemplate; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplatePermissionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplatePermissionsCmd.java index bdd4a0c4997..4a29d9cbb92 100644 --- a/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplatePermissionsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/template/UpdateTemplatePermissionsCmd.java @@ -20,7 +20,7 @@ import com.cloud.api.commands.UpdateTemplateOrIsoPermissionsCmd; import org.apache.log4j.Logger; import org.apache.cloudstack.api.Implementation; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.template.VirtualMachineTemplate; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/command/user/user/AddVpnUserCmd.java b/api/src/org/apache/cloudstack/api/command/user/user/AddVpnUserCmd.java index a7ec871c254..abd58b897c0 100644 --- a/api/src/org/apache/cloudstack/api/command/user/user/AddVpnUserCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/user/AddVpnUserCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.VpnUsersResponse; +import org.apache.cloudstack.api.response.VpnUsersResponse; import com.cloud.domain.Domain; import com.cloud.event.EventTypes; import com.cloud.network.VpnUser; diff --git a/api/src/org/apache/cloudstack/api/command/user/user/ListVpnUsersCmd.java b/api/src/org/apache/cloudstack/api/command/user/user/ListVpnUsersCmd.java index 6149b408348..1fa15b597f9 100644 --- a/api/src/org/apache/cloudstack/api/command/user/user/ListVpnUsersCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/user/ListVpnUsersCmd.java @@ -26,8 +26,8 @@ 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 com.cloud.api.response.ListResponse; -import com.cloud.api.response.VpnUsersResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.VpnUsersResponse; import com.cloud.network.VpnUser; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/command/user/user/RemoveVpnUserCmd.java b/api/src/org/apache/cloudstack/api/command/user/user/RemoveVpnUserCmd.java index f03c1a84848..5e144bdaf76 100644 --- a/api/src/org/apache/cloudstack/api/command/user/user/RemoveVpnUserCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/user/RemoveVpnUserCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.user.Account; import com.cloud.user.UserContext; diff --git a/api/src/org/apache/cloudstack/api/user/vm/command/DeployVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java similarity index 96% rename from api/src/org/apache/cloudstack/api/user/vm/command/DeployVMCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java index 2cf9e8c7784..3ca94da4f78 100644 --- a/api/src/org/apache/cloudstack/api/user/vm/command/DeployVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.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.vm.command; +package org.apache.cloudstack.api.command.user.vm; import java.util.ArrayList; import java.util.Collection; @@ -30,25 +30,23 @@ import org.apache.cloudstack.api.ACL; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseAsyncCreateCmd; 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; -import com.cloud.api.response.DiskOfferingResponse; -import com.cloud.api.response.DomainResponse; -import com.cloud.api.response.HostResponse; -import com.cloud.api.response.NetworkResponse; -import com.cloud.api.response.ProjectAccountResponse; -import com.cloud.api.response.SecurityGroupResponse; -import com.cloud.api.response.ServiceOfferingResponse; -import com.cloud.api.response.TemplateResponse; -import com.cloud.api.response.UserVmResponse; -import com.cloud.api.response.ZoneResponse; +import org.apache.cloudstack.api.response.DiskOfferingResponse; +import org.apache.cloudstack.api.response.DomainResponse; +import org.apache.cloudstack.api.response.HostResponse; +import org.apache.cloudstack.api.response.NetworkResponse; +import org.apache.cloudstack.api.response.ProjectAccountResponse; +import org.apache.cloudstack.api.response.SecurityGroupResponse; +import org.apache.cloudstack.api.response.ServiceOfferingResponse; +import org.apache.cloudstack.api.response.TemplateResponse; +import org.apache.cloudstack.api.response.UserVmResponse; +import org.apache.cloudstack.api.response.ZoneResponse; import com.cloud.async.AsyncJob; import com.cloud.dc.DataCenter; import com.cloud.dc.DataCenter.NetworkType; -import com.cloud.domain.Domain; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; diff --git a/api/src/org/apache/cloudstack/api/user/vm/command/DestroyVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java similarity index 96% rename from api/src/org/apache/cloudstack/api/user/vm/command/DestroyVMCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java index 06c3c0d7047..48777c6bc5a 100644 --- a/api/src/org/apache/cloudstack/api/user/vm/command/DestroyVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java @@ -14,18 +14,17 @@ // 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.vm.command; +package org.apache.cloudstack.api.command.user.vm; import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseAsyncCmd; 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; -import com.cloud.api.response.UserVmResponse; +import org.apache.cloudstack.api.response.UserVmResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; diff --git a/api/src/org/apache/cloudstack/api/user/vm/command/GetVMPasswordCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/GetVMPasswordCmd.java similarity index 93% rename from api/src/org/apache/cloudstack/api/user/vm/command/GetVMPasswordCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vm/GetVMPasswordCmd.java index ee8eee4f28b..b9ebbda40cb 100644 --- a/api/src/org/apache/cloudstack/api/user/vm/command/GetVMPasswordCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/GetVMPasswordCmd.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.vm.command; +package org.apache.cloudstack.api.command.user.vm; import java.security.InvalidParameterException; @@ -22,11 +22,10 @@ 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 com.cloud.api.response.GetVMPasswordResponse; -import com.cloud.api.response.UserVmResponse; +import org.apache.cloudstack.api.response.GetVMPasswordResponse; +import org.apache.cloudstack.api.response.UserVmResponse; import com.cloud.user.Account; import com.cloud.uservm.UserVm; diff --git a/api/src/org/apache/cloudstack/api/user/vm/command/ListVMsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java similarity index 91% rename from api/src/org/apache/cloudstack/api/user/vm/command/ListVMsCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java index 335a3261bca..220b9eee951 100644 --- a/api/src/org/apache/cloudstack/api/user/vm/command/ListVMsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.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.vm.command; +package org.apache.cloudstack.api.command.user.vm; import java.util.ArrayList; import java.util.EnumSet; @@ -25,25 +25,24 @@ import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiConstants.VMDetails; 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.HostResponse; -import com.cloud.api.response.InstanceGroupResponse; -import com.cloud.api.response.IsoVmResponse; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.NetworkResponse; -import com.cloud.api.response.PodResponse; -import com.cloud.api.response.StoragePoolResponse; -import com.cloud.api.response.TemplateResponse; -import com.cloud.api.response.UserVmResponse; -import com.cloud.api.response.VpcResponse; -import com.cloud.api.response.ZoneResponse; +import org.apache.cloudstack.api.response.HostResponse; +import org.apache.cloudstack.api.response.InstanceGroupResponse; +import org.apache.cloudstack.api.response.IsoVmResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.NetworkResponse; +import org.apache.cloudstack.api.response.PodResponse; +import org.apache.cloudstack.api.response.StoragePoolResponse; +import org.apache.cloudstack.api.response.TemplateResponse; +import org.apache.cloudstack.api.response.UserVmResponse; +import org.apache.cloudstack.api.response.VpcResponse; +import org.apache.cloudstack.api.response.ZoneResponse; import com.cloud.async.AsyncJob; import com.cloud.exception.InvalidParameterValueException; import com.cloud.utils.Pair; -import com.cloud.api.view.vo.UserVmJoinVO; +import org.apache.cloudstack.api.view.vo.UserVmJoinVO; @Implementation(description="List the virtual machines owned by the account.", responseObject=UserVmResponse.class) diff --git a/api/src/org/apache/cloudstack/api/user/vm/command/RebootVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java similarity index 97% rename from api/src/org/apache/cloudstack/api/user/vm/command/RebootVMCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.java index 45ed4eef86e..6477d5d23f0 100644 --- a/api/src/org/apache/cloudstack/api/user/vm/command/RebootVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/RebootVMCmd.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.vm.command; +package org.apache.cloudstack.api.command.user.vm; import org.apache.log4j.Logger; @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.UserVmResponse; +import org.apache.cloudstack.api.response.UserVmResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.InsufficientCapacityException; diff --git a/api/src/org/apache/cloudstack/api/user/vm/command/ResetVMPasswordCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java similarity index 97% rename from api/src/org/apache/cloudstack/api/user/vm/command/ResetVMPasswordCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.java index c41c51f14eb..c724245c820 100644 --- a/api/src/org/apache/cloudstack/api/user/vm/command/ResetVMPasswordCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/ResetVMPasswordCmd.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.vm.command; +package org.apache.cloudstack.api.command.user.vm; import org.apache.log4j.Logger; @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.UserVmResponse; +import org.apache.cloudstack.api.response.UserVmResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.InsufficientCapacityException; diff --git a/api/src/org/apache/cloudstack/api/user/vm/command/RestoreVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java similarity index 96% rename from api/src/org/apache/cloudstack/api/user/vm/command/RestoreVMCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java index 926362f4cfa..3a94a11b5d0 100644 --- a/api/src/org/apache/cloudstack/api/user/vm/command/RestoreVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.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.vm.command; +package org.apache.cloudstack.api.command.user.vm; import org.apache.log4j.Logger; @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.UserVmResponse; +import org.apache.cloudstack.api.response.UserVmResponse; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; diff --git a/api/src/org/apache/cloudstack/api/user/vm/command/StartVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java similarity index 97% rename from api/src/org/apache/cloudstack/api/user/vm/command/StartVMCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java index f00e082a8fa..8e5877dec09 100644 --- a/api/src/org/apache/cloudstack/api/user/vm/command/StartVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.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.vm.command; +package org.apache.cloudstack.api.command.user.vm; import org.apache.log4j.Logger; @@ -26,8 +26,8 @@ import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.HostResponse; -import com.cloud.api.response.UserVmResponse; +import org.apache.cloudstack.api.response.HostResponse; +import org.apache.cloudstack.api.response.UserVmResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; diff --git a/api/src/org/apache/cloudstack/api/user/vm/command/StopVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java similarity index 97% rename from api/src/org/apache/cloudstack/api/user/vm/command/StopVMCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.java index 53262a212f6..9262327ed45 100644 --- a/api/src/org/apache/cloudstack/api/user/vm/command/StopVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/StopVMCmd.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.vm.command; +package org.apache.cloudstack.api.command.user.vm; import org.apache.log4j.Logger; @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.UserVmResponse; +import org.apache.cloudstack.api.response.UserVmResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; diff --git a/api/src/org/apache/cloudstack/api/user/vm/command/UpdateVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java similarity index 96% rename from api/src/org/apache/cloudstack/api/user/vm/command/UpdateVMCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java index 4b4ecf44e63..a17366dec7d 100644 --- a/api/src/org/apache/cloudstack/api/user/vm/command/UpdateVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.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.vm.command; +package org.apache.cloudstack.api.command.user.vm; import org.apache.log4j.Logger; @@ -25,8 +25,8 @@ import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.GuestOSResponse; -import com.cloud.api.response.UserVmResponse; +import org.apache.cloudstack.api.response.GuestOSResponse; +import org.apache.cloudstack.api.response.UserVmResponse; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/user/vm/command/UpgradeVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java similarity index 96% rename from api/src/org/apache/cloudstack/api/user/vm/command/UpgradeVMCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java index 995218ee6a2..c9390e91060 100644 --- a/api/src/org/apache/cloudstack/api/user/vm/command/UpgradeVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.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.vm.command; +package org.apache.cloudstack.api.command.user.vm; import org.apache.log4j.Logger; @@ -25,8 +25,8 @@ import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.DiskOfferingResponse; -import com.cloud.api.response.UserVmResponse; +import org.apache.cloudstack.api.response.DiskOfferingResponse; +import org.apache.cloudstack.api.response.UserVmResponse; import com.cloud.exception.InvalidParameterValueException; import com.cloud.offering.ServiceOffering; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/user/vmgroup/command/CreateVMGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java similarity index 93% rename from api/src/org/apache/cloudstack/api/user/vmgroup/command/CreateVMGroupCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java index e452533b689..ad2d5ee4f31 100644 --- a/api/src/org/apache/cloudstack/api/user/vmgroup/command/CreateVMGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java @@ -14,20 +14,19 @@ // 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.vmgroup.command; +package org.apache.cloudstack.api.command.user.vmgroup; 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; -import com.cloud.api.response.DomainResponse; -import com.cloud.api.response.InstanceGroupResponse; -import com.cloud.api.response.ProjectAccountResponse; +import org.apache.cloudstack.api.response.DomainResponse; +import org.apache.cloudstack.api.response.InstanceGroupResponse; +import org.apache.cloudstack.api.response.ProjectAccountResponse; import com.cloud.user.UserContext; import com.cloud.vm.InstanceGroup; diff --git a/api/src/org/apache/cloudstack/api/user/vmgroup/command/DeleteVMGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/vmgroup/DeleteVMGroupCmd.java similarity index 93% rename from api/src/org/apache/cloudstack/api/user/vmgroup/command/DeleteVMGroupCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vmgroup/DeleteVMGroupCmd.java index 9001b6cf250..d81d5c413c0 100644 --- a/api/src/org/apache/cloudstack/api/user/vmgroup/command/DeleteVMGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vmgroup/DeleteVMGroupCmd.java @@ -14,19 +14,18 @@ // 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.vmgroup.command; +package org.apache.cloudstack.api.command.user.vmgroup; 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; -import com.cloud.api.response.InstanceGroupResponse; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.InstanceGroupResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.user.Account; import com.cloud.vm.InstanceGroup; diff --git a/api/src/org/apache/cloudstack/api/user/vmgroup/command/ListVMGroupsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vmgroup/ListVMGroupsCmd.java similarity index 95% rename from api/src/org/apache/cloudstack/api/user/vmgroup/command/ListVMGroupsCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vmgroup/ListVMGroupsCmd.java index ff5158d89fa..c94571b9cd8 100644 --- a/api/src/org/apache/cloudstack/api/user/vmgroup/command/ListVMGroupsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vmgroup/ListVMGroupsCmd.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.vmgroup.command; +package org.apache.cloudstack.api.command.user.vmgroup; import java.util.ArrayList; import java.util.List; @@ -26,8 +26,8 @@ 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 com.cloud.api.response.InstanceGroupResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.InstanceGroupResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.utils.Pair; import com.cloud.vm.InstanceGroup; diff --git a/api/src/org/apache/cloudstack/api/user/vmgroup/command/UpdateVMGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/vmgroup/UpdateVMGroupCmd.java similarity index 95% rename from api/src/org/apache/cloudstack/api/user/vmgroup/command/UpdateVMGroupCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vmgroup/UpdateVMGroupCmd.java index 6735f16deab..5762db9fcff 100644 --- a/api/src/org/apache/cloudstack/api/user/vmgroup/command/UpdateVMGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vmgroup/UpdateVMGroupCmd.java @@ -14,17 +14,16 @@ // 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.vmgroup.command; +package org.apache.cloudstack.api.command.user.vmgroup; 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; -import com.cloud.api.response.InstanceGroupResponse; +import org.apache.cloudstack.api.response.InstanceGroupResponse; import com.cloud.user.Account; import com.cloud.vm.InstanceGroup; diff --git a/api/src/org/apache/cloudstack/api/user/volume/command/AttachVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java old mode 100755 new mode 100644 similarity index 97% rename from api/src/org/apache/cloudstack/api/user/volume/command/AttachVolumeCmd.java rename to api/src/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.java index 5dcd9168fbe..20a76286b9e --- a/api/src/org/apache/cloudstack/api/user/volume/command/AttachVolumeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/AttachVolumeCmd.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.volume.command; +package org.apache.cloudstack.api.command.user.volume; import org.apache.log4j.Logger; @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.VolumeResponse; +import org.apache.cloudstack.api.response.VolumeResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.storage.Volume; diff --git a/api/src/org/apache/cloudstack/api/user/volume/command/CreateVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/volume/command/CreateVolumeCmd.java rename to api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java index acc4598c4cd..6d235deee82 100644 --- a/api/src/org/apache/cloudstack/api/user/volume/command/CreateVolumeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.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.volume.command; +package org.apache.cloudstack.api.command.user.volume; import org.apache.log4j.Logger; @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.VolumeResponse; +import org.apache.cloudstack.api.response.VolumeResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.ResourceAllocationException; diff --git a/api/src/org/apache/cloudstack/api/user/volume/command/DeleteVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java similarity index 96% rename from api/src/org/apache/cloudstack/api/user/volume/command/DeleteVolumeCmd.java rename to api/src/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.java index d6e44c39d98..4d6b6065d03 100644 --- a/api/src/org/apache/cloudstack/api/user/volume/command/DeleteVolumeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/DeleteVolumeCmd.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.volume.command; +package org.apache.cloudstack.api.command.user.volume; import org.apache.log4j.Logger; @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.storage.Volume; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/user/volume/command/DetachVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java old mode 100755 new mode 100644 similarity index 97% rename from api/src/org/apache/cloudstack/api/user/volume/command/DetachVolumeCmd.java rename to api/src/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java index 03ffe14fdb5..d4df4453bc7 --- a/api/src/org/apache/cloudstack/api/user/volume/command/DetachVolumeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.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.volume.command; +package org.apache.cloudstack.api.command.user.volume; import org.apache.log4j.Logger; @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.VolumeResponse; +import org.apache.cloudstack.api.response.VolumeResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.storage.Volume; diff --git a/api/src/org/apache/cloudstack/api/user/volume/command/ExtractVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java old mode 100755 new mode 100644 similarity index 97% rename from api/src/org/apache/cloudstack/api/user/volume/command/ExtractVolumeCmd.java rename to api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java index 469b4861391..787e096f26a --- a/api/src/org/apache/cloudstack/api/user/volume/command/ExtractVolumeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.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.volume.command; +package org.apache.cloudstack.api.command.user.volume; import java.net.URISyntaxException; @@ -27,7 +27,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ExtractResponse; +import org.apache.cloudstack.api.response.ExtractResponse; import com.cloud.async.AsyncJob; import com.cloud.dc.DataCenter; import com.cloud.event.EventTypes; diff --git a/api/src/org/apache/cloudstack/api/user/volume/command/ListVolumesCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java old mode 100755 new mode 100644 similarity index 96% rename from api/src/org/apache/cloudstack/api/user/volume/command/ListVolumesCmd.java rename to api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java index 1d6aac8c297..14d664e243e --- a/api/src/org/apache/cloudstack/api/user/volume/command/ListVolumesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.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.volume.command; +package org.apache.cloudstack.api.command.user.volume; import java.util.ArrayList; import java.util.List; @@ -26,8 +26,8 @@ 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.ListResponse; -import com.cloud.api.response.VolumeResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.VolumeResponse; import com.cloud.async.AsyncJob; import com.cloud.storage.Volume; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/user/volume/command/MigrateVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java similarity index 97% rename from api/src/org/apache/cloudstack/api/user/volume/command/MigrateVolumeCmd.java rename to api/src/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java index 947e89a09e7..a1e8f35800c 100644 --- a/api/src/org/apache/cloudstack/api/user/volume/command/MigrateVolumeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.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.volume.command; +package org.apache.cloudstack.api.command.user.volume; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseAsyncCmd; @@ -23,7 +23,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.VolumeResponse; +import org.apache.cloudstack.api.response.VolumeResponse; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.storage.Volume; diff --git a/api/src/org/apache/cloudstack/api/user/volume/command/UploadVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java old mode 100755 new mode 100644 similarity index 97% rename from api/src/org/apache/cloudstack/api/user/volume/command/UploadVolumeCmd.java rename to api/src/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java index 164a4bb7f85..be150481e0b --- a/api/src/org/apache/cloudstack/api/user/volume/command/UploadVolumeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.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.volume.command; +package org.apache.cloudstack.api.command.user.volume; import org.apache.log4j.Logger; @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.VolumeResponse; +import org.apache.cloudstack.api.response.VolumeResponse; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; diff --git a/api/src/org/apache/cloudstack/api/user/vpc/command/CreateStaticRouteCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/vpc/command/CreateStaticRouteCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java index bcd1bbb38b9..a1d2c5de6e9 100644 --- a/api/src/org/apache/cloudstack/api/user/vpc/command/CreateStaticRouteCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.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.vpc.command; +package org.apache.cloudstack.api.command.user.vpc; import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.StaticRouteResponse; +import org.apache.cloudstack.api.response.StaticRouteResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; diff --git a/api/src/org/apache/cloudstack/api/user/vpc/command/CreateVPCCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/vpc/command/CreateVPCCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java index c56f71587b7..111f9fac24f 100644 --- a/api/src/org/apache/cloudstack/api/user/vpc/command/CreateVPCCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.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.vpc.command; +package org.apache.cloudstack.api.command.user.vpc; import org.apache.log4j.Logger; @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.VpcResponse; +import org.apache.cloudstack.api.response.VpcResponse; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; diff --git a/api/src/org/apache/cloudstack/api/user/vpc/command/DeleteStaticRouteCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java similarity index 97% rename from api/src/org/apache/cloudstack/api/user/vpc/command/DeleteStaticRouteCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.java index 1235729016d..f3f48254738 100644 --- a/api/src/org/apache/cloudstack/api/user/vpc/command/DeleteStaticRouteCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteStaticRouteCmd.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.vpc.command; +package org.apache.cloudstack.api.command.user.vpc; import org.apache.log4j.Logger; @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; diff --git a/api/src/org/apache/cloudstack/api/user/vpc/command/DeleteVPCCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteVPCCmd.java similarity index 97% rename from api/src/org/apache/cloudstack/api/user/vpc/command/DeleteVPCCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vpc/DeleteVPCCmd.java index 78dbfc1499e..7165db7bdc1 100644 --- a/api/src/org/apache/cloudstack/api/user/vpc/command/DeleteVPCCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpc/DeleteVPCCmd.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.vpc.command; +package org.apache.cloudstack.api.command.user.vpc; import org.apache.log4j.Logger; @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.ResourceUnavailableException; diff --git a/api/src/org/apache/cloudstack/api/user/vpc/command/ListPrivateGatewaysCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/ListPrivateGatewaysCmd.java similarity index 95% rename from api/src/org/apache/cloudstack/api/user/vpc/command/ListPrivateGatewaysCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vpc/ListPrivateGatewaysCmd.java index a76b07f51f8..3cde18c3c1f 100644 --- a/api/src/org/apache/cloudstack/api/user/vpc/command/ListPrivateGatewaysCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpc/ListPrivateGatewaysCmd.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.vpc.command; +package org.apache.cloudstack.api.command.user.vpc; import java.util.ArrayList; import java.util.List; @@ -26,8 +26,8 @@ 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 com.cloud.api.response.ListResponse; -import com.cloud.api.response.PrivateGatewayResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.PrivateGatewayResponse; import com.cloud.network.vpc.PrivateGateway; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/user/vpc/command/ListStaticRoutesCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/ListStaticRoutesCmd.java similarity index 95% rename from api/src/org/apache/cloudstack/api/user/vpc/command/ListStaticRoutesCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vpc/ListStaticRoutesCmd.java index e5ae9f07ffa..173db0cb02e 100644 --- a/api/src/org/apache/cloudstack/api/user/vpc/command/ListStaticRoutesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpc/ListStaticRoutesCmd.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.vpc.command; +package org.apache.cloudstack.api.command.user.vpc; import java.util.ArrayList; import java.util.List; @@ -23,8 +23,8 @@ 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.ListResponse; -import com.cloud.api.response.StaticRouteResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.StaticRouteResponse; import com.cloud.network.vpc.StaticRoute; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/user/vpc/command/ListVPCOfferingsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java similarity index 96% rename from api/src/org/apache/cloudstack/api/user/vpc/command/ListVPCOfferingsCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java index 727b43c33f7..04b2d9a4c41 100644 --- a/api/src/org/apache/cloudstack/api/user/vpc/command/ListVPCOfferingsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.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.vpc.command; +package org.apache.cloudstack.api.command.user.vpc; import java.util.ArrayList; import java.util.List; @@ -26,8 +26,8 @@ import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.VpcOfferingResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.VpcOfferingResponse; import com.cloud.network.vpc.VpcOffering; @Implementation(description="Lists VPC offerings", responseObject=VpcOfferingResponse.class) diff --git a/api/src/org/apache/cloudstack/api/user/vpc/command/ListVPCsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCsCmd.java similarity index 97% rename from api/src/org/apache/cloudstack/api/user/vpc/command/ListVPCsCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCsCmd.java index 657dbd84be7..9a244c349d5 100644 --- a/api/src/org/apache/cloudstack/api/user/vpc/command/ListVPCsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpc/ListVPCsCmd.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.vpc.command; +package org.apache.cloudstack.api.command.user.vpc; import java.util.ArrayList; import java.util.List; @@ -26,8 +26,8 @@ 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.ListResponse; -import com.cloud.api.response.VpcResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.VpcResponse; import com.cloud.network.vpc.Vpc; diff --git a/api/src/org/apache/cloudstack/api/user/vpc/command/RestartVPCCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java similarity index 96% rename from api/src/org/apache/cloudstack/api/user/vpc/command/RestartVPCCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.java index 8421cdeef94..e954474ab29 100644 --- a/api/src/org/apache/cloudstack/api/user/vpc/command/RestartVPCCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpc/RestartVPCCmd.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.vpc.command; +package org.apache.cloudstack.api.command.user.vpc; import org.apache.log4j.Logger; @@ -25,8 +25,8 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; -import com.cloud.api.response.VpcResponse; +import org.apache.cloudstack.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.VpcResponse; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; diff --git a/api/src/org/apache/cloudstack/api/user/vpc/command/UpdateVPCCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java similarity index 97% rename from api/src/org/apache/cloudstack/api/user/vpc/command/UpdateVPCCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.java index 14b8ce7b97a..a0c16e15a0a 100644 --- a/api/src/org/apache/cloudstack/api/user/vpc/command/UpdateVPCCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmd.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.vpc.command; +package org.apache.cloudstack.api.command.user.vpc; import org.apache.log4j.Logger; @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.VpcResponse; +import org.apache.cloudstack.api.response.VpcResponse; import com.cloud.event.EventTypes; import com.cloud.network.vpc.Vpc; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/user/vpn/command/CreateRemoteAccessVpnCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/vpn/command/CreateRemoteAccessVpnCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.java index 161c064096f..4d9e685467a 100644 --- a/api/src/org/apache/cloudstack/api/user/vpn/command/CreateRemoteAccessVpnCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateRemoteAccessVpnCmd.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.vpn.command; +package org.apache.cloudstack.api.command.user.vpn; import org.apache.log4j.Logger; @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.RemoteAccessVpnResponse; +import org.apache.cloudstack.api.response.RemoteAccessVpnResponse; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.NetworkRuleConflictException; diff --git a/api/src/org/apache/cloudstack/api/user/vpn/command/CreateVpnConnectionCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnConnectionCmd.java similarity index 97% rename from api/src/org/apache/cloudstack/api/user/vpn/command/CreateVpnConnectionCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnConnectionCmd.java index b3d2824e90a..99567bf09b5 100644 --- a/api/src/org/apache/cloudstack/api/user/vpn/command/CreateVpnConnectionCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnConnectionCmd.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.vpn.command; +package org.apache.cloudstack.api.command.user.vpn; import org.apache.log4j.Logger; @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.Site2SiteVpnConnectionResponse; +import org.apache.cloudstack.api.response.Site2SiteVpnConnectionResponse; import com.cloud.event.EventTypes; import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceUnavailableException; diff --git a/api/src/org/apache/cloudstack/api/user/vpn/command/CreateVpnCustomerGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java similarity index 97% rename from api/src/org/apache/cloudstack/api/user/vpn/command/CreateVpnCustomerGatewayCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java index 99cb62b1f15..af335402e0e 100644 --- a/api/src/org/apache/cloudstack/api/user/vpn/command/CreateVpnCustomerGatewayCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.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.vpn.command; +package org.apache.cloudstack.api.command.user.vpn; import org.apache.log4j.Logger; @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.Site2SiteCustomerGatewayResponse; +import org.apache.cloudstack.api.response.Site2SiteCustomerGatewayResponse; import com.cloud.event.EventTypes; import com.cloud.network.Site2SiteCustomerGateway; import com.cloud.user.UserContext; diff --git a/api/src/org/apache/cloudstack/api/user/vpn/command/CreateVpnGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java similarity index 96% rename from api/src/org/apache/cloudstack/api/user/vpn/command/CreateVpnGatewayCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.java index 7a13c028c64..22c77511801 100644 --- a/api/src/org/apache/cloudstack/api/user/vpn/command/CreateVpnGatewayCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnGatewayCmd.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.vpn.command; +package org.apache.cloudstack.api.command.user.vpn; import org.apache.log4j.Logger; @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.Site2SiteVpnGatewayResponse; +import org.apache.cloudstack.api.response.Site2SiteVpnGatewayResponse; import com.cloud.event.EventTypes; import com.cloud.network.Site2SiteVpnGateway; import com.cloud.network.vpc.Vpc; diff --git a/api/src/org/apache/cloudstack/api/user/vpn/command/DeleteRemoteAccessVpnCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java similarity index 97% rename from api/src/org/apache/cloudstack/api/user/vpn/command/DeleteRemoteAccessVpnCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java index 03baf97d47b..38a050a94f2 100644 --- a/api/src/org/apache/cloudstack/api/user/vpn/command/DeleteRemoteAccessVpnCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.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.vpn.command; +package org.apache.cloudstack.api.command.user.vpn; import org.apache.log4j.Logger; @@ -23,7 +23,7 @@ import org.apache.cloudstack.api.BaseAsyncCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceUnavailableException; diff --git a/api/src/org/apache/cloudstack/api/user/vpn/command/DeleteVpnConnectionCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnConnectionCmd.java similarity index 97% rename from api/src/org/apache/cloudstack/api/user/vpn/command/DeleteVpnConnectionCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnConnectionCmd.java index 19603bc33b2..98c0c55ec8a 100644 --- a/api/src/org/apache/cloudstack/api/user/vpn/command/DeleteVpnConnectionCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnConnectionCmd.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.vpn.command; +package org.apache.cloudstack.api.command.user.vpn; import org.apache.log4j.Logger; @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.Site2SiteVpnConnection; diff --git a/api/src/org/apache/cloudstack/api/user/vpn/command/DeleteVpnCustomerGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnCustomerGatewayCmd.java similarity index 96% rename from api/src/org/apache/cloudstack/api/user/vpn/command/DeleteVpnCustomerGatewayCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnCustomerGatewayCmd.java index 7002d93e261..f6c25bf2b0c 100644 --- a/api/src/org/apache/cloudstack/api/user/vpn/command/DeleteVpnCustomerGatewayCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnCustomerGatewayCmd.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.vpn.command; +package org.apache.cloudstack.api.command.user.vpn; import org.apache.log4j.Logger; @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.network.Site2SiteCustomerGateway; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/user/vpn/command/DeleteVpnGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnGatewayCmd.java similarity index 96% rename from api/src/org/apache/cloudstack/api/user/vpn/command/DeleteVpnGatewayCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnGatewayCmd.java index b5c4c9f35d2..fcc3c9b8783 100644 --- a/api/src/org/apache/cloudstack/api/user/vpn/command/DeleteVpnGatewayCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteVpnGatewayCmd.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.vpn.command; +package org.apache.cloudstack.api.command.user.vpn; import org.apache.log4j.Logger; @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.network.Site2SiteVpnGateway; import com.cloud.user.Account; diff --git a/api/src/org/apache/cloudstack/api/user/vpn/command/ListRemoteAccessVpnsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.java similarity index 94% rename from api/src/org/apache/cloudstack/api/user/vpn/command/ListRemoteAccessVpnsCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.java index 1125fbab981..210b864e240 100644 --- a/api/src/org/apache/cloudstack/api/user/vpn/command/ListRemoteAccessVpnsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpn/ListRemoteAccessVpnsCmd.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.vpn.command; +package org.apache.cloudstack.api.command.user.vpn; import java.util.ArrayList; import java.util.List; @@ -26,8 +26,8 @@ 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 com.cloud.api.response.ListResponse; -import com.cloud.api.response.RemoteAccessVpnResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.RemoteAccessVpnResponse; import com.cloud.network.RemoteAccessVpn; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/user/vpn/command/ListVpnConnectionsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnConnectionsCmd.java similarity index 95% rename from api/src/org/apache/cloudstack/api/user/vpn/command/ListVpnConnectionsCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnConnectionsCmd.java index 276cbc0a8ee..36bc89c6d75 100644 --- a/api/src/org/apache/cloudstack/api/user/vpn/command/ListVpnConnectionsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnConnectionsCmd.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.vpn.command; +package org.apache.cloudstack.api.command.user.vpn; import java.util.ArrayList; import java.util.List; @@ -26,8 +26,8 @@ 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 com.cloud.api.response.ListResponse; -import com.cloud.api.response.Site2SiteVpnConnectionResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.Site2SiteVpnConnectionResponse; import com.cloud.network.Site2SiteVpnConnection; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/user/vpn/command/ListVpnCustomerGatewaysCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnCustomerGatewaysCmd.java similarity index 94% rename from api/src/org/apache/cloudstack/api/user/vpn/command/ListVpnCustomerGatewaysCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnCustomerGatewaysCmd.java index 474cc151906..b1836e99d7b 100644 --- a/api/src/org/apache/cloudstack/api/user/vpn/command/ListVpnCustomerGatewaysCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnCustomerGatewaysCmd.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.vpn.command; +package org.apache.cloudstack.api.command.user.vpn; import java.util.ArrayList; import java.util.List; @@ -26,8 +26,8 @@ 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 com.cloud.api.response.ListResponse; -import com.cloud.api.response.Site2SiteCustomerGatewayResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.Site2SiteCustomerGatewayResponse; import com.cloud.network.Site2SiteCustomerGateway; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/user/vpn/command/ListVpnGatewaysCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnGatewaysCmd.java similarity index 95% rename from api/src/org/apache/cloudstack/api/user/vpn/command/ListVpnGatewaysCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnGatewaysCmd.java index 05075025250..239d5033745 100644 --- a/api/src/org/apache/cloudstack/api/user/vpn/command/ListVpnGatewaysCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnGatewaysCmd.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.vpn.command; +package org.apache.cloudstack.api.command.user.vpn; import java.util.ArrayList; import java.util.List; @@ -26,8 +26,8 @@ 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 com.cloud.api.response.ListResponse; -import com.cloud.api.response.Site2SiteVpnGatewayResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.Site2SiteVpnGatewayResponse; import com.cloud.network.Site2SiteVpnGateway; import com.cloud.utils.Pair; diff --git a/api/src/org/apache/cloudstack/api/user/vpn/command/ResetVpnConnectionCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/ResetVpnConnectionCmd.java similarity index 97% rename from api/src/org/apache/cloudstack/api/user/vpn/command/ResetVpnConnectionCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vpn/ResetVpnConnectionCmd.java index 8be9d9296c5..6d6f240efc0 100644 --- a/api/src/org/apache/cloudstack/api/user/vpn/command/ResetVpnConnectionCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpn/ResetVpnConnectionCmd.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.vpn.command; +package org.apache.cloudstack.api.command.user.vpn; import org.apache.log4j.Logger; @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.Site2SiteVpnConnectionResponse; +import org.apache.cloudstack.api.response.Site2SiteVpnConnectionResponse; import com.cloud.event.EventTypes; import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.Site2SiteVpnConnection; diff --git a/api/src/org/apache/cloudstack/api/user/vpn/command/UpdateVpnCustomerGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/vpn/command/UpdateVpnCustomerGatewayCmd.java rename to api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java index 760599896f9..7520c6dc2a8 100644 --- a/api/src/org/apache/cloudstack/api/user/vpn/command/UpdateVpnCustomerGatewayCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.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.vpn.command; +package org.apache.cloudstack.api.command.user.vpn; import org.apache.log4j.Logger; @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.Site2SiteCustomerGatewayResponse; +import org.apache.cloudstack.api.response.Site2SiteCustomerGatewayResponse; import com.cloud.event.EventTypes; import com.cloud.network.Site2SiteCustomerGateway; import com.cloud.user.UserContext; diff --git a/api/src/org/apache/cloudstack/api/user/zone/command/ListZonesByCmd.java b/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java old mode 100755 new mode 100644 similarity index 95% rename from api/src/org/apache/cloudstack/api/user/zone/command/ListZonesByCmd.java rename to api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java index 16403b840b6..7bb6549514d --- a/api/src/org/apache/cloudstack/api/user/zone/command/ListZonesByCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.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.zone.command; +package org.apache.cloudstack.api.command.user.zone; import java.util.ArrayList; import java.util.List; @@ -26,8 +26,8 @@ import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.ZoneResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.ZoneResponse; import com.cloud.dc.DataCenter; @Implementation(description="Lists zones", responseObject=ZoneResponse.class) diff --git a/api/src/com/cloud/api/response/AccountResponse.java b/api/src/org/apache/cloudstack/api/response/AccountResponse.java old mode 100755 new mode 100644 similarity index 99% rename from api/src/com/cloud/api/response/AccountResponse.java rename to api/src/org/apache/cloudstack/api/response/AccountResponse.java index 169dba28816..3fa5f7ed8d6 --- a/api/src/com/cloud/api/response/AccountResponse.java +++ b/api/src/org/apache/cloudstack/api/response/AccountResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.List; import java.util.Map; @@ -23,6 +23,7 @@ import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; import com.cloud.utils.IdentityProxy; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; @SuppressWarnings("unused") public class AccountResponse extends BaseResponse { diff --git a/api/src/com/cloud/api/response/AlertResponse.java b/api/src/org/apache/cloudstack/api/response/AlertResponse.java similarity index 96% rename from api/src/com/cloud/api/response/AlertResponse.java rename to api/src/org/apache/cloudstack/api/response/AlertResponse.java index dc97dc8a8dd..c35aad21bc8 100644 --- a/api/src/com/cloud/api/response/AlertResponse.java +++ b/api/src/org/apache/cloudstack/api/response/AlertResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.Date; @@ -22,6 +22,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.BaseResponse; @SuppressWarnings("unused") public class AlertResponse extends BaseResponse { diff --git a/api/src/com/cloud/api/response/AsyncJobResponse.java b/api/src/org/apache/cloudstack/api/response/AsyncJobResponse.java similarity index 98% rename from api/src/com/cloud/api/response/AsyncJobResponse.java rename to api/src/org/apache/cloudstack/api/response/AsyncJobResponse.java index 9dc43130631..d255ec42359 100644 --- a/api/src/com/cloud/api/response/AsyncJobResponse.java +++ b/api/src/org/apache/cloudstack/api/response/AsyncJobResponse.java @@ -14,11 +14,12 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.Date; import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.ResponseObject; import com.cloud.async.AsyncJob; import com.cloud.serializer.Param; diff --git a/api/src/com/cloud/api/response/AutoScalePolicyResponse.java b/api/src/org/apache/cloudstack/api/response/AutoScalePolicyResponse.java similarity index 97% rename from api/src/com/cloud/api/response/AutoScalePolicyResponse.java rename to api/src/org/apache/cloudstack/api/response/AutoScalePolicyResponse.java index 52a2f93ef94..681147f6d0a 100644 --- a/api/src/com/cloud/api/response/AutoScalePolicyResponse.java +++ b/api/src/org/apache/cloudstack/api/response/AutoScalePolicyResponse.java @@ -14,12 +14,13 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; 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.BaseResponse; import java.util.List; diff --git a/api/src/com/cloud/api/response/AutoScaleVmGroupResponse.java b/api/src/org/apache/cloudstack/api/response/AutoScaleVmGroupResponse.java similarity index 98% rename from api/src/com/cloud/api/response/AutoScaleVmGroupResponse.java rename to api/src/org/apache/cloudstack/api/response/AutoScaleVmGroupResponse.java index e3955778575..6f2a28df87f 100644 --- a/api/src/com/cloud/api/response/AutoScaleVmGroupResponse.java +++ b/api/src/org/apache/cloudstack/api/response/AutoScaleVmGroupResponse.java @@ -14,12 +14,13 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; 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.BaseResponse; import java.util.List; diff --git a/api/src/com/cloud/api/response/AutoScaleVmProfileResponse.java b/api/src/org/apache/cloudstack/api/response/AutoScaleVmProfileResponse.java similarity index 98% rename from api/src/com/cloud/api/response/AutoScaleVmProfileResponse.java rename to api/src/org/apache/cloudstack/api/response/AutoScaleVmProfileResponse.java index 1d0525b475f..7205daa7ad3 100644 --- a/api/src/com/cloud/api/response/AutoScaleVmProfileResponse.java +++ b/api/src/org/apache/cloudstack/api/response/AutoScaleVmProfileResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.HashMap; import java.util.List; @@ -22,6 +22,7 @@ import java.util.Map; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseCmd.CommandType; +import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.Parameter; import com.cloud.serializer.Param; import com.cloud.utils.IdentityProxy; diff --git a/api/src/com/cloud/api/response/CapabilitiesResponse.java b/api/src/org/apache/cloudstack/api/response/CapabilitiesResponse.java similarity index 97% rename from api/src/com/cloud/api/response/CapabilitiesResponse.java rename to api/src/org/apache/cloudstack/api/response/CapabilitiesResponse.java index fbcb385de01..20d160dd2d5 100644 --- a/api/src/com/cloud/api/response/CapabilitiesResponse.java +++ b/api/src/org/apache/cloudstack/api/response/CapabilitiesResponse.java @@ -14,11 +14,12 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; @SuppressWarnings("unused") public class CapabilitiesResponse extends BaseResponse { diff --git a/api/src/com/cloud/api/response/CapabilityResponse.java b/api/src/org/apache/cloudstack/api/response/CapabilityResponse.java similarity index 95% rename from api/src/com/cloud/api/response/CapabilityResponse.java rename to api/src/org/apache/cloudstack/api/response/CapabilityResponse.java index adb3b26895e..5fe3072fe87 100644 --- a/api/src/com/cloud/api/response/CapabilityResponse.java +++ b/api/src/org/apache/cloudstack/api/response/CapabilityResponse.java @@ -14,11 +14,12 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; public class CapabilityResponse extends BaseResponse { diff --git a/api/src/com/cloud/api/response/CapacityResponse.java b/api/src/org/apache/cloudstack/api/response/CapacityResponse.java old mode 100755 new mode 100644 similarity index 97% rename from api/src/com/cloud/api/response/CapacityResponse.java rename to api/src/org/apache/cloudstack/api/response/CapacityResponse.java index a631bf0d274..a826d5594c4 --- a/api/src/com/cloud/api/response/CapacityResponse.java +++ b/api/src/org/apache/cloudstack/api/response/CapacityResponse.java @@ -14,12 +14,13 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; 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.BaseResponse; public class CapacityResponse extends BaseResponse { @SerializedName(ApiConstants.TYPE) @Param(description="the capacity type") diff --git a/api/src/com/cloud/api/response/CloudIdentifierResponse.java b/api/src/org/apache/cloudstack/api/response/CloudIdentifierResponse.java similarity index 95% rename from api/src/com/cloud/api/response/CloudIdentifierResponse.java rename to api/src/org/apache/cloudstack/api/response/CloudIdentifierResponse.java index a6e6b375ebf..2da1221b804 100644 --- a/api/src/com/cloud/api/response/CloudIdentifierResponse.java +++ b/api/src/org/apache/cloudstack/api/response/CloudIdentifierResponse.java @@ -14,12 +14,13 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; 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.BaseResponse; public class CloudIdentifierResponse extends BaseResponse { diff --git a/api/src/com/cloud/api/response/ClusterResponse.java b/api/src/org/apache/cloudstack/api/response/ClusterResponse.java old mode 100755 new mode 100644 similarity index 97% rename from api/src/com/cloud/api/response/ClusterResponse.java rename to api/src/org/apache/cloudstack/api/response/ClusterResponse.java index 811731cbe10..f6578558e84 --- a/api/src/com/cloud/api/response/ClusterResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ClusterResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.ArrayList; import java.util.List; @@ -23,6 +23,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.BaseResponse; public class ClusterResponse extends BaseResponse { @SerializedName(ApiConstants.ID) @Param(description="the cluster ID") diff --git a/api/src/com/cloud/api/response/ConditionResponse.java b/api/src/org/apache/cloudstack/api/response/ConditionResponse.java similarity index 97% rename from api/src/com/cloud/api/response/ConditionResponse.java rename to api/src/org/apache/cloudstack/api/response/ConditionResponse.java index 3f846ed54c2..144d4f33066 100644 --- a/api/src/com/cloud/api/response/ConditionResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ConditionResponse.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.List; @@ -23,6 +23,7 @@ import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; import com.cloud.utils.IdentityProxy; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; @SuppressWarnings("unused") public class ConditionResponse extends BaseResponse implements ControlledEntityResponse { diff --git a/api/src/com/cloud/api/response/ConfigurationResponse.java b/api/src/org/apache/cloudstack/api/response/ConfigurationResponse.java similarity index 95% rename from api/src/com/cloud/api/response/ConfigurationResponse.java rename to api/src/org/apache/cloudstack/api/response/ConfigurationResponse.java index 9a21f00ae04..ded0fb5fb39 100644 --- a/api/src/com/cloud/api/response/ConfigurationResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ConfigurationResponse.java @@ -14,11 +14,12 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; public class ConfigurationResponse extends BaseResponse { @SerializedName(ApiConstants.CATEGORY) @Param(description="the category of the configuration") diff --git a/api/src/com/cloud/api/response/ControlledEntityResponse.java b/api/src/org/apache/cloudstack/api/response/ControlledEntityResponse.java similarity index 96% rename from api/src/com/cloud/api/response/ControlledEntityResponse.java rename to api/src/org/apache/cloudstack/api/response/ControlledEntityResponse.java index f44efa48159..250e432961a 100644 --- a/api/src/com/cloud/api/response/ControlledEntityResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ControlledEntityResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; public interface ControlledEntityResponse { diff --git a/api/src/com/cloud/api/response/ControlledViewEntityResponse.java b/api/src/org/apache/cloudstack/api/response/ControlledViewEntityResponse.java similarity index 96% rename from api/src/com/cloud/api/response/ControlledViewEntityResponse.java rename to api/src/org/apache/cloudstack/api/response/ControlledViewEntityResponse.java index 471a8d1000d..116863256a9 100644 --- a/api/src/com/cloud/api/response/ControlledViewEntityResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ControlledViewEntityResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; public interface ControlledViewEntityResponse { diff --git a/api/src/com/cloud/api/response/CounterResponse.java b/api/src/org/apache/cloudstack/api/response/CounterResponse.java similarity index 95% rename from api/src/com/cloud/api/response/CounterResponse.java rename to api/src/org/apache/cloudstack/api/response/CounterResponse.java index 3aca3fcd90f..5260f1e8f55 100644 --- a/api/src/com/cloud/api/response/CounterResponse.java +++ b/api/src/org/apache/cloudstack/api/response/CounterResponse.java @@ -15,12 +15,13 @@ // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; import com.cloud.utils.IdentityProxy; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; @SuppressWarnings("unused") public class CounterResponse extends BaseResponse { diff --git a/api/src/com/cloud/api/response/CreateCmdResponse.java b/api/src/org/apache/cloudstack/api/response/CreateCmdResponse.java similarity index 93% rename from api/src/com/cloud/api/response/CreateCmdResponse.java rename to api/src/org/apache/cloudstack/api/response/CreateCmdResponse.java index 7dd922b7efa..3c26324e10b 100644 --- a/api/src/com/cloud/api/response/CreateCmdResponse.java +++ b/api/src/org/apache/cloudstack/api/response/CreateCmdResponse.java @@ -14,11 +14,12 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import org.apache.cloudstack.api.ApiConstants; import com.cloud.utils.IdentityProxy; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; public class CreateCmdResponse extends BaseResponse { @SerializedName(ApiConstants.ID) diff --git a/api/src/com/cloud/api/response/CustomCertificateResponse.java b/api/src/org/apache/cloudstack/api/response/CustomCertificateResponse.java similarity index 81% rename from api/src/com/cloud/api/response/CustomCertificateResponse.java rename to api/src/org/apache/cloudstack/api/response/CustomCertificateResponse.java index 0738c33e271..f45b0c8e49b 100644 --- a/api/src/com/cloud/api/response/CustomCertificateResponse.java +++ b/api/src/org/apache/cloudstack/api/response/CustomCertificateResponse.java @@ -14,21 +14,22 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; public class CustomCertificateResponse extends BaseResponse { @SerializedName("message") @Param(description="message of the certificate upload operation") private String message; - public String getResultMessage() { - return message; - } + public String getResultMessage() { + return message; + } - public void setResultMessage(String msg) { - this.message = msg; - } + public void setResultMessage(String msg) { + this.message = msg; + } } diff --git a/api/src/com/cloud/api/response/DiskOfferingResponse.java b/api/src/org/apache/cloudstack/api/response/DiskOfferingResponse.java similarity index 97% rename from api/src/com/cloud/api/response/DiskOfferingResponse.java rename to api/src/org/apache/cloudstack/api/response/DiskOfferingResponse.java index be86ee7394e..96aef99926b 100644 --- a/api/src/com/cloud/api/response/DiskOfferingResponse.java +++ b/api/src/org/apache/cloudstack/api/response/DiskOfferingResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.Date; @@ -22,6 +22,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.BaseResponse; public class DiskOfferingResponse extends BaseResponse { @SerializedName(ApiConstants.ID) @Param(description="unique ID of the disk offering") diff --git a/api/src/com/cloud/api/response/DomainResponse.java b/api/src/org/apache/cloudstack/api/response/DomainResponse.java similarity index 97% rename from api/src/com/cloud/api/response/DomainResponse.java rename to api/src/org/apache/cloudstack/api/response/DomainResponse.java index 4568f910695..e97653ba777 100644 --- a/api/src/com/cloud/api/response/DomainResponse.java +++ b/api/src/org/apache/cloudstack/api/response/DomainResponse.java @@ -14,9 +14,10 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.Entity; import com.cloud.domain.Domain; import com.cloud.utils.IdentityProxy; diff --git a/api/src/com/cloud/api/response/DomainRouterResponse.java b/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java similarity index 99% rename from api/src/com/cloud/api/response/DomainRouterResponse.java rename to api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java index 6db46fad429..b899a1d1257 100644 --- a/api/src/com/cloud/api/response/DomainRouterResponse.java +++ b/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java @@ -14,19 +14,18 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.Date; -import java.util.List; import java.util.HashSet; import java.util.Set; import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; -import com.cloud.utils.IdentityProxy; import com.cloud.vm.VirtualMachine.State; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; @SuppressWarnings("unused") public class DomainRouterResponse extends BaseResponse implements ControlledViewEntityResponse{ diff --git a/api/src/com/cloud/api/response/EventResponse.java b/api/src/org/apache/cloudstack/api/response/EventResponse.java similarity index 97% rename from api/src/com/cloud/api/response/EventResponse.java rename to api/src/org/apache/cloudstack/api/response/EventResponse.java index 990f196986c..641b586853f 100644 --- a/api/src/com/cloud/api/response/EventResponse.java +++ b/api/src/org/apache/cloudstack/api/response/EventResponse.java @@ -14,15 +14,15 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.Date; import org.apache.cloudstack.api.ApiConstants; -import com.cloud.utils.IdentityProxy; import com.cloud.event.Event; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; @SuppressWarnings("unused") public class EventResponse extends BaseResponse implements ControlledViewEntityResponse{ diff --git a/api/src/com/cloud/api/response/EventTypeResponse.java b/api/src/org/apache/cloudstack/api/response/EventTypeResponse.java similarity index 93% rename from api/src/com/cloud/api/response/EventTypeResponse.java rename to api/src/org/apache/cloudstack/api/response/EventTypeResponse.java index 72adcd8f215..4dcc44179a6 100644 --- a/api/src/com/cloud/api/response/EventTypeResponse.java +++ b/api/src/org/apache/cloudstack/api/response/EventTypeResponse.java @@ -14,11 +14,12 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; public class EventTypeResponse extends BaseResponse { @SerializedName(ApiConstants.NAME) @Param(description="Event Type") diff --git a/api/src/com/cloud/api/response/ExceptionResponse.java b/api/src/org/apache/cloudstack/api/response/ExceptionResponse.java similarity index 96% rename from api/src/com/cloud/api/response/ExceptionResponse.java rename to api/src/org/apache/cloudstack/api/response/ExceptionResponse.java index 995f5c448ed..a4050a24af4 100644 --- a/api/src/com/cloud/api/response/ExceptionResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ExceptionResponse.java @@ -14,13 +14,14 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.ArrayList; import com.cloud.serializer.Param; import com.cloud.utils.IdentityProxy; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; public class ExceptionResponse extends BaseResponse { diff --git a/api/src/com/cloud/api/response/ExtractResponse.java b/api/src/org/apache/cloudstack/api/response/ExtractResponse.java old mode 100755 new mode 100644 similarity index 98% rename from api/src/com/cloud/api/response/ExtractResponse.java rename to api/src/org/apache/cloudstack/api/response/ExtractResponse.java index 5d9fde9514f..ac5cc3d3e79 --- a/api/src/com/cloud/api/response/ExtractResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ExtractResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.Date; @@ -22,6 +22,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.BaseResponse; public class ExtractResponse extends BaseResponse { @SerializedName(ApiConstants.ID) @Param(description="the id of extracted object") diff --git a/api/src/com/cloud/api/response/FirewallResponse.java b/api/src/org/apache/cloudstack/api/response/FirewallResponse.java similarity index 97% rename from api/src/com/cloud/api/response/FirewallResponse.java rename to api/src/org/apache/cloudstack/api/response/FirewallResponse.java index fa9ebdf6090..eb5ba89f566 100644 --- a/api/src/com/cloud/api/response/FirewallResponse.java +++ b/api/src/org/apache/cloudstack/api/response/FirewallResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.List; @@ -22,6 +22,7 @@ import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; import com.cloud.utils.IdentityProxy; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; @SuppressWarnings("unused") public class FirewallResponse extends BaseResponse { diff --git a/api/src/com/cloud/api/response/FirewallRuleResponse.java b/api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java similarity index 97% rename from api/src/com/cloud/api/response/FirewallRuleResponse.java rename to api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java index adf735316d3..718fb966f8e 100644 --- a/api/src/com/cloud/api/response/FirewallRuleResponse.java +++ b/api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.List; @@ -22,9 +22,10 @@ import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; import com.cloud.utils.IdentityProxy; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; @SuppressWarnings("unused") -public class FirewallRuleResponse extends BaseResponse{ +public class FirewallRuleResponse extends BaseResponse { @SerializedName(ApiConstants.ID) @Param(description="the ID of the port forwarding rule") private IdentityProxy id = new IdentityProxy("firewall_rules"); diff --git a/api/src/com/cloud/api/response/GetVMPasswordResponse.java b/api/src/org/apache/cloudstack/api/response/GetVMPasswordResponse.java similarity index 58% rename from api/src/com/cloud/api/response/GetVMPasswordResponse.java rename to api/src/org/apache/cloudstack/api/response/GetVMPasswordResponse.java index c9638fff3f6..8147df3fae1 100644 --- a/api/src/com/cloud/api/response/GetVMPasswordResponse.java +++ b/api/src/org/apache/cloudstack/api/response/GetVMPasswordResponse.java @@ -14,30 +14,31 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; public class GetVMPasswordResponse extends BaseResponse { - @SerializedName("encryptedpassword") @Param(description="The encrypted password of the VM") - private String encryptedPassword; + @SerializedName("encryptedpassword") @Param(description="The encrypted password of the VM") + private String encryptedPassword; - public GetVMPasswordResponse() {} + public GetVMPasswordResponse() {} - public GetVMPasswordResponse(String responseName, String encryptedPassword) { - setResponseName(responseName); - setObjectName("password"); - setEncryptedPassword(encryptedPassword); - } + public GetVMPasswordResponse(String responseName, String encryptedPassword) { + setResponseName(responseName); + setObjectName("password"); + setEncryptedPassword(encryptedPassword); + } - public String getEncryptedPassword() { - return encryptedPassword; - } + public String getEncryptedPassword() { + return encryptedPassword; + } - public void setEncryptedPassword(String encryptedPassword) { - this.encryptedPassword = encryptedPassword; - } + public void setEncryptedPassword(String encryptedPassword) { + this.encryptedPassword = encryptedPassword; + } } diff --git a/api/src/com/cloud/api/response/GuestOSCategoryResponse.java b/api/src/org/apache/cloudstack/api/response/GuestOSCategoryResponse.java similarity index 94% rename from api/src/com/cloud/api/response/GuestOSCategoryResponse.java rename to api/src/org/apache/cloudstack/api/response/GuestOSCategoryResponse.java index 1f7e7ad0e0e..a2716862bf1 100644 --- a/api/src/com/cloud/api/response/GuestOSCategoryResponse.java +++ b/api/src/org/apache/cloudstack/api/response/GuestOSCategoryResponse.java @@ -14,12 +14,13 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; 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.BaseResponse; public class GuestOSCategoryResponse extends BaseResponse { @SerializedName(ApiConstants.ID) @Param(description="the ID of the OS category") diff --git a/api/src/com/cloud/api/response/GuestOSResponse.java b/api/src/org/apache/cloudstack/api/response/GuestOSResponse.java similarity index 95% rename from api/src/com/cloud/api/response/GuestOSResponse.java rename to api/src/org/apache/cloudstack/api/response/GuestOSResponse.java index c747df4e735..6c154809f7f 100644 --- a/api/src/com/cloud/api/response/GuestOSResponse.java +++ b/api/src/org/apache/cloudstack/api/response/GuestOSResponse.java @@ -14,12 +14,13 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; 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.BaseResponse; public class GuestOSResponse extends BaseResponse { @SerializedName(ApiConstants.ID) @Param(description="the ID of the OS type") diff --git a/api/src/com/cloud/api/response/HostResponse.java b/api/src/org/apache/cloudstack/api/response/HostResponse.java old mode 100755 new mode 100644 similarity index 99% rename from api/src/com/cloud/api/response/HostResponse.java rename to api/src/org/apache/cloudstack/api/response/HostResponse.java index db0b26a00e6..8b4cd3eeb95 --- a/api/src/com/cloud/api/response/HostResponse.java +++ b/api/src/org/apache/cloudstack/api/response/HostResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.Date; @@ -25,6 +25,7 @@ import com.cloud.host.Status; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; public class HostResponse extends BaseResponse { @SerializedName(ApiConstants.ID) @Param(description="the ID of the host") diff --git a/api/src/com/cloud/api/response/HypervisorCapabilitiesResponse.java b/api/src/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java similarity index 96% rename from api/src/com/cloud/api/response/HypervisorCapabilitiesResponse.java rename to api/src/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java index d06cceaece9..a4abb93fe9e 100644 --- a/api/src/com/cloud/api/response/HypervisorCapabilitiesResponse.java +++ b/api/src/org/apache/cloudstack/api/response/HypervisorCapabilitiesResponse.java @@ -14,13 +14,14 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import org.apache.cloudstack.api.ApiConstants; import com.cloud.utils.IdentityProxy; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; public class HypervisorCapabilitiesResponse extends BaseResponse { @SerializedName(ApiConstants.ID) @Param(description="the ID of the hypervisor capabilities row") diff --git a/api/src/com/cloud/api/response/HypervisorResponse.java b/api/src/org/apache/cloudstack/api/response/HypervisorResponse.java similarity index 93% rename from api/src/com/cloud/api/response/HypervisorResponse.java rename to api/src/org/apache/cloudstack/api/response/HypervisorResponse.java index 1270a58e031..3828539746b 100644 --- a/api/src/com/cloud/api/response/HypervisorResponse.java +++ b/api/src/org/apache/cloudstack/api/response/HypervisorResponse.java @@ -14,11 +14,12 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; public class HypervisorResponse extends BaseResponse { @SerializedName(ApiConstants.NAME) @Param(description="Hypervisor name") diff --git a/api/src/com/cloud/api/response/IPAddressResponse.java b/api/src/org/apache/cloudstack/api/response/IPAddressResponse.java similarity index 98% rename from api/src/com/cloud/api/response/IPAddressResponse.java rename to api/src/org/apache/cloudstack/api/response/IPAddressResponse.java index a8294dfeb56..15ac72d5b2c 100644 --- a/api/src/com/cloud/api/response/IPAddressResponse.java +++ b/api/src/org/apache/cloudstack/api/response/IPAddressResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.Date; import java.util.List; @@ -23,6 +23,7 @@ import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; import com.cloud.utils.IdentityProxy; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; @SuppressWarnings("unused") public class IPAddressResponse extends BaseResponse implements ControlledEntityResponse { diff --git a/api/src/com/cloud/api/response/InstanceGroupResponse.java b/api/src/org/apache/cloudstack/api/response/InstanceGroupResponse.java similarity index 97% rename from api/src/com/cloud/api/response/InstanceGroupResponse.java rename to api/src/org/apache/cloudstack/api/response/InstanceGroupResponse.java index ec450c39c62..ec92397e31e 100644 --- a/api/src/com/cloud/api/response/InstanceGroupResponse.java +++ b/api/src/org/apache/cloudstack/api/response/InstanceGroupResponse.java @@ -14,11 +14,12 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.Date; import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.Entity; import com.cloud.vm.InstanceGroup; import com.cloud.utils.IdentityProxy; diff --git a/api/src/com/cloud/api/response/IpForwardingRuleResponse.java b/api/src/org/apache/cloudstack/api/response/IpForwardingRuleResponse.java similarity index 97% rename from api/src/com/cloud/api/response/IpForwardingRuleResponse.java rename to api/src/org/apache/cloudstack/api/response/IpForwardingRuleResponse.java index 65a349ab9ee..f3ae797fb5d 100644 --- a/api/src/com/cloud/api/response/IpForwardingRuleResponse.java +++ b/api/src/org/apache/cloudstack/api/response/IpForwardingRuleResponse.java @@ -14,12 +14,13 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; 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.BaseResponse; public class IpForwardingRuleResponse extends BaseResponse { @SerializedName(ApiConstants.ID) @Param(description="the ID of the port forwarding rule") diff --git a/api/src/com/cloud/api/response/IsoVmResponse.java b/api/src/org/apache/cloudstack/api/response/IsoVmResponse.java old mode 100755 new mode 100644 similarity index 97% rename from api/src/com/cloud/api/response/IsoVmResponse.java rename to api/src/org/apache/cloudstack/api/response/IsoVmResponse.java index fb5fa86b42f..53174d1cdcf --- a/api/src/com/cloud/api/response/IsoVmResponse.java +++ b/api/src/org/apache/cloudstack/api/response/IsoVmResponse.java @@ -14,11 +14,12 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import com.cloud.utils.IdentityProxy; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; public class IsoVmResponse extends BaseResponse { @SerializedName("id") @Param(description="the ISO ID") diff --git a/api/src/com/cloud/api/response/LBStickinessPolicyResponse.java b/api/src/org/apache/cloudstack/api/response/LBStickinessPolicyResponse.java similarity index 97% rename from api/src/com/cloud/api/response/LBStickinessPolicyResponse.java rename to api/src/org/apache/cloudstack/api/response/LBStickinessPolicyResponse.java index a6743a78ceb..bfb91b08d14 100644 --- a/api/src/com/cloud/api/response/LBStickinessPolicyResponse.java +++ b/api/src/org/apache/cloudstack/api/response/LBStickinessPolicyResponse.java @@ -14,13 +14,14 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import com.cloud.utils.IdentityProxy; import com.cloud.network.rules.StickinessPolicy; import com.cloud.serializer.Param; import com.cloud.utils.Pair; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; import java.util.List; import java.util.Map; diff --git a/api/src/com/cloud/api/response/LBStickinessResponse.java b/api/src/org/apache/cloudstack/api/response/LBStickinessResponse.java similarity index 97% rename from api/src/com/cloud/api/response/LBStickinessResponse.java rename to api/src/org/apache/cloudstack/api/response/LBStickinessResponse.java index ea3be69cb36..6b4143b660d 100644 --- a/api/src/com/cloud/api/response/LBStickinessResponse.java +++ b/api/src/org/apache/cloudstack/api/response/LBStickinessResponse.java @@ -14,12 +14,13 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; 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.BaseResponse; import java.util.List; diff --git a/api/src/com/cloud/api/response/LDAPConfigResponse.java b/api/src/org/apache/cloudstack/api/response/LDAPConfigResponse.java similarity index 97% rename from api/src/com/cloud/api/response/LDAPConfigResponse.java rename to api/src/org/apache/cloudstack/api/response/LDAPConfigResponse.java index db89bdf7c78..e851e38e2bd 100644 --- a/api/src/com/cloud/api/response/LDAPConfigResponse.java +++ b/api/src/org/apache/cloudstack/api/response/LDAPConfigResponse.java @@ -14,11 +14,12 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; public class LDAPConfigResponse extends BaseResponse { diff --git a/api/src/com/cloud/api/response/LDAPRemoveResponse.java b/api/src/org/apache/cloudstack/api/response/LDAPRemoveResponse.java similarity index 85% rename from api/src/com/cloud/api/response/LDAPRemoveResponse.java rename to api/src/org/apache/cloudstack/api/response/LDAPRemoveResponse.java index aaa529738b4..0feec5bc5b5 100644 --- a/api/src/com/cloud/api/response/LDAPRemoveResponse.java +++ b/api/src/org/apache/cloudstack/api/response/LDAPRemoveResponse.java @@ -14,11 +14,13 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; + +import org.apache.cloudstack.api.BaseResponse; public class LDAPRemoveResponse extends BaseResponse { - public LDAPRemoveResponse(){ - super(); - } + public LDAPRemoveResponse(){ + super(); + } } diff --git a/api/src/com/cloud/api/response/ListResponse.java b/api/src/org/apache/cloudstack/api/response/ListResponse.java similarity index 94% rename from api/src/com/cloud/api/response/ListResponse.java rename to api/src/org/apache/cloudstack/api/response/ListResponse.java index 5c8e83c1651..3f28887f95e 100644 --- a/api/src/com/cloud/api/response/ListResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ListResponse.java @@ -14,10 +14,11 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.List; +import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.ResponseObject; public class ListResponse extends BaseResponse { diff --git a/api/src/com/cloud/api/response/LoadBalancerResponse.java b/api/src/org/apache/cloudstack/api/response/LoadBalancerResponse.java similarity index 98% rename from api/src/com/cloud/api/response/LoadBalancerResponse.java rename to api/src/org/apache/cloudstack/api/response/LoadBalancerResponse.java index 6b104f5fbdf..6e02b70d8de 100644 --- a/api/src/com/cloud/api/response/LoadBalancerResponse.java +++ b/api/src/org/apache/cloudstack/api/response/LoadBalancerResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.List; @@ -22,6 +22,7 @@ import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; import com.cloud.utils.IdentityProxy; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; @SuppressWarnings("unused") public class LoadBalancerResponse extends BaseResponse implements ControlledEntityResponse { diff --git a/api/src/com/cloud/api/response/NetworkACLResponse.java b/api/src/org/apache/cloudstack/api/response/NetworkACLResponse.java similarity index 97% rename from api/src/com/cloud/api/response/NetworkACLResponse.java rename to api/src/org/apache/cloudstack/api/response/NetworkACLResponse.java index fc567d5b57a..1b670218814 100644 --- a/api/src/com/cloud/api/response/NetworkACLResponse.java +++ b/api/src/org/apache/cloudstack/api/response/NetworkACLResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.List; @@ -22,6 +22,7 @@ import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; import com.cloud.utils.IdentityProxy; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; @SuppressWarnings("unused") public class NetworkACLResponse extends BaseResponse { diff --git a/api/src/org/apache/cloudstack/api/response/NetworkDeviceResponse.java b/api/src/org/apache/cloudstack/api/response/NetworkDeviceResponse.java index c7fb7e842b6..30900e382e6 100644 --- a/api/src/org/apache/cloudstack/api/response/NetworkDeviceResponse.java +++ b/api/src/org/apache/cloudstack/api/response/NetworkDeviceResponse.java @@ -18,20 +18,20 @@ package org.apache.cloudstack.api.response; import org.apache.cloudstack.api.ApiConstants; import com.cloud.utils.IdentityProxy; -import com.cloud.api.response.BaseResponse; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; public class NetworkDeviceResponse extends BaseResponse { - @SerializedName(ApiConstants.ID) - @Param(description = "the ID of the network device") - private IdentityProxy id = new IdentityProxy("host"); + @SerializedName(ApiConstants.ID) + @Param(description = "the ID of the network device") + private IdentityProxy id = new IdentityProxy("host"); - public Long getId() { - return id.getValue(); - } + public Long getId() { + return id.getValue(); + } - public void setId(Long id) { - this.id.setValue(id); - } + public void setId(Long id) { + this.id.setValue(id); + } } diff --git a/api/src/com/cloud/api/response/NetworkOfferingResponse.java b/api/src/org/apache/cloudstack/api/response/NetworkOfferingResponse.java similarity index 97% rename from api/src/com/cloud/api/response/NetworkOfferingResponse.java rename to api/src/org/apache/cloudstack/api/response/NetworkOfferingResponse.java index af6bbe1ca88..8fe94a78702 100644 --- a/api/src/com/cloud/api/response/NetworkOfferingResponse.java +++ b/api/src/org/apache/cloudstack/api/response/NetworkOfferingResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.Date; import java.util.List; @@ -23,9 +23,10 @@ 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.BaseResponse; @SuppressWarnings("unused") -public class NetworkOfferingResponse extends BaseResponse{ +public class NetworkOfferingResponse extends BaseResponse { @SerializedName("id") @Param(description="the id of the network offering") private final IdentityProxy id = new IdentityProxy("network_offerings"); diff --git a/api/src/com/cloud/api/response/NetworkResponse.java b/api/src/org/apache/cloudstack/api/response/NetworkResponse.java similarity index 99% rename from api/src/com/cloud/api/response/NetworkResponse.java rename to api/src/org/apache/cloudstack/api/response/NetworkResponse.java index 5b6c4acc895..3f0af615155 100644 --- a/api/src/com/cloud/api/response/NetworkResponse.java +++ b/api/src/org/apache/cloudstack/api/response/NetworkResponse.java @@ -14,11 +14,12 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.List; import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.Entity; import com.cloud.projects.ProjectAccount; import com.cloud.utils.IdentityProxy; diff --git a/api/src/com/cloud/api/response/NicResponse.java b/api/src/org/apache/cloudstack/api/response/NicResponse.java old mode 100755 new mode 100644 similarity index 97% rename from api/src/com/cloud/api/response/NicResponse.java rename to api/src/org/apache/cloudstack/api/response/NicResponse.java index 7001e12c015..1ac00846190 --- a/api/src/com/cloud/api/response/NicResponse.java +++ b/api/src/org/apache/cloudstack/api/response/NicResponse.java @@ -14,11 +14,12 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; @SuppressWarnings("unused") public class NicResponse extends BaseResponse { diff --git a/api/src/com/cloud/api/response/PhysicalNetworkResponse.java b/api/src/org/apache/cloudstack/api/response/PhysicalNetworkResponse.java similarity index 96% rename from api/src/com/cloud/api/response/PhysicalNetworkResponse.java rename to api/src/org/apache/cloudstack/api/response/PhysicalNetworkResponse.java index c39071342dd..3cb479b4610 100644 --- a/api/src/com/cloud/api/response/PhysicalNetworkResponse.java +++ b/api/src/org/apache/cloudstack/api/response/PhysicalNetworkResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.List; @@ -22,9 +22,10 @@ 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.BaseResponse; @SuppressWarnings("unused") -public class PhysicalNetworkResponse extends BaseResponse{ +public class PhysicalNetworkResponse extends BaseResponse { @SerializedName(ApiConstants.ID) @Param(description="the uuid of the physical network") private String id; diff --git a/api/src/com/cloud/api/response/PodResponse.java b/api/src/org/apache/cloudstack/api/response/PodResponse.java old mode 100755 new mode 100644 similarity index 97% rename from api/src/com/cloud/api/response/PodResponse.java rename to api/src/org/apache/cloudstack/api/response/PodResponse.java index c2cb94650a4..1bd94edf632 --- a/api/src/com/cloud/api/response/PodResponse.java +++ b/api/src/org/apache/cloudstack/api/response/PodResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.List; @@ -22,6 +22,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.BaseResponse; public class PodResponse extends BaseResponse { @SerializedName("id") @Param(description="the ID of the Pod") diff --git a/api/src/com/cloud/api/response/PrivateGatewayResponse.java b/api/src/org/apache/cloudstack/api/response/PrivateGatewayResponse.java similarity index 98% rename from api/src/com/cloud/api/response/PrivateGatewayResponse.java rename to api/src/org/apache/cloudstack/api/response/PrivateGatewayResponse.java index 47ed05efd31..ef2d06a4812 100644 --- a/api/src/com/cloud/api/response/PrivateGatewayResponse.java +++ b/api/src/org/apache/cloudstack/api/response/PrivateGatewayResponse.java @@ -14,11 +14,12 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; import com.cloud.utils.IdentityProxy; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; @SuppressWarnings("unused") public class PrivateGatewayResponse extends BaseResponse implements ControlledEntityResponse{ diff --git a/api/src/com/cloud/api/response/ProjectAccountResponse.java b/api/src/org/apache/cloudstack/api/response/ProjectAccountResponse.java similarity index 97% rename from api/src/com/cloud/api/response/ProjectAccountResponse.java rename to api/src/org/apache/cloudstack/api/response/ProjectAccountResponse.java index 61fb7f31aca..c20c0234376 100644 --- a/api/src/com/cloud/api/response/ProjectAccountResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ProjectAccountResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.List; @@ -22,6 +22,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.BaseResponse; @SuppressWarnings("unused") public class ProjectAccountResponse extends BaseResponse implements ControlledEntityResponse { diff --git a/api/src/com/cloud/api/response/ProjectInvitationResponse.java b/api/src/org/apache/cloudstack/api/response/ProjectInvitationResponse.java similarity index 97% rename from api/src/com/cloud/api/response/ProjectInvitationResponse.java rename to api/src/org/apache/cloudstack/api/response/ProjectInvitationResponse.java index 3533fa8f773..80202a51d4c 100644 --- a/api/src/com/cloud/api/response/ProjectInvitationResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ProjectInvitationResponse.java @@ -14,12 +14,13 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; 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.BaseResponse; @SuppressWarnings("unused") public class ProjectInvitationResponse extends BaseResponse implements ControlledEntityResponse{ diff --git a/api/src/com/cloud/api/response/ProjectResponse.java b/api/src/org/apache/cloudstack/api/response/ProjectResponse.java similarity index 95% rename from api/src/com/cloud/api/response/ProjectResponse.java rename to api/src/org/apache/cloudstack/api/response/ProjectResponse.java index e17b9dc5009..dea1a68cdbf 100644 --- a/api/src/com/cloud/api/response/ProjectResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ProjectResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.List; @@ -22,9 +22,10 @@ import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; import com.cloud.utils.IdentityProxy; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; @SuppressWarnings("unused") -public class ProjectResponse extends BaseResponse{ +public class ProjectResponse extends BaseResponse { @SerializedName(ApiConstants.ID) @Param(description="the id of the project") private IdentityProxy id = new IdentityProxy("projects"); diff --git a/api/src/com/cloud/api/response/ProviderResponse.java b/api/src/org/apache/cloudstack/api/response/ProviderResponse.java similarity index 97% rename from api/src/com/cloud/api/response/ProviderResponse.java rename to api/src/org/apache/cloudstack/api/response/ProviderResponse.java index 605d9f84cee..4ff34f7c6b9 100644 --- a/api/src/com/cloud/api/response/ProviderResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ProviderResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.List; @@ -22,6 +22,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.BaseResponse; @SuppressWarnings("unused") public class ProviderResponse extends BaseResponse { diff --git a/api/src/com/cloud/api/response/RegisterResponse.java b/api/src/org/apache/cloudstack/api/response/RegisterResponse.java similarity index 94% rename from api/src/com/cloud/api/response/RegisterResponse.java rename to api/src/org/apache/cloudstack/api/response/RegisterResponse.java index 6f9f3404b31..eee924940fb 100644 --- a/api/src/com/cloud/api/response/RegisterResponse.java +++ b/api/src/org/apache/cloudstack/api/response/RegisterResponse.java @@ -14,10 +14,11 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; public class RegisterResponse extends BaseResponse { @SerializedName("apikey") @Param(description="the api key of the registered user") diff --git a/api/src/com/cloud/api/response/RemoteAccessVpnResponse.java b/api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java similarity index 97% rename from api/src/com/cloud/api/response/RemoteAccessVpnResponse.java rename to api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java index 6a5acaf4569..038ba73bdb2 100644 --- a/api/src/com/cloud/api/response/RemoteAccessVpnResponse.java +++ b/api/src/org/apache/cloudstack/api/response/RemoteAccessVpnResponse.java @@ -14,12 +14,13 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; 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.BaseResponse; @SuppressWarnings("unused") public class RemoteAccessVpnResponse extends BaseResponse implements ControlledEntityResponse{ diff --git a/api/src/com/cloud/api/response/ResourceCountResponse.java b/api/src/org/apache/cloudstack/api/response/ResourceCountResponse.java similarity index 97% rename from api/src/com/cloud/api/response/ResourceCountResponse.java rename to api/src/org/apache/cloudstack/api/response/ResourceCountResponse.java index e308e542eb8..ac3ba4e881f 100644 --- a/api/src/com/cloud/api/response/ResourceCountResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ResourceCountResponse.java @@ -14,12 +14,13 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; 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.BaseResponse; @SuppressWarnings("unused") public class ResourceCountResponse extends BaseResponse implements ControlledEntityResponse{ diff --git a/api/src/com/cloud/api/response/ResourceLimitResponse.java b/api/src/org/apache/cloudstack/api/response/ResourceLimitResponse.java similarity index 96% rename from api/src/com/cloud/api/response/ResourceLimitResponse.java rename to api/src/org/apache/cloudstack/api/response/ResourceLimitResponse.java index 6493917dd76..854ebee0d3b 100644 --- a/api/src/com/cloud/api/response/ResourceLimitResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ResourceLimitResponse.java @@ -14,12 +14,13 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; 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.BaseResponse; @SuppressWarnings("unused") public class ResourceLimitResponse extends BaseResponse implements ControlledEntityResponse { diff --git a/api/src/com/cloud/api/response/ResourceTagResponse.java b/api/src/org/apache/cloudstack/api/response/ResourceTagResponse.java similarity index 97% rename from api/src/com/cloud/api/response/ResourceTagResponse.java rename to api/src/org/apache/cloudstack/api/response/ResourceTagResponse.java index 4f94e999a89..30bcbfd38a2 100644 --- a/api/src/com/cloud/api/response/ResourceTagResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ResourceTagResponse.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 com.cloud.api.response; +package org.apache.cloudstack.api.response; import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; -import com.cloud.utils.IdentityProxy; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; @SuppressWarnings("unused") public class ResourceTagResponse extends BaseResponse implements ControlledViewEntityResponse{ diff --git a/api/src/com/cloud/api/response/SSHKeyPairResponse.java b/api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java similarity index 95% rename from api/src/com/cloud/api/response/SSHKeyPairResponse.java rename to api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java index 4f0bea4021b..606636382a1 100644 --- a/api/src/com/cloud/api/response/SSHKeyPairResponse.java +++ b/api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java @@ -14,11 +14,12 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; public class SSHKeyPairResponse extends BaseResponse { diff --git a/api/src/com/cloud/api/response/SecurityGroupResponse.java b/api/src/org/apache/cloudstack/api/response/SecurityGroupResponse.java similarity index 97% rename from api/src/com/cloud/api/response/SecurityGroupResponse.java rename to api/src/org/apache/cloudstack/api/response/SecurityGroupResponse.java index c4a9b0f520f..6900ca519bf 100644 --- a/api/src/com/cloud/api/response/SecurityGroupResponse.java +++ b/api/src/org/apache/cloudstack/api/response/SecurityGroupResponse.java @@ -14,18 +14,16 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; -import java.util.ArrayList; import java.util.HashSet; -import java.util.List; import java.util.Set; import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.Entity; import com.cloud.network.security.SecurityGroup; import com.cloud.serializer.Param; -import com.cloud.utils.IdentityProxy; import com.google.gson.annotations.SerializedName; @SuppressWarnings("unused") diff --git a/api/src/com/cloud/api/response/SecurityGroupRuleResponse.java b/api/src/org/apache/cloudstack/api/response/SecurityGroupRuleResponse.java similarity index 97% rename from api/src/com/cloud/api/response/SecurityGroupRuleResponse.java rename to api/src/org/apache/cloudstack/api/response/SecurityGroupRuleResponse.java index 8ef39b0260f..206e5fbac83 100644 --- a/api/src/com/cloud/api/response/SecurityGroupRuleResponse.java +++ b/api/src/org/apache/cloudstack/api/response/SecurityGroupRuleResponse.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 com.cloud.api.response; +package org.apache.cloudstack.api.response; 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.BaseResponse; public class SecurityGroupRuleResponse extends BaseResponse { @SerializedName("ruleid") @Param(description="the id of the security group rule") diff --git a/api/src/com/cloud/api/response/ServiceOfferingResponse.java b/api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java similarity index 98% rename from api/src/com/cloud/api/response/ServiceOfferingResponse.java rename to api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java index 2d6a2889893..788d8e8df2d 100644 --- a/api/src/com/cloud/api/response/ServiceOfferingResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.Date; @@ -22,6 +22,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.BaseResponse; public class ServiceOfferingResponse extends BaseResponse { @SerializedName("id") @Param(description="the id of the service offering") diff --git a/api/src/com/cloud/api/response/ServiceResponse.java b/api/src/org/apache/cloudstack/api/response/ServiceResponse.java similarity index 95% rename from api/src/com/cloud/api/response/ServiceResponse.java rename to api/src/org/apache/cloudstack/api/response/ServiceResponse.java index ac7d88b1941..11f7d710383 100644 --- a/api/src/com/cloud/api/response/ServiceResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ServiceResponse.java @@ -14,13 +14,14 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.List; import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; @SuppressWarnings("unused") public class ServiceResponse extends BaseResponse { diff --git a/api/src/com/cloud/api/response/Site2SiteCustomerGatewayResponse.java b/api/src/org/apache/cloudstack/api/response/Site2SiteCustomerGatewayResponse.java similarity index 98% rename from api/src/com/cloud/api/response/Site2SiteCustomerGatewayResponse.java rename to api/src/org/apache/cloudstack/api/response/Site2SiteCustomerGatewayResponse.java index 3b06033fa73..29bfeaafad9 100644 --- a/api/src/com/cloud/api/response/Site2SiteCustomerGatewayResponse.java +++ b/api/src/org/apache/cloudstack/api/response/Site2SiteCustomerGatewayResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.Date; @@ -22,6 +22,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.BaseResponse; @SuppressWarnings("unused") public class Site2SiteCustomerGatewayResponse extends BaseResponse implements ControlledEntityResponse { diff --git a/api/src/com/cloud/api/response/Site2SiteVpnConnectionResponse.java b/api/src/org/apache/cloudstack/api/response/Site2SiteVpnConnectionResponse.java similarity index 98% rename from api/src/com/cloud/api/response/Site2SiteVpnConnectionResponse.java rename to api/src/org/apache/cloudstack/api/response/Site2SiteVpnConnectionResponse.java index 911416bceeb..cbddee7545f 100644 --- a/api/src/com/cloud/api/response/Site2SiteVpnConnectionResponse.java +++ b/api/src/org/apache/cloudstack/api/response/Site2SiteVpnConnectionResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.Date; @@ -22,6 +22,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.BaseResponse; @SuppressWarnings("unused") public class Site2SiteVpnConnectionResponse extends BaseResponse implements ControlledEntityResponse { diff --git a/api/src/com/cloud/api/response/Site2SiteVpnGatewayResponse.java b/api/src/org/apache/cloudstack/api/response/Site2SiteVpnGatewayResponse.java similarity index 97% rename from api/src/com/cloud/api/response/Site2SiteVpnGatewayResponse.java rename to api/src/org/apache/cloudstack/api/response/Site2SiteVpnGatewayResponse.java index 0022019d742..5165912830e 100644 --- a/api/src/com/cloud/api/response/Site2SiteVpnGatewayResponse.java +++ b/api/src/org/apache/cloudstack/api/response/Site2SiteVpnGatewayResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.Date; @@ -22,6 +22,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.BaseResponse; @SuppressWarnings("unused") public class Site2SiteVpnGatewayResponse extends BaseResponse implements ControlledEntityResponse { diff --git a/api/src/com/cloud/api/response/SnapshotPolicyResponse.java b/api/src/org/apache/cloudstack/api/response/SnapshotPolicyResponse.java similarity index 96% rename from api/src/com/cloud/api/response/SnapshotPolicyResponse.java rename to api/src/org/apache/cloudstack/api/response/SnapshotPolicyResponse.java index ac1b6cbe3ae..01eed3c33e8 100644 --- a/api/src/com/cloud/api/response/SnapshotPolicyResponse.java +++ b/api/src/org/apache/cloudstack/api/response/SnapshotPolicyResponse.java @@ -14,11 +14,12 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import com.cloud.utils.IdentityProxy; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; public class SnapshotPolicyResponse extends BaseResponse { @SerializedName("id") @Param(description="the ID of the snapshot policy") diff --git a/api/src/com/cloud/api/response/SnapshotResponse.java b/api/src/org/apache/cloudstack/api/response/SnapshotResponse.java similarity index 98% rename from api/src/com/cloud/api/response/SnapshotResponse.java rename to api/src/org/apache/cloudstack/api/response/SnapshotResponse.java index 9a6d53f6971..05b178b9079 100644 --- a/api/src/com/cloud/api/response/SnapshotResponse.java +++ b/api/src/org/apache/cloudstack/api/response/SnapshotResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.Date; import java.util.List; @@ -24,6 +24,7 @@ import com.cloud.serializer.Param; import com.cloud.storage.Snapshot; import com.cloud.utils.IdentityProxy; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; @SuppressWarnings("unused") public class SnapshotResponse extends BaseResponse implements ControlledEntityResponse { diff --git a/api/src/com/cloud/api/response/SnapshotScheduleResponse.java b/api/src/org/apache/cloudstack/api/response/SnapshotScheduleResponse.java similarity index 96% rename from api/src/com/cloud/api/response/SnapshotScheduleResponse.java rename to api/src/org/apache/cloudstack/api/response/SnapshotScheduleResponse.java index 37f82b83290..3d8de3e38be 100644 --- a/api/src/com/cloud/api/response/SnapshotScheduleResponse.java +++ b/api/src/org/apache/cloudstack/api/response/SnapshotScheduleResponse.java @@ -14,13 +14,14 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.Date; import com.cloud.utils.IdentityProxy; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; public class SnapshotScheduleResponse extends BaseResponse { @SerializedName("id") @Param(description="the ID of the snapshot schedule") diff --git a/api/src/com/cloud/api/response/StaticRouteResponse.java b/api/src/org/apache/cloudstack/api/response/StaticRouteResponse.java similarity index 97% rename from api/src/com/cloud/api/response/StaticRouteResponse.java rename to api/src/org/apache/cloudstack/api/response/StaticRouteResponse.java index b607e328dec..d6103808d6f 100644 --- a/api/src/com/cloud/api/response/StaticRouteResponse.java +++ b/api/src/org/apache/cloudstack/api/response/StaticRouteResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.List; @@ -22,6 +22,7 @@ import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; import com.cloud.utils.IdentityProxy; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; @SuppressWarnings("unused") public class StaticRouteResponse extends BaseResponse implements ControlledEntityResponse{ diff --git a/api/src/com/cloud/api/response/StatusResponse.java b/api/src/org/apache/cloudstack/api/response/StatusResponse.java similarity index 92% rename from api/src/com/cloud/api/response/StatusResponse.java rename to api/src/org/apache/cloudstack/api/response/StatusResponse.java index 283766eef12..ffe7c7c0c1e 100644 --- a/api/src/com/cloud/api/response/StatusResponse.java +++ b/api/src/org/apache/cloudstack/api/response/StatusResponse.java @@ -14,9 +14,10 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; public class StatusResponse extends BaseResponse { @SerializedName("status") diff --git a/api/src/com/cloud/api/response/StorageNetworkIpRangeResponse.java b/api/src/org/apache/cloudstack/api/response/StorageNetworkIpRangeResponse.java old mode 100755 new mode 100644 similarity index 97% rename from api/src/com/cloud/api/response/StorageNetworkIpRangeResponse.java rename to api/src/org/apache/cloudstack/api/response/StorageNetworkIpRangeResponse.java index 18e122fbf26..beb2fbd8ae3 --- a/api/src/com/cloud/api/response/StorageNetworkIpRangeResponse.java +++ b/api/src/org/apache/cloudstack/api/response/StorageNetworkIpRangeResponse.java @@ -14,11 +14,12 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; public class StorageNetworkIpRangeResponse extends BaseResponse { @SerializedName(ApiConstants.ID) @Param(description="the uuid of storage network IP range.") diff --git a/api/src/com/cloud/api/response/StoragePoolResponse.java b/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java old mode 100755 new mode 100644 similarity index 98% rename from api/src/com/cloud/api/response/StoragePoolResponse.java rename to api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java index d0d60ece3a9..64174ebc2bc --- a/api/src/com/cloud/api/response/StoragePoolResponse.java +++ b/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.Date; @@ -23,6 +23,7 @@ import com.cloud.utils.IdentityProxy; import com.cloud.serializer.Param; import com.cloud.storage.StoragePoolStatus; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; public class StoragePoolResponse extends BaseResponse { @SerializedName("id") @Param(description="the ID of the storage pool") diff --git a/api/src/com/cloud/api/response/SuccessResponse.java b/api/src/org/apache/cloudstack/api/response/SuccessResponse.java similarity index 72% rename from api/src/com/cloud/api/response/SuccessResponse.java rename to api/src/org/apache/cloudstack/api/response/SuccessResponse.java index 7f221168abe..47c65b6a068 100644 --- a/api/src/com/cloud/api/response/SuccessResponse.java +++ b/api/src/org/apache/cloudstack/api/response/SuccessResponse.java @@ -14,29 +14,30 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; public class SuccessResponse extends BaseResponse { - @SerializedName("success") @Param(description="true if operation is executed successfully") - private Boolean success = true; + @SerializedName("success") @Param(description="true if operation is executed successfully") + private Boolean success = true; @SerializedName("displaytext") @Param(description="any text associated with the success or failure") private String displayText; - public Boolean getSuccess() { - return success; - } + public Boolean getSuccess() { + return success; + } - public void setSuccess(Boolean success) { - this.success = success; - } + public void setSuccess(Boolean success) { + this.success = success; + } - public String getDisplayText() { - return displayText; - } + public String getDisplayText() { + return displayText; + } public void setDisplayText(String displayText) { this.displayText = displayText; @@ -45,6 +46,6 @@ public class SuccessResponse extends BaseResponse { public SuccessResponse() {} public SuccessResponse(String responseName) { - super.setResponseName(responseName); + super.setResponseName(responseName); } } diff --git a/api/src/com/cloud/api/response/SwiftResponse.java b/api/src/org/apache/cloudstack/api/response/SwiftResponse.java old mode 100755 new mode 100644 similarity index 96% rename from api/src/com/cloud/api/response/SwiftResponse.java rename to api/src/org/apache/cloudstack/api/response/SwiftResponse.java index bf77149444c..f3c219facb0 --- a/api/src/com/cloud/api/response/SwiftResponse.java +++ b/api/src/org/apache/cloudstack/api/response/SwiftResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.Date; @@ -22,6 +22,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.BaseResponse; public class SwiftResponse extends BaseResponse { @SerializedName(ApiConstants.ID) diff --git a/api/src/com/cloud/api/response/SystemVmInstanceResponse.java b/api/src/org/apache/cloudstack/api/response/SystemVmInstanceResponse.java similarity index 95% rename from api/src/com/cloud/api/response/SystemVmInstanceResponse.java rename to api/src/org/apache/cloudstack/api/response/SystemVmInstanceResponse.java index 322c5323981..5ede9f361e8 100644 --- a/api/src/com/cloud/api/response/SystemVmInstanceResponse.java +++ b/api/src/org/apache/cloudstack/api/response/SystemVmInstanceResponse.java @@ -14,11 +14,12 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import com.cloud.utils.IdentityProxy; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; /* * This is the generic response for all types of System VMs (SSVM, consoleproxy, domain routers(router, LB, DHCP)) @@ -44,7 +45,7 @@ public class SystemVmInstanceResponse extends BaseResponse { public Long getObjectId() { - return getId(); + return getId(); } public Long getId() { diff --git a/api/src/com/cloud/api/response/SystemVmResponse.java b/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java similarity index 99% rename from api/src/com/cloud/api/response/SystemVmResponse.java rename to api/src/org/apache/cloudstack/api/response/SystemVmResponse.java index 40ca34b68b8..cc1f5ae2e25 100644 --- a/api/src/com/cloud/api/response/SystemVmResponse.java +++ b/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.Date; @@ -22,6 +22,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.BaseResponse; public class SystemVmResponse extends BaseResponse { @SerializedName("id") @Param(description="the ID of the system VM") diff --git a/api/src/com/cloud/api/response/TemplatePermissionsResponse.java b/api/src/org/apache/cloudstack/api/response/TemplatePermissionsResponse.java similarity index 96% rename from api/src/com/cloud/api/response/TemplatePermissionsResponse.java rename to api/src/org/apache/cloudstack/api/response/TemplatePermissionsResponse.java index b578f66c5dc..59e82d39ca1 100644 --- a/api/src/com/cloud/api/response/TemplatePermissionsResponse.java +++ b/api/src/org/apache/cloudstack/api/response/TemplatePermissionsResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.List; @@ -22,6 +22,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.BaseResponse; @SuppressWarnings("unused") public class TemplatePermissionsResponse extends BaseResponse { diff --git a/api/src/com/cloud/api/response/TemplateResponse.java b/api/src/org/apache/cloudstack/api/response/TemplateResponse.java old mode 100755 new mode 100644 similarity index 99% rename from api/src/com/cloud/api/response/TemplateResponse.java rename to api/src/org/apache/cloudstack/api/response/TemplateResponse.java index 3cb693811be..2cea0f682ef --- a/api/src/com/cloud/api/response/TemplateResponse.java +++ b/api/src/org/apache/cloudstack/api/response/TemplateResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.Date; import java.util.List; @@ -25,6 +25,7 @@ import com.cloud.serializer.Param; import com.cloud.storage.Storage.ImageFormat; import com.cloud.utils.IdentityProxy; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; @SuppressWarnings("unused") public class TemplateResponse extends BaseResponse implements ControlledEntityResponse { diff --git a/api/src/com/cloud/api/response/TrafficTypeImplementorResponse.java b/api/src/org/apache/cloudstack/api/response/TrafficTypeImplementorResponse.java old mode 100755 new mode 100644 similarity index 94% rename from api/src/com/cloud/api/response/TrafficTypeImplementorResponse.java rename to api/src/org/apache/cloudstack/api/response/TrafficTypeImplementorResponse.java index b2691b3585e..30adc3d87ca --- a/api/src/com/cloud/api/response/TrafficTypeImplementorResponse.java +++ b/api/src/org/apache/cloudstack/api/response/TrafficTypeImplementorResponse.java @@ -14,11 +14,12 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; public class TrafficTypeImplementorResponse extends BaseResponse { @SerializedName(ApiConstants.TRAFFIC_TYPE) @Param(description="network traffic type") diff --git a/api/src/com/cloud/api/response/TrafficTypeResponse.java b/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java similarity index 97% rename from api/src/com/cloud/api/response/TrafficTypeResponse.java rename to api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java index cca7f63f5ec..d32e5802f57 100644 --- a/api/src/com/cloud/api/response/TrafficTypeResponse.java +++ b/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java @@ -14,12 +14,13 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; 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.BaseResponse; public class TrafficTypeResponse extends BaseResponse { diff --git a/api/src/com/cloud/api/response/UpgradeVmResponse.java b/api/src/org/apache/cloudstack/api/response/UpgradeVmResponse.java similarity index 98% rename from api/src/com/cloud/api/response/UpgradeVmResponse.java rename to api/src/org/apache/cloudstack/api/response/UpgradeVmResponse.java index 079d1a5cd07..0bc22dc7c3f 100644 --- a/api/src/com/cloud/api/response/UpgradeVmResponse.java +++ b/api/src/org/apache/cloudstack/api/response/UpgradeVmResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.Date; @@ -22,6 +22,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.BaseResponse; public class UpgradeVmResponse extends BaseResponse { @SerializedName("id") diff --git a/api/src/com/cloud/api/response/UserResponse.java b/api/src/org/apache/cloudstack/api/response/UserResponse.java similarity index 98% rename from api/src/com/cloud/api/response/UserResponse.java rename to api/src/org/apache/cloudstack/api/response/UserResponse.java index 6ecede61351..2868be4bbfd 100644 --- a/api/src/com/cloud/api/response/UserResponse.java +++ b/api/src/org/apache/cloudstack/api/response/UserResponse.java @@ -14,13 +14,14 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.Date; import com.cloud.utils.IdentityProxy; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; public class UserResponse extends BaseResponse { @SerializedName("id") @Param(description="the user ID") diff --git a/api/src/com/cloud/api/response/UserVmResponse.java b/api/src/org/apache/cloudstack/api/response/UserVmResponse.java old mode 100755 new mode 100644 similarity index 99% rename from api/src/com/cloud/api/response/UserVmResponse.java rename to api/src/org/apache/cloudstack/api/response/UserVmResponse.java index 0e0d5c60426..4934d8b362e --- a/api/src/com/cloud/api/response/UserVmResponse.java +++ b/api/src/org/apache/cloudstack/api/response/UserVmResponse.java @@ -14,14 +14,14 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.Date; import java.util.HashSet; -import java.util.List; import java.util.Set; import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.Entity; import com.cloud.vm.VirtualMachine; import com.cloud.serializer.Param; diff --git a/api/src/com/cloud/api/response/VirtualRouterProviderResponse.java b/api/src/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java similarity index 97% rename from api/src/com/cloud/api/response/VirtualRouterProviderResponse.java rename to api/src/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java index 8f27ff3654e..85e7f118376 100644 --- a/api/src/com/cloud/api/response/VirtualRouterProviderResponse.java +++ b/api/src/org/apache/cloudstack/api/response/VirtualRouterProviderResponse.java @@ -14,12 +14,13 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; 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.BaseResponse; public class VirtualRouterProviderResponse extends BaseResponse implements ControlledEntityResponse { @SerializedName(ApiConstants.ID) @Param(description="the id of the router") diff --git a/api/src/com/cloud/api/response/VlanIpRangeResponse.java b/api/src/org/apache/cloudstack/api/response/VlanIpRangeResponse.java similarity index 98% rename from api/src/com/cloud/api/response/VlanIpRangeResponse.java rename to api/src/org/apache/cloudstack/api/response/VlanIpRangeResponse.java index 527e27239bc..4993cc358fb 100644 --- a/api/src/com/cloud/api/response/VlanIpRangeResponse.java +++ b/api/src/org/apache/cloudstack/api/response/VlanIpRangeResponse.java @@ -14,12 +14,13 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; 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.BaseResponse; @SuppressWarnings("unused") public class VlanIpRangeResponse extends BaseResponse implements ControlledEntityResponse{ diff --git a/api/src/com/cloud/api/response/VolumeResponse.java b/api/src/org/apache/cloudstack/api/response/VolumeResponse.java old mode 100755 new mode 100644 similarity index 99% rename from api/src/com/cloud/api/response/VolumeResponse.java rename to api/src/org/apache/cloudstack/api/response/VolumeResponse.java index 07722780b18..8085e698971 --- a/api/src/com/cloud/api/response/VolumeResponse.java +++ b/api/src/org/apache/cloudstack/api/response/VolumeResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.Date; import java.util.List; @@ -23,6 +23,7 @@ import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; import com.cloud.utils.IdentityProxy; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; @SuppressWarnings("unused") public class VolumeResponse extends BaseResponse implements ControlledEntityResponse{ diff --git a/api/src/com/cloud/api/response/VpcOfferingResponse.java b/api/src/org/apache/cloudstack/api/response/VpcOfferingResponse.java similarity index 94% rename from api/src/com/cloud/api/response/VpcOfferingResponse.java rename to api/src/org/apache/cloudstack/api/response/VpcOfferingResponse.java index 14d5c9ca564..f8c13511ae3 100644 --- a/api/src/com/cloud/api/response/VpcOfferingResponse.java +++ b/api/src/org/apache/cloudstack/api/response/VpcOfferingResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.Date; import java.util.List; @@ -23,9 +23,10 @@ import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; import com.cloud.utils.IdentityProxy; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; @SuppressWarnings("unused") -public class VpcOfferingResponse extends BaseResponse{ +public class VpcOfferingResponse extends BaseResponse { @SerializedName("id") @Param(description="the id of the vpc offering") private final IdentityProxy id = new IdentityProxy("vpc_offerings"); diff --git a/api/src/com/cloud/api/response/VpcResponse.java b/api/src/org/apache/cloudstack/api/response/VpcResponse.java similarity index 98% rename from api/src/com/cloud/api/response/VpcResponse.java rename to api/src/org/apache/cloudstack/api/response/VpcResponse.java index 88a46106ab9..0c5f02a7fee 100644 --- a/api/src/com/cloud/api/response/VpcResponse.java +++ b/api/src/org/apache/cloudstack/api/response/VpcResponse.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.Date; import java.util.List; @@ -23,6 +23,7 @@ import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; import com.cloud.utils.IdentityProxy; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; @SuppressWarnings("unused") public class VpcResponse extends BaseResponse implements ControlledEntityResponse{ diff --git a/api/src/com/cloud/api/response/VpnUsersResponse.java b/api/src/org/apache/cloudstack/api/response/VpnUsersResponse.java similarity index 78% rename from api/src/com/cloud/api/response/VpnUsersResponse.java rename to api/src/org/apache/cloudstack/api/response/VpnUsersResponse.java index db12593c0ed..d1f45deb45e 100644 --- a/api/src/com/cloud/api/response/VpnUsersResponse.java +++ b/api/src/org/apache/cloudstack/api/response/VpnUsersResponse.java @@ -14,12 +14,13 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; 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.BaseResponse; @SuppressWarnings("unused") public class VpnUsersResponse extends BaseResponse implements ControlledEntityResponse{ @@ -33,10 +34,10 @@ public class VpnUsersResponse extends BaseResponse implements ControlledEntityRe private String accountName; @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id of the account of the remote access vpn") - private IdentityProxy domainId = new IdentityProxy("domain"); + private IdentityProxy domainId = new IdentityProxy("domain"); @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the account of the remote access vpn") - private String domainName; + private String domainName; @SerializedName(ApiConstants.PROJECT_ID) @Param(description="the project id of the vpn") private IdentityProxy projectId = new IdentityProxy("projects"); @@ -45,25 +46,25 @@ public class VpnUsersResponse extends BaseResponse implements ControlledEntityRe private String projectName; - public void setId(Long id) { - this.id.setValue(id); - } + public void setId(Long id) { + this.id.setValue(id); + } - public void setUserName(String name) { - this.userName = name; - } + public void setUserName(String name) { + this.userName = name; + } - public void setAccountName(String accountName) { - this.accountName = accountName; - } + public void setAccountName(String accountName) { + this.accountName = accountName; + } - public void setDomainId(Long domainId) { - this.domainId.setValue(domainId); - } + public void setDomainId(Long domainId) { + this.domainId.setValue(domainId); + } - public void setDomainName(String name) { - this.domainName = name; - } + public void setDomainName(String name) { + this.domainName = name; + } @Override public void setProjectId(Long projectId) { diff --git a/api/src/com/cloud/api/response/ZoneResponse.java b/api/src/org/apache/cloudstack/api/response/ZoneResponse.java old mode 100755 new mode 100644 similarity index 89% rename from api/src/com/cloud/api/response/ZoneResponse.java rename to api/src/org/apache/cloudstack/api/response/ZoneResponse.java index 12967449791..22ab827cd7d --- a/api/src/com/cloud/api/response/ZoneResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ZoneResponse.java @@ -14,11 +14,12 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.response; +package org.apache.cloudstack.api.response; import java.util.List; import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.Entity; import com.cloud.dc.DataCenter; import com.cloud.utils.IdentityProxy; @@ -140,9 +141,9 @@ public class ZoneResponse extends BaseResponse { this.domain = domain; } - public void setDomainId(Long domainId) { - this.domainId = domainId; - } + public void setDomainId(Long domainId) { + this.domainId = domainId; + } public void setType(String networkType) { this.networkType = networkType; @@ -153,24 +154,24 @@ public class ZoneResponse extends BaseResponse { } public void setAllocationState(String allocationState) { - this.allocationState = allocationState; + this.allocationState = allocationState; } - public void setZoneToken(String zoneToken) { - this.zoneToken = zoneToken; - } + public void setZoneToken(String zoneToken) { + this.zoneToken = zoneToken; + } - public void setDhcpProvider(String dhcpProvider) { - this.dhcpProvider = dhcpProvider; - } + public void setDhcpProvider(String dhcpProvider) { + this.dhcpProvider = dhcpProvider; + } - public void setCapacitites(List capacitites) { - this.capacitites = capacitites; - } + public void setCapacitites(List capacitites) { + this.capacitites = capacitites; + } - public void setDomainName(String domainName) { - this.domainName = domainName; - } + public void setDomainName(String domainName) { + this.domainName = domainName; + } public void setLocalStorageEnabled(boolean localStorageEnabled) { this.localStorageEnabled = localStorageEnabled; diff --git a/api/src/com/cloud/api/view/vo/ControlledViewEntity.java b/api/src/org/apache/cloudstack/api/view/vo/ControlledViewEntity.java similarity index 96% rename from api/src/com/cloud/api/view/vo/ControlledViewEntity.java rename to api/src/org/apache/cloudstack/api/view/vo/ControlledViewEntity.java index 163e001a3c1..f98e1bbc3f5 100644 --- a/api/src/com/cloud/api/view/vo/ControlledViewEntity.java +++ b/api/src/org/apache/cloudstack/api/view/vo/ControlledViewEntity.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.view.vo; +package org.apache.cloudstack.api.view.vo; import com.cloud.acl.ControlledEntity; diff --git a/api/src/com/cloud/api/view/vo/DomainRouterJoinVO.java b/api/src/org/apache/cloudstack/api/view/vo/DomainRouterJoinVO.java similarity index 99% rename from api/src/com/cloud/api/view/vo/DomainRouterJoinVO.java rename to api/src/org/apache/cloudstack/api/view/vo/DomainRouterJoinVO.java index 58e69bfbb6c..747cde5411a 100644 --- a/api/src/com/cloud/api/view/vo/DomainRouterJoinVO.java +++ b/api/src/org/apache/cloudstack/api/view/vo/DomainRouterJoinVO.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.view.vo; +package org.apache.cloudstack.api.view.vo; import java.net.URI; import java.util.Date; diff --git a/api/src/com/cloud/api/view/vo/EventJoinVO.java b/api/src/org/apache/cloudstack/api/view/vo/EventJoinVO.java similarity index 99% rename from api/src/com/cloud/api/view/vo/EventJoinVO.java rename to api/src/org/apache/cloudstack/api/view/vo/EventJoinVO.java index 00e4d20e2cc..da322fbca8f 100644 --- a/api/src/com/cloud/api/view/vo/EventJoinVO.java +++ b/api/src/org/apache/cloudstack/api/view/vo/EventJoinVO.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.view.vo; +package org.apache.cloudstack.api.view.vo; import java.util.Date; diff --git a/api/src/com/cloud/api/view/vo/ResourceTagJoinVO.java b/api/src/org/apache/cloudstack/api/view/vo/ResourceTagJoinVO.java similarity index 99% rename from api/src/com/cloud/api/view/vo/ResourceTagJoinVO.java rename to api/src/org/apache/cloudstack/api/view/vo/ResourceTagJoinVO.java index 2237119833e..e39c1155f6e 100644 --- a/api/src/com/cloud/api/view/vo/ResourceTagJoinVO.java +++ b/api/src/org/apache/cloudstack/api/view/vo/ResourceTagJoinVO.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.view.vo; +package org.apache.cloudstack.api.view.vo; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/api/src/com/cloud/api/view/vo/SecurityGroupJoinVO.java b/api/src/org/apache/cloudstack/api/view/vo/SecurityGroupJoinVO.java similarity index 99% rename from api/src/com/cloud/api/view/vo/SecurityGroupJoinVO.java rename to api/src/org/apache/cloudstack/api/view/vo/SecurityGroupJoinVO.java index cd4c738f251..725ee90af45 100644 --- a/api/src/com/cloud/api/view/vo/SecurityGroupJoinVO.java +++ b/api/src/org/apache/cloudstack/api/view/vo/SecurityGroupJoinVO.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.view.vo; +package org.apache.cloudstack.api.view.vo; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/api/src/com/cloud/api/view/vo/UserVmJoinVO.java b/api/src/org/apache/cloudstack/api/view/vo/UserVmJoinVO.java similarity index 99% rename from api/src/com/cloud/api/view/vo/UserVmJoinVO.java rename to api/src/org/apache/cloudstack/api/view/vo/UserVmJoinVO.java index 1aa137bbda0..aff2a1b5a4d 100644 --- a/api/src/com/cloud/api/view/vo/UserVmJoinVO.java +++ b/api/src/org/apache/cloudstack/api/view/vo/UserVmJoinVO.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.view.vo; +package org.apache.cloudstack.api.view.vo; import java.net.URI; import java.util.Date; diff --git a/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java b/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java index 418cd653a9d..426a3b57dd9 100644 --- a/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java +++ b/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java @@ -28,7 +28,7 @@ import org.apache.cloudstack.api.response.NetworkDeviceResponse; import com.cloud.utils.component.Manager; public interface ExternalNetworkDeviceManager extends Manager { - + public static class NetworkDevice { private String _name; private String _provider; @@ -49,7 +49,7 @@ public interface ExternalNetworkDeviceManager extends Manager { _provider = ntwkServiceprovider; supportedNetworkDevices.add(this); } - + public String getName() { return _name; } @@ -69,11 +69,11 @@ public interface ExternalNetworkDeviceManager extends Manager { } public Host addNetworkDevice(AddNetworkDeviceCmd cmd); - + public NetworkDeviceResponse getApiResponse(Host device); - + public List listNetworkDevice(ListNetworkDeviceCmd cmd); - + public boolean deleteNetworkDevice(DeleteNetworkDeviceCmd cmd); - + } 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 c0cf2297e2b..e4bfcdd2f26 100644 --- a/api/test/src/com/cloud/api/commands/test/AddHostCmdTest.java +++ b/api/test/src/com/cloud/api/commands/test/AddHostCmdTest.java @@ -28,8 +28,8 @@ import org.mockito.Mockito; import org.apache.cloudstack.api.ResponseGenerator; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.HostResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.HostResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.exception.DiscoveryException; import com.cloud.exception.InvalidParameterValueException; import com.cloud.host.Host; 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 5065e9d5180..3a613157307 100644 --- a/api/test/src/com/cloud/api/commands/test/AddSecondaryStorageCmdTest.java +++ b/api/test/src/com/cloud/api/commands/test/AddSecondaryStorageCmdTest.java @@ -28,7 +28,7 @@ import org.mockito.Mockito; import org.apache.cloudstack.api.ResponseGenerator; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.HostResponse; +import org.apache.cloudstack.api.response.HostResponse; import com.cloud.host.Host; import com.cloud.resource.ResourceService; 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 92048570842..b5dfa886dbd 100644 --- a/api/test/src/com/cloud/api/commands/test/AddSwiftCmdTest.java +++ b/api/test/src/com/cloud/api/commands/test/AddSwiftCmdTest.java @@ -28,7 +28,7 @@ import org.mockito.Mockito; import org.apache.cloudstack.api.ResponseGenerator; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SwiftResponse; +import org.apache.cloudstack.api.response.SwiftResponse; import com.cloud.exception.DiscoveryException; import com.cloud.resource.ResourceService; import com.cloud.storage.Swift; 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 68083984683..21e75a0731b 100644 --- a/api/test/src/com/cloud/api/commands/test/ListRoutersCmdTest.java +++ b/api/test/src/com/cloud/api/commands/test/ListRoutersCmdTest.java @@ -31,9 +31,9 @@ import org.mockito.Mockito; import org.apache.cloudstack.api.ResponseGenerator; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.DomainRouterResponse; -import com.cloud.api.response.ListResponse; -import com.cloud.api.view.vo.DomainRouterJoinVO; +import org.apache.cloudstack.api.response.DomainRouterResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.view.vo.DomainRouterJoinVO; import com.cloud.server.ManagementService; import com.cloud.utils.Pair; diff --git a/api/test/src/com/cloud/api/commands/test/ListVmsCmdTest.java b/api/test/src/com/cloud/api/commands/test/ListVmsCmdTest.java index 19ce047d241..1adfb1540fa 100644 --- a/api/test/src/com/cloud/api/commands/test/ListVmsCmdTest.java +++ b/api/test/src/com/cloud/api/commands/test/ListVmsCmdTest.java @@ -18,29 +18,24 @@ package src.com.cloud.api.commands.test; import java.util.ArrayList; import java.util.EnumSet; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.UUID; -import junit.framework.Assert; import junit.framework.TestCase; +import org.apache.cloudstack.api.command.user.vm.ListVMsCmd; 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.ApiConstants; import org.apache.cloudstack.api.ApiConstants.VMDetails; -import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.ResponseGenerator; import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.user.vm.command.ListVMsCmd; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.UserVmResponse; -import com.cloud.api.view.vo.UserVmJoinVO; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.UserVmResponse; +import org.apache.cloudstack.api.view.vo.UserVmJoinVO; import com.cloud.utils.Pair; import com.cloud.vm.UserVmService; diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index 33daafd0d7d..ccb98bf5ef8 100755 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -54,17 +54,17 @@ updateResourceCount=org.apache.cloudstack.api.command.user.resource.UpdateResour listResourceLimits=org.apache.cloudstack.api.command.user.resource.ListResourceLimitsCmd;15 #### VM commands -deployVirtualMachine=org.apache.cloudstack.api.user.vm.command.DeployVMCmd;15 -destroyVirtualMachine=org.apache.cloudstack.api.user.vm.command.DestroyVMCmd;15 -rebootVirtualMachine=org.apache.cloudstack.api.user.vm.command.RebootVMCmd;15 -startVirtualMachine=org.apache.cloudstack.api.user.vm.command.StartVMCmd;15 -stopVirtualMachine=org.apache.cloudstack.api.user.vm.command.StopVMCmd;15 -resetPasswordForVirtualMachine=org.apache.cloudstack.api.user.vm.command.ResetVMPasswordCmd;15 -updateVirtualMachine=org.apache.cloudstack.api.user.vm.command.UpdateVMCmd;15 -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 +deployVirtualMachine=org.apache.cloudstack.api.command.user.vm.DeployVMCmd;15 +destroyVirtualMachine=org.apache.cloudstack.api.command.user.vm.DestroyVMCmd;15 +rebootVirtualMachine=org.apache.cloudstack.api.command.user.vm.RebootVMCmd;15 +startVirtualMachine=org.apache.cloudstack.api.command.user.vm.StartVMCmd;15 +stopVirtualMachine=org.apache.cloudstack.api.command.user.vm.StopVMCmd;15 +resetPasswordForVirtualMachine=org.apache.cloudstack.api.command.user.vm.ResetVMPasswordCmd;15 +updateVirtualMachine=org.apache.cloudstack.api.command.user.vm.UpdateVMCmd;15 +listVirtualMachines=org.apache.cloudstack.api.command.user.vm.ListVMsCmd;15 +getVMPassword=org.apache.cloudstack.api.command.user.vm.GetVMPasswordCmd;15 +restoreVirtualMachine=org.apache.cloudstack.api.command.user.vm.RestoreVMCmd;15 +changeServiceForVirtualMachine=org.apache.cloudstack.api.command.user.vm.UpgradeVMCmd;15 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 @@ -212,7 +212,7 @@ listPods=org.apache.cloudstack.api.command.admin.pod.ListPodsByCmd;3 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 +listZones=org.apache.cloudstack.api.command.user.zone.ListZonesByCmd;15 #### events commands listEvents=org.apache.cloudstack.api.command.user.event.ListEventsCmd;15 @@ -243,14 +243,14 @@ addSecondaryStorage=org.apache.cloudstack.api.command.admin.host.AddSecondarySto updateHostPassword=org.apache.cloudstack.api.command.admin.host.UpdateHostPasswordCmd;1 #### volume commands -attachVolume=org.apache.cloudstack.api.user.volume.command.AttachVolumeCmd;15 -uploadVolume=org.apache.cloudstack.api.user.volume.command.UploadVolumeCmd;15 -detachVolume=org.apache.cloudstack.api.user.volume.command.DetachVolumeCmd;15 -createVolume=org.apache.cloudstack.api.user.volume.command.CreateVolumeCmd;15 -deleteVolume=org.apache.cloudstack.api.user.volume.command.DeleteVolumeCmd;15 -listVolumes=org.apache.cloudstack.api.user.volume.command.ListVolumesCmd;15 -extractVolume=org.apache.cloudstack.api.user.volume.command.ExtractVolumeCmd;15 -migrateVolume=org.apache.cloudstack.api.user.volume.command.MigrateVolumeCmd;15 +attachVolume=org.apache.cloudstack.api.command.user.volume.AttachVolumeCmd;15 +uploadVolume=org.apache.cloudstack.api.command.user.volume.UploadVolumeCmd;15 +detachVolume=org.apache.cloudstack.api.command.user.volume.DetachVolumeCmd;15 +createVolume=org.apache.cloudstack.api.command.user.volume.CreateVolumeCmd;15 +deleteVolume=org.apache.cloudstack.api.command.user.volume.DeleteVolumeCmd;15 +listVolumes=org.apache.cloudstack.api.command.user.volume.ListVolumesCmd;15 +extractVolume=org.apache.cloudstack.api.command.user.volume.ExtractVolumeCmd;15 +migrateVolume=org.apache.cloudstack.api.command.user.volume.MigrateVolumeCmd;15 #### registration command: FIXME -- this really should be something in management server that #### generates a new key for the user and they just have to @@ -282,10 +282,10 @@ revokeSecurityGroupEgress=org.apache.cloudstack.api.command.user.securitygroup.R listSecurityGroups=org.apache.cloudstack.api.command.user.securitygroup.ListSecurityGroupsCmd;15 #### vm group commands -createInstanceGroup=org.apache.cloudstack.api.user.vmgroup.command.CreateVMGroupCmd;15 -deleteInstanceGroup=org.apache.cloudstack.api.user.vmgroup.command.DeleteVMGroupCmd;15 -updateInstanceGroup=org.apache.cloudstack.api.user.vmgroup.command.UpdateVMGroupCmd;15 -listInstanceGroups=org.apache.cloudstack.api.user.vmgroup.command.ListVMGroupsCmd;15 +createInstanceGroup=org.apache.cloudstack.api.command.user.vmgroup.CreateVMGroupCmd;15 +deleteInstanceGroup=org.apache.cloudstack.api.command.user.vmgroup.DeleteVMGroupCmd;15 +updateInstanceGroup=org.apache.cloudstack.api.command.user.vmgroup.UpdateVMGroupCmd;15 +listInstanceGroups=org.apache.cloudstack.api.command.user.vmgroup.ListVMGroupsCmd;15 ### Certificate commands uploadCustomCertificate=org.apache.cloudstack.api.command.admin.resource.UploadCustomCertificateCmd;1 @@ -294,9 +294,9 @@ uploadCustomCertificate=org.apache.cloudstack.api.command.admin.resource.UploadC 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 +createRemoteAccessVpn=org.apache.cloudstack.api.command.user.vpn.CreateRemoteAccessVpnCmd;15 +deleteRemoteAccessVpn=org.apache.cloudstack.api.command.user.vpn.DeleteRemoteAccessVpnCmd;15 +listRemoteAccessVpns=org.apache.cloudstack.api.command.user.vpn.ListRemoteAccessVpnsCmd;15 addVpnUser=org.apache.cloudstack.api.command.user.user.AddVpnUserCmd;15 removeVpnUser=org.apache.cloudstack.api.command.user.user.RemoveVpnUserCmd;15 @@ -376,21 +376,21 @@ listNetworkDevice=org.apache.cloudstack.api.command.admin.network.ListNetworkDev deleteNetworkDevice=org.apache.cloudstack.api.command.admin.network.DeleteNetworkDeviceCmd;1 ### VPC commands -createVPC=org.apache.cloudstack.api.user.vpc.command.CreateVPCCmd;15 -listVPCs=org.apache.cloudstack.api.user.vpc.command.ListVPCsCmd;15 -deleteVPC=org.apache.cloudstack.api.user.vpc.command.DeleteVPCCmd;15 -updateVPC=org.apache.cloudstack.api.user.vpc.command.UpdateVPCCmd;15 -restartVPC=org.apache.cloudstack.api.user.vpc.command.RestartVPCCmd;15 +createVPC=org.apache.cloudstack.api.command.user.vpc.CreateVPCCmd;15 +listVPCs=org.apache.cloudstack.api.command.user.vpc.ListVPCsCmd;15 +deleteVPC=org.apache.cloudstack.api.command.user.vpc.DeleteVPCCmd;15 +updateVPC=org.apache.cloudstack.api.command.user.vpc.UpdateVPCCmd;15 +restartVPC=org.apache.cloudstack.api.command.user.vpc.RestartVPCCmd;15 #### VPC offering commands 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 +listVPCOfferings=org.apache.cloudstack.api.command.user.vpc.ListVPCOfferingsCmd;15 #### Private gateway commands createPrivateGateway=org.apache.cloudstack.api.command.admin.vpc.CreatePrivateGatewayCmd;1 -listPrivateGateways=org.apache.cloudstack.api.user.vpc.command.ListPrivateGatewaysCmd;15 +listPrivateGateways=org.apache.cloudstack.api.command.user.vpc.ListPrivateGatewaysCmd;15 deletePrivateGateway=org.apache.cloudstack.api.command.admin.vpc.DeletePrivateGatewayCmd;1 #### Network ACL commands @@ -399,9 +399,9 @@ deleteNetworkACL=org.apache.cloudstack.api.command.user.network.DeleteNetworkACL listNetworkACLs=org.apache.cloudstack.api.command.user.network.ListNetworkACLsCmd;15 #### Static route commands -createStaticRoute=org.apache.cloudstack.api.user.vpc.command.CreateStaticRouteCmd;15 -deleteStaticRoute=org.apache.cloudstack.api.user.vpc.command.DeleteStaticRouteCmd;15 -listStaticRoutes=org.apache.cloudstack.api.user.vpc.command.ListStaticRoutesCmd;15 +createStaticRoute=org.apache.cloudstack.api.command.user.vpc.CreateStaticRouteCmd;15 +deleteStaticRoute=org.apache.cloudstack.api.command.user.vpc.DeleteStaticRouteCmd;15 +listStaticRoutes=org.apache.cloudstack.api.command.user.vpc.ListStaticRoutesCmd;15 #### Tags commands createTags=org.apache.cloudstack.api.command.user.tag.CreateTagsCmd;15 @@ -409,14 +409,14 @@ 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 -createVpnGateway=org.apache.cloudstack.api.user.vpn.command.CreateVpnGatewayCmd;15 -createVpnConnection=org.apache.cloudstack.api.user.vpn.command.CreateVpnConnectionCmd;15 -deleteVpnCustomerGateway=org.apache.cloudstack.api.user.vpn.command.DeleteVpnCustomerGatewayCmd;15 -deleteVpnGateway=org.apache.cloudstack.api.user.vpn.command.DeleteVpnGatewayCmd;15 -deleteVpnConnection=org.apache.cloudstack.api.user.vpn.command.DeleteVpnConnectionCmd;15 -updateVpnCustomerGateway=org.apache.cloudstack.api.user.vpn.command.UpdateVpnCustomerGatewayCmd;15 -resetVpnConnection=org.apache.cloudstack.api.user.vpn.command.ResetVpnConnectionCmd;15 -listVpnCustomerGateways=org.apache.cloudstack.api.user.vpn.command.ListVpnCustomerGatewaysCmd;15 -listVpnGateways=org.apache.cloudstack.api.user.vpn.command.ListVpnGatewaysCmd;15 -listVpnConnections=org.apache.cloudstack.api.user.vpn.command.ListVpnConnectionsCmd;15 +createVpnCustomerGateway=org.apache.cloudstack.api.command.user.vpn.CreateVpnCustomerGatewayCmd;15 +createVpnGateway=org.apache.cloudstack.api.command.user.vpn.CreateVpnGatewayCmd;15 +createVpnConnection=org.apache.cloudstack.api.command.user.vpn.CreateVpnConnectionCmd;15 +deleteVpnCustomerGateway=org.apache.cloudstack.api.command.user.vpn.DeleteVpnCustomerGatewayCmd;15 +deleteVpnGateway=org.apache.cloudstack.api.command.user.vpn.DeleteVpnGatewayCmd;15 +deleteVpnConnection=org.apache.cloudstack.api.command.user.vpn.DeleteVpnConnectionCmd;15 +updateVpnCustomerGateway=org.apache.cloudstack.api.command.user.vpn.UpdateVpnCustomerGatewayCmd;15 +resetVpnConnection=org.apache.cloudstack.api.command.user.vpn.ResetVpnConnectionCmd;15 +listVpnCustomerGateways=org.apache.cloudstack.api.command.user.vpn.ListVpnCustomerGatewaysCmd;15 +listVpnGateways=org.apache.cloudstack.api.command.user.vpn.ListVpnGatewaysCmd;15 +listVpnConnections=org.apache.cloudstack.api.command.user.vpn.ListVpnConnectionsCmd;15 diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListLunsCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListLunsCmd.java index 03d431218dc..4b8254e35bb 100644 --- a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListLunsCmd.java +++ b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListLunsCmd.java @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumePoolsCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumePoolsCmd.java index bd3669eb640..78033ff0893 100644 --- a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumePoolsCmd.java +++ b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumePoolsCmd.java @@ -24,7 +24,7 @@ import org.apache.log4j.Logger; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; diff --git a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumesOnFilerCmd.java b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumesOnFilerCmd.java index 0006a2f8b33..597af5dfef1 100644 --- a/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumesOnFilerCmd.java +++ b/plugins/file-systems/netapp/src/com/cloud/api/commands/netapp/ListVolumesOnFilerCmd.java @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; diff --git a/plugins/hypervisors/vmware/src/com/cloud/api/commands/DeleteCiscoNexusVSMCmd.java b/plugins/hypervisors/vmware/src/com/cloud/api/commands/DeleteCiscoNexusVSMCmd.java index 4b9b196c2ce..8c228685a8e 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/api/commands/DeleteCiscoNexusVSMCmd.java +++ b/plugins/hypervisors/vmware/src/com/cloud/api/commands/DeleteCiscoNexusVSMCmd.java @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.PlugService; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; diff --git a/plugins/hypervisors/vmware/src/com/cloud/api/commands/ListCiscoNexusVSMsCmd.java b/plugins/hypervisors/vmware/src/com/cloud/api/commands/ListCiscoNexusVSMsCmd.java index a075d27cc70..f0ecd55e712 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/api/commands/ListCiscoNexusVSMsCmd.java +++ b/plugins/hypervisors/vmware/src/com/cloud/api/commands/ListCiscoNexusVSMsCmd.java @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.PlugService; import org.apache.cloudstack.api.ServerApiException; import com.cloud.api.response.CiscoNexusVSMResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceAllocationException; diff --git a/plugins/hypervisors/vmware/src/com/cloud/api/response/CiscoNexusVSMResponse.java b/plugins/hypervisors/vmware/src/com/cloud/api/response/CiscoNexusVSMResponse.java index 5bab173f158..95f645461fa 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/api/response/CiscoNexusVSMResponse.java +++ b/plugins/hypervisors/vmware/src/com/cloud/api/response/CiscoNexusVSMResponse.java @@ -20,6 +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.BaseResponse; public class CiscoNexusVSMResponse extends BaseResponse { diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/DeleteExternalLoadBalancerCmd.java b/plugins/network-elements/f5/src/com/cloud/api/commands/DeleteExternalLoadBalancerCmd.java index d579ff25057..1c9c146a982 100644 --- a/plugins/network-elements/f5/src/com/cloud/api/commands/DeleteExternalLoadBalancerCmd.java +++ b/plugins/network-elements/f5/src/com/cloud/api/commands/DeleteExternalLoadBalancerCmd.java @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.PlugService; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.exception.InvalidParameterValueException; import com.cloud.network.element.F5ExternalLoadBalancerElementService; import com.cloud.user.Account; diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/DeleteF5LoadBalancerCmd.java b/plugins/network-elements/f5/src/com/cloud/api/commands/DeleteF5LoadBalancerCmd.java index 5c4a4698a2a..867fbf9aa0f 100644 --- a/plugins/network-elements/f5/src/com/cloud/api/commands/DeleteF5LoadBalancerCmd.java +++ b/plugins/network-elements/f5/src/com/cloud/api/commands/DeleteF5LoadBalancerCmd.java @@ -28,7 +28,7 @@ import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.PlugService; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/ListExternalLoadBalancersCmd.java b/plugins/network-elements/f5/src/com/cloud/api/commands/ListExternalLoadBalancersCmd.java index b31ea4fef9a..c6c74ef42f6 100644 --- a/plugins/network-elements/f5/src/com/cloud/api/commands/ListExternalLoadBalancersCmd.java +++ b/plugins/network-elements/f5/src/com/cloud/api/commands/ListExternalLoadBalancersCmd.java @@ -28,8 +28,8 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.PlugService; -import com.cloud.api.response.HostResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.HostResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.host.Host; import com.cloud.network.element.F5ExternalLoadBalancerElementService; import com.cloud.server.api.response.ExternalLoadBalancerResponse; diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancerNetworksCmd.java b/plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancerNetworksCmd.java index f974bdbbc01..38570225892 100644 --- a/plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancerNetworksCmd.java +++ b/plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancerNetworksCmd.java @@ -30,8 +30,8 @@ import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.PlugService; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.NetworkResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.NetworkResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; diff --git a/plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancersCmd.java b/plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancersCmd.java index 827aba3e590..8df7177ff9b 100644 --- a/plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancersCmd.java +++ b/plugins/network-elements/f5/src/com/cloud/api/commands/ListF5LoadBalancersCmd.java @@ -31,7 +31,7 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.PlugService; import org.apache.cloudstack.api.ServerApiException; import com.cloud.api.response.F5LoadBalancerResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; diff --git a/plugins/network-elements/f5/src/com/cloud/api/response/F5LoadBalancerResponse.java b/plugins/network-elements/f5/src/com/cloud/api/response/F5LoadBalancerResponse.java index 03c8faf8df6..07be630e783 100644 --- a/plugins/network-elements/f5/src/com/cloud/api/response/F5LoadBalancerResponse.java +++ b/plugins/network-elements/f5/src/com/cloud/api/response/F5LoadBalancerResponse.java @@ -20,6 +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.BaseResponse; public class F5LoadBalancerResponse extends BaseResponse { @SerializedName(ApiConstants.LOAD_BALANCER_DEVICE_ID) @Param(description="device id of the F5 load balancer") diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteExternalFirewallCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteExternalFirewallCmd.java index f9b27cbd3bc..640de7839ce 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteExternalFirewallCmd.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteExternalFirewallCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.PlugService; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.exception.InvalidParameterValueException; import com.cloud.network.element.JuniperSRXFirewallElementService; import com.cloud.user.Account; diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteSrxFirewallCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteSrxFirewallCmd.java index 5870d4c8f05..b416fefbf5f 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteSrxFirewallCmd.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/DeleteSrxFirewallCmd.java @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.PlugService; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; 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 153f9e1b29f..c993d8983e4 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 @@ -28,7 +28,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.PlugService; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.host.Host; import com.cloud.network.element.JuniperSRXFirewallElementService; import com.cloud.server.api.response.ExternalFirewallResponse; diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallNetworksCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallNetworksCmd.java index a352fa15f75..73af77f74e4 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallNetworksCmd.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallNetworksCmd.java @@ -29,8 +29,8 @@ import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.PlugService; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.NetworkResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.NetworkResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallsCmd.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallsCmd.java index 3acbc806e62..0ba8a9503ff 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallsCmd.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/commands/ListSrxFirewallsCmd.java @@ -29,7 +29,7 @@ import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.PlugService; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.api.response.SrxFirewallResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/api/response/SrxFirewallResponse.java b/plugins/network-elements/juniper-srx/src/com/cloud/api/response/SrxFirewallResponse.java index 4382b5e84b1..8ad8597cff5 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/api/response/SrxFirewallResponse.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/api/response/SrxFirewallResponse.java @@ -20,6 +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.BaseResponse; @SuppressWarnings("unused") public class SrxFirewallResponse extends BaseResponse { diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/commands/DeleteNetscalerLoadBalancerCmd.java b/plugins/network-elements/netscaler/src/com/cloud/api/commands/DeleteNetscalerLoadBalancerCmd.java index b5620323bf1..00e898e6bba 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/api/commands/DeleteNetscalerLoadBalancerCmd.java +++ b/plugins/network-elements/netscaler/src/com/cloud/api/commands/DeleteNetscalerLoadBalancerCmd.java @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.PlugService; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancerNetworksCmd.java b/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancerNetworksCmd.java index 2877f3c5071..6e02c35a21f 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancerNetworksCmd.java +++ b/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancerNetworksCmd.java @@ -27,8 +27,8 @@ import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.PlugService; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.NetworkResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.NetworkResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancersCmd.java b/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancersCmd.java index 4e5e3d59626..fbd49e146c8 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancersCmd.java +++ b/plugins/network-elements/netscaler/src/com/cloud/api/commands/ListNetscalerLoadBalancersCmd.java @@ -27,7 +27,7 @@ import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.PlugService; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.api.response.NetscalerLoadBalancerResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; diff --git a/plugins/network-elements/netscaler/src/com/cloud/api/response/NetscalerLoadBalancerResponse.java b/plugins/network-elements/netscaler/src/com/cloud/api/response/NetscalerLoadBalancerResponse.java index 428cdc18513..290018c3c28 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/api/response/NetscalerLoadBalancerResponse.java +++ b/plugins/network-elements/netscaler/src/com/cloud/api/response/NetscalerLoadBalancerResponse.java @@ -22,6 +22,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.BaseResponse; @SuppressWarnings("unused") public class NetscalerLoadBalancerResponse extends BaseResponse { diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/DeleteNiciraNvpDeviceCmd.java b/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/DeleteNiciraNvpDeviceCmd.java index 8bce91cf989..d02b324a623 100644 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/DeleteNiciraNvpDeviceCmd.java +++ b/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/DeleteNiciraNvpDeviceCmd.java @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.PlugService; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDeviceNetworksCmd.java b/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDeviceNetworksCmd.java index e3236463bf9..07932952d0c 100644 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDeviceNetworksCmd.java +++ b/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDeviceNetworksCmd.java @@ -29,8 +29,8 @@ import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.PlugService; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ListResponse; -import com.cloud.api.response.NetworkResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.NetworkResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDevicesCmd.java b/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDevicesCmd.java index b2c3238320e..56e6be5dcd5 100644 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDevicesCmd.java +++ b/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDevicesCmd.java @@ -29,7 +29,7 @@ import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.PlugService; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.api.response.NiciraNvpDeviceResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/api/response/NiciraNvpDeviceResponse.java b/plugins/network-elements/nicira-nvp/src/com/cloud/api/response/NiciraNvpDeviceResponse.java index ca41e7f68e7..74f852b9f28 100644 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/api/response/NiciraNvpDeviceResponse.java +++ b/plugins/network-elements/nicira-nvp/src/com/cloud/api/response/NiciraNvpDeviceResponse.java @@ -20,6 +20,7 @@ import org.apache.cloudstack.api.ApiConstants; import com.cloud.serializer.Param; import com.cloud.utils.IdentityProxy; import com.google.gson.annotations.SerializedName; +import org.apache.cloudstack.api.BaseResponse; public class NiciraNvpDeviceResponse extends BaseResponse { @SerializedName(ApiConstants.NICIRA_NVP_DEVICE_ID) @Param(description="device id of the Nicire Nvp") diff --git a/server/src/com/cloud/api/ApiDBUtils.java b/server/src/com/cloud/api/ApiDBUtils.java index 3d232c65062..a86f09bf7e6 100755 --- a/server/src/com/cloud/api/ApiDBUtils.java +++ b/server/src/com/cloud/api/ApiDBUtils.java @@ -23,16 +23,16 @@ import java.util.Map; import java.util.Set; import org.apache.cloudstack.api.ApiConstants.VMDetails; -import com.cloud.api.response.DomainRouterResponse; -import com.cloud.api.response.EventResponse; -import com.cloud.api.response.ResourceTagResponse; -import com.cloud.api.response.SecurityGroupResponse; -import com.cloud.api.response.UserVmResponse; -import com.cloud.api.view.vo.DomainRouterJoinVO; -import com.cloud.api.view.vo.EventJoinVO; -import com.cloud.api.view.vo.ResourceTagJoinVO; -import com.cloud.api.view.vo.SecurityGroupJoinVO; -import com.cloud.api.view.vo.UserVmJoinVO; +import org.apache.cloudstack.api.response.DomainRouterResponse; +import org.apache.cloudstack.api.response.EventResponse; +import org.apache.cloudstack.api.response.ResourceTagResponse; +import org.apache.cloudstack.api.response.SecurityGroupResponse; +import org.apache.cloudstack.api.response.UserVmResponse; +import org.apache.cloudstack.api.view.vo.DomainRouterJoinVO; +import org.apache.cloudstack.api.view.vo.EventJoinVO; +import org.apache.cloudstack.api.view.vo.ResourceTagJoinVO; +import org.apache.cloudstack.api.view.vo.SecurityGroupJoinVO; +import org.apache.cloudstack.api.view.vo.UserVmJoinVO; import com.cloud.async.AsyncJobManager; import com.cloud.async.AsyncJobVO; import com.cloud.capacity.CapacityVO; @@ -178,7 +178,6 @@ import com.cloud.vm.dao.ConsoleProxyDao; import com.cloud.vm.dao.DomainRouterDao; import com.cloud.vm.dao.DomainRouterJoinDao; import com.cloud.vm.dao.UserVmDao; -import com.cloud.vm.dao.UserVmData; import com.cloud.vm.dao.UserVmDetailsDao; import com.cloud.vm.dao.UserVmJoinDao; import com.cloud.vm.dao.VMInstanceDao; diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index 15a1a791f5b..992c0f403a1 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -40,84 +40,84 @@ 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.command.user.job.QueryAsyncJobResultCmd; -import com.cloud.api.response.AccountResponse; +import org.apache.cloudstack.api.response.AccountResponse; import com.cloud.api.response.ApiResponseSerializer; -import com.cloud.api.response.AsyncJobResponse; -import com.cloud.api.response.AutoScalePolicyResponse; -import com.cloud.api.response.AutoScaleVmGroupResponse; -import com.cloud.api.response.AutoScaleVmProfileResponse; -import com.cloud.api.response.CapabilityResponse; -import com.cloud.api.response.CapacityResponse; -import com.cloud.api.response.ClusterResponse; -import com.cloud.api.response.ConditionResponse; -import com.cloud.api.response.ConfigurationResponse; -import com.cloud.api.response.ControlledEntityResponse; -import com.cloud.api.response.CounterResponse; -import com.cloud.api.response.CreateCmdResponse; -import com.cloud.api.response.DiskOfferingResponse; -import com.cloud.api.response.DomainResponse; -import com.cloud.api.response.DomainRouterResponse; -import com.cloud.api.response.EventResponse; -import com.cloud.api.response.ExtractResponse; -import com.cloud.api.response.FirewallResponse; -import com.cloud.api.response.FirewallRuleResponse; -import com.cloud.api.response.HostResponse; -import com.cloud.api.response.HypervisorCapabilitiesResponse; -import com.cloud.api.response.ControlledViewEntityResponse; -import com.cloud.api.response.IPAddressResponse; -import com.cloud.api.response.InstanceGroupResponse; -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.LoadBalancerResponse; -import com.cloud.api.response.NetworkACLResponse; -import com.cloud.api.response.NetworkOfferingResponse; -import com.cloud.api.response.NetworkResponse; -import com.cloud.api.response.PhysicalNetworkResponse; -import com.cloud.api.response.PodResponse; -import com.cloud.api.response.PrivateGatewayResponse; -import com.cloud.api.response.ProjectAccountResponse; -import com.cloud.api.response.ProjectInvitationResponse; -import com.cloud.api.response.ProjectResponse; -import com.cloud.api.response.ProviderResponse; -import com.cloud.api.response.RemoteAccessVpnResponse; -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.SecurityGroupRuleResponse; -import com.cloud.api.response.ServiceOfferingResponse; -import com.cloud.api.response.ServiceResponse; -import com.cloud.api.response.Site2SiteCustomerGatewayResponse; -import com.cloud.api.response.Site2SiteVpnConnectionResponse; -import com.cloud.api.response.Site2SiteVpnGatewayResponse; -import com.cloud.api.response.SnapshotPolicyResponse; -import com.cloud.api.response.SnapshotResponse; -import com.cloud.api.response.StaticRouteResponse; -import com.cloud.api.response.StorageNetworkIpRangeResponse; -import com.cloud.api.response.StoragePoolResponse; -import com.cloud.api.response.SwiftResponse; -import com.cloud.api.response.SystemVmInstanceResponse; -import com.cloud.api.response.SystemVmResponse; -import com.cloud.api.response.TemplatePermissionsResponse; -import com.cloud.api.response.TemplateResponse; -import com.cloud.api.response.TrafficTypeResponse; -import com.cloud.api.response.UserResponse; -import com.cloud.api.response.UserVmResponse; -import com.cloud.api.response.VirtualRouterProviderResponse; -import com.cloud.api.response.VlanIpRangeResponse; -import com.cloud.api.response.VolumeResponse; -import com.cloud.api.response.VpcOfferingResponse; -import com.cloud.api.response.VpcResponse; -import com.cloud.api.response.VpnUsersResponse; -import com.cloud.api.response.ZoneResponse; -import com.cloud.api.view.vo.DomainRouterJoinVO; -import com.cloud.api.view.vo.ControlledViewEntity; -import com.cloud.api.view.vo.EventJoinVO; -import com.cloud.api.view.vo.ResourceTagJoinVO; -import com.cloud.api.view.vo.SecurityGroupJoinVO; -import com.cloud.api.view.vo.UserVmJoinVO; +import org.apache.cloudstack.api.response.AsyncJobResponse; +import org.apache.cloudstack.api.response.AutoScalePolicyResponse; +import org.apache.cloudstack.api.response.AutoScaleVmGroupResponse; +import org.apache.cloudstack.api.response.AutoScaleVmProfileResponse; +import org.apache.cloudstack.api.response.CapabilityResponse; +import org.apache.cloudstack.api.response.CapacityResponse; +import org.apache.cloudstack.api.response.ClusterResponse; +import org.apache.cloudstack.api.response.ConditionResponse; +import org.apache.cloudstack.api.response.ConfigurationResponse; +import org.apache.cloudstack.api.response.ControlledEntityResponse; +import org.apache.cloudstack.api.response.CounterResponse; +import org.apache.cloudstack.api.response.CreateCmdResponse; +import org.apache.cloudstack.api.response.DiskOfferingResponse; +import org.apache.cloudstack.api.response.DomainResponse; +import org.apache.cloudstack.api.response.DomainRouterResponse; +import org.apache.cloudstack.api.response.EventResponse; +import org.apache.cloudstack.api.response.ExtractResponse; +import org.apache.cloudstack.api.response.FirewallResponse; +import org.apache.cloudstack.api.response.FirewallRuleResponse; +import org.apache.cloudstack.api.response.HostResponse; +import org.apache.cloudstack.api.response.HypervisorCapabilitiesResponse; +import org.apache.cloudstack.api.response.ControlledViewEntityResponse; +import org.apache.cloudstack.api.response.IPAddressResponse; +import org.apache.cloudstack.api.response.InstanceGroupResponse; +import org.apache.cloudstack.api.response.IpForwardingRuleResponse; +import org.apache.cloudstack.api.response.LBStickinessPolicyResponse; +import org.apache.cloudstack.api.response.LBStickinessResponse; +import org.apache.cloudstack.api.response.LDAPConfigResponse; +import org.apache.cloudstack.api.response.LoadBalancerResponse; +import org.apache.cloudstack.api.response.NetworkACLResponse; +import org.apache.cloudstack.api.response.NetworkOfferingResponse; +import org.apache.cloudstack.api.response.NetworkResponse; +import org.apache.cloudstack.api.response.PhysicalNetworkResponse; +import org.apache.cloudstack.api.response.PodResponse; +import org.apache.cloudstack.api.response.PrivateGatewayResponse; +import org.apache.cloudstack.api.response.ProjectAccountResponse; +import org.apache.cloudstack.api.response.ProjectInvitationResponse; +import org.apache.cloudstack.api.response.ProjectResponse; +import org.apache.cloudstack.api.response.ProviderResponse; +import org.apache.cloudstack.api.response.RemoteAccessVpnResponse; +import org.apache.cloudstack.api.response.ResourceCountResponse; +import org.apache.cloudstack.api.response.ResourceLimitResponse; +import org.apache.cloudstack.api.response.ResourceTagResponse; +import org.apache.cloudstack.api.response.SecurityGroupResponse; +import org.apache.cloudstack.api.response.SecurityGroupRuleResponse; +import org.apache.cloudstack.api.response.ServiceOfferingResponse; +import org.apache.cloudstack.api.response.ServiceResponse; +import org.apache.cloudstack.api.response.Site2SiteCustomerGatewayResponse; +import org.apache.cloudstack.api.response.Site2SiteVpnConnectionResponse; +import org.apache.cloudstack.api.response.Site2SiteVpnGatewayResponse; +import org.apache.cloudstack.api.response.SnapshotPolicyResponse; +import org.apache.cloudstack.api.response.SnapshotResponse; +import org.apache.cloudstack.api.response.StaticRouteResponse; +import org.apache.cloudstack.api.response.StorageNetworkIpRangeResponse; +import org.apache.cloudstack.api.response.StoragePoolResponse; +import org.apache.cloudstack.api.response.SwiftResponse; +import org.apache.cloudstack.api.response.SystemVmInstanceResponse; +import org.apache.cloudstack.api.response.SystemVmResponse; +import org.apache.cloudstack.api.response.TemplatePermissionsResponse; +import org.apache.cloudstack.api.response.TemplateResponse; +import org.apache.cloudstack.api.response.TrafficTypeResponse; +import org.apache.cloudstack.api.response.UserResponse; +import org.apache.cloudstack.api.response.UserVmResponse; +import org.apache.cloudstack.api.response.VirtualRouterProviderResponse; +import org.apache.cloudstack.api.response.VlanIpRangeResponse; +import org.apache.cloudstack.api.response.VolumeResponse; +import org.apache.cloudstack.api.response.VpcOfferingResponse; +import org.apache.cloudstack.api.response.VpcResponse; +import org.apache.cloudstack.api.response.VpnUsersResponse; +import org.apache.cloudstack.api.response.ZoneResponse; +import org.apache.cloudstack.api.view.vo.DomainRouterJoinVO; +import org.apache.cloudstack.api.view.vo.ControlledViewEntity; +import org.apache.cloudstack.api.view.vo.EventJoinVO; +import org.apache.cloudstack.api.view.vo.ResourceTagJoinVO; +import org.apache.cloudstack.api.view.vo.SecurityGroupJoinVO; +import org.apache.cloudstack.api.view.vo.UserVmJoinVO; import com.cloud.async.AsyncJob; import com.cloud.capacity.Capacity; import com.cloud.capacity.CapacityVO; diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/com/cloud/api/ApiServer.java index ee4a2228be1..183249f5a6d 100755 --- a/server/src/com/cloud/api/ApiServer.java +++ b/server/src/com/cloud/api/ApiServer.java @@ -51,6 +51,7 @@ import javax.servlet.http.HttpSession; import org.apache.cloudstack.api.*; import org.apache.cloudstack.api.command.user.event.ListEventsCmd; +import org.apache.cloudstack.api.command.user.vm.ListVMsCmd; import org.apache.commons.codec.binary.Base64; import org.apache.http.ConnectionClosedException; import org.apache.http.HttpException; @@ -82,11 +83,10 @@ import org.apache.log4j.Logger; 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; -import com.cloud.api.response.ExceptionResponse; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.ExceptionResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.async.AsyncJob; import com.cloud.async.AsyncJobManager; import com.cloud.async.AsyncJobVO; diff --git a/server/src/com/cloud/api/ResponseObjectTypeAdapter.java b/server/src/com/cloud/api/ResponseObjectTypeAdapter.java index be2a5384e80..b49792334f4 100644 --- a/server/src/com/cloud/api/ResponseObjectTypeAdapter.java +++ b/server/src/com/cloud/api/ResponseObjectTypeAdapter.java @@ -22,8 +22,8 @@ import java.lang.reflect.Type; import org.apache.cloudstack.api.ResponseObject; import org.apache.log4j.Logger; -import com.cloud.api.response.ExceptionResponse; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.ExceptionResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; diff --git a/server/src/com/cloud/api/commands/DeleteTrafficMonitorCmd.java b/server/src/com/cloud/api/commands/DeleteTrafficMonitorCmd.java index 3c6d9f6b805..6e03cca6665 100644 --- a/server/src/com/cloud/api/commands/DeleteTrafficMonitorCmd.java +++ b/server/src/com/cloud/api/commands/DeleteTrafficMonitorCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.exception.InvalidParameterValueException; import com.cloud.network.NetworkUsageManager; import com.cloud.server.ManagementService; diff --git a/server/src/com/cloud/api/commands/GenerateUsageRecordsCmd.java b/server/src/com/cloud/api/commands/GenerateUsageRecordsCmd.java index 71f555d0d53..15e04303202 100644 --- a/server/src/com/cloud/api/commands/GenerateUsageRecordsCmd.java +++ b/server/src/com/cloud/api/commands/GenerateUsageRecordsCmd.java @@ -26,7 +26,7 @@ import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.SuccessResponse; import com.cloud.server.ManagementServerExt; import com.cloud.user.Account; diff --git a/server/src/com/cloud/api/commands/GetUsageRecordsCmd.java b/server/src/com/cloud/api/commands/GetUsageRecordsCmd.java index a0af93b90f1..9f1e21a4ed3 100644 --- a/server/src/com/cloud/api/commands/GetUsageRecordsCmd.java +++ b/server/src/com/cloud/api/commands/GetUsageRecordsCmd.java @@ -31,7 +31,7 @@ import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.projects.Project; import com.cloud.server.ManagementServerExt; import com.cloud.server.api.response.UsageRecordResponse; diff --git a/server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java b/server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java index 0bdc362fdf9..4db5f9f38ab 100644 --- a/server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java +++ b/server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java @@ -27,7 +27,7 @@ import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.IdentityMapper; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.host.Host; import com.cloud.network.NetworkUsageManager; import com.cloud.server.ManagementService; diff --git a/server/src/com/cloud/api/commands/ListUsageTypesCmd.java b/server/src/com/cloud/api/commands/ListUsageTypesCmd.java index 8c21d4f088e..5193cd786a7 100644 --- a/server/src/com/cloud/api/commands/ListUsageTypesCmd.java +++ b/server/src/com/cloud/api/commands/ListUsageTypesCmd.java @@ -22,7 +22,7 @@ import org.apache.log4j.Logger; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Implementation; -import com.cloud.api.response.ListResponse; +import org.apache.cloudstack.api.response.ListResponse; import com.cloud.server.ManagementServerExt; import com.cloud.server.api.response.UsageTypeResponse; import com.cloud.user.Account; diff --git a/server/src/com/cloud/api/doc/ApiXmlDocWriter.java b/server/src/com/cloud/api/doc/ApiXmlDocWriter.java index 46836f8799f..5a1deeca7e6 100644 --- a/server/src/com/cloud/api/doc/ApiXmlDocWriter.java +++ b/server/src/com/cloud/api/doc/ApiXmlDocWriter.java @@ -45,16 +45,16 @@ import org.apache.cloudstack.api.BaseAsyncCreateCmd; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Implementation; import org.apache.cloudstack.api.Parameter; -import com.cloud.api.response.AsyncJobResponse; -import com.cloud.api.response.BaseResponse; -import com.cloud.api.response.HostResponse; -import com.cloud.api.response.IPAddressResponse; -import com.cloud.api.response.SecurityGroupResponse; -import com.cloud.api.response.SnapshotResponse; -import com.cloud.api.response.StoragePoolResponse; -import com.cloud.api.response.TemplateResponse; -import com.cloud.api.response.UserVmResponse; -import com.cloud.api.response.VolumeResponse; +import org.apache.cloudstack.api.response.AsyncJobResponse; +import org.apache.cloudstack.api.BaseResponse; +import org.apache.cloudstack.api.response.HostResponse; +import org.apache.cloudstack.api.response.IPAddressResponse; +import org.apache.cloudstack.api.response.SecurityGroupResponse; +import org.apache.cloudstack.api.response.SnapshotResponse; +import org.apache.cloudstack.api.response.StoragePoolResponse; +import org.apache.cloudstack.api.response.TemplateResponse; +import org.apache.cloudstack.api.response.UserVmResponse; +import org.apache.cloudstack.api.response.VolumeResponse; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; import com.thoughtworks.xstream.XStream; diff --git a/server/src/com/cloud/api/response/ApiResponseSerializer.java b/server/src/com/cloud/api/response/ApiResponseSerializer.java index cc2725eea8b..4a4d94306b1 100644 --- a/server/src/com/cloud/api/response/ApiResponseSerializer.java +++ b/server/src/com/cloud/api/response/ApiResponseSerializer.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.*; import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; @@ -103,7 +105,7 @@ public class ApiResponseSerializer { } } else if (result instanceof SuccessResponse) { sb.append("{ \"success\" : \"").append(((SuccessResponse) result).getSuccess()).append("\"} "); - } else if (result instanceof ExceptionResponse) { + } else if (result instanceof ExceptionResponse) { String jsonErrorText = gson.toJson((ExceptionResponse) result); jsonErrorText = unescape(jsonErrorText); sb.append(jsonErrorText); diff --git a/server/src/com/cloud/async/AsyncJobManagerImpl.java b/server/src/com/cloud/async/AsyncJobManagerImpl.java index 86a23c9c0a3..7bf5c5a83cc 100644 --- a/server/src/com/cloud/async/AsyncJobManagerImpl.java +++ b/server/src/com/cloud/async/AsyncJobManagerImpl.java @@ -44,7 +44,7 @@ import com.cloud.api.ApiSerializerHelper; import org.apache.cloudstack.api.BaseAsyncCmd; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.ExceptionResponse; +import org.apache.cloudstack.api.response.ExceptionResponse; import com.cloud.async.dao.AsyncJobDao; import com.cloud.cluster.ClusterManager; import com.cloud.cluster.ClusterManagerListener; diff --git a/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java b/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java index e4fcdf8b14d..2e325ec4f02 100755 --- a/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java +++ b/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java @@ -26,8 +26,10 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; 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.cloudstack.api.command.user.vm.DeployVMCmd; +import org.apache.cloudstack.api.command.user.vm.UpgradeVMCmd; +import org.apache.cloudstack.api.command.user.volume.AttachVolumeCmd; +import org.apache.cloudstack.api.command.user.volume.DetachVolumeCmd; import org.apache.log4j.Logger; import com.cloud.agent.api.Answer; @@ -35,9 +37,7 @@ import com.cloud.agent.api.StopAnswer; import com.cloud.agent.api.baremetal.IpmISetBootDevCommand; import com.cloud.agent.api.baremetal.IpmiBootorResetCommand; import com.cloud.agent.manager.Commands; -import org.apache.cloudstack.api.user.vm.command.DeployVMCmd; -import org.apache.cloudstack.api.user.vm.command.StartVMCmd; -import org.apache.cloudstack.api.user.vm.command.UpgradeVMCmd; +import org.apache.cloudstack.api.command.user.vm.StartVMCmd; import com.cloud.baremetal.PxeServerManager.PxeServerType; import com.cloud.configuration.Resource.ResourceType; import com.cloud.configuration.dao.ConfigurationDao; diff --git a/server/src/com/cloud/baremetal/DhcpServerResponse.java b/server/src/com/cloud/baremetal/DhcpServerResponse.java index dafc78114e5..69b507190bf 100644 --- a/server/src/com/cloud/baremetal/DhcpServerResponse.java +++ b/server/src/com/cloud/baremetal/DhcpServerResponse.java @@ -18,7 +18,7 @@ package com.cloud.baremetal; import org.apache.cloudstack.api.ApiConstants; import com.cloud.utils.IdentityProxy; -import com.cloud.api.response.BaseResponse; +import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; diff --git a/server/src/com/cloud/baremetal/PxeServerResponse.java b/server/src/com/cloud/baremetal/PxeServerResponse.java index 30e809c4980..aa050960273 100644 --- a/server/src/com/cloud/baremetal/PxeServerResponse.java +++ b/server/src/com/cloud/baremetal/PxeServerResponse.java @@ -18,7 +18,7 @@ package com.cloud.baremetal; import org.apache.cloudstack.api.ApiConstants; import com.cloud.utils.IdentityProxy; -import com.cloud.api.response.BaseResponse; +import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; diff --git a/server/src/com/cloud/event/dao/EventJoinDao.java b/server/src/com/cloud/event/dao/EventJoinDao.java index bfdcd095cfb..d67653d2cd9 100644 --- a/server/src/com/cloud/event/dao/EventJoinDao.java +++ b/server/src/com/cloud/event/dao/EventJoinDao.java @@ -18,10 +18,9 @@ package com.cloud.event.dao; import java.util.List; -import com.cloud.api.response.EventResponse; -import com.cloud.api.view.vo.EventJoinVO; +import org.apache.cloudstack.api.response.EventResponse; +import org.apache.cloudstack.api.view.vo.EventJoinVO; import com.cloud.event.Event; -import com.cloud.event.EventVO; import com.cloud.utils.db.Filter; import com.cloud.utils.db.GenericDao; import com.cloud.utils.db.SearchCriteria; diff --git a/server/src/com/cloud/event/dao/EventJoinDaoImpl.java b/server/src/com/cloud/event/dao/EventJoinDaoImpl.java index a00d1b33aaf..91e7f369cd5 100644 --- a/server/src/com/cloud/event/dao/EventJoinDaoImpl.java +++ b/server/src/com/cloud/event/dao/EventJoinDaoImpl.java @@ -16,53 +16,22 @@ // under the License. package com.cloud.event.dao; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.ArrayList; -import java.util.Collection; -import java.util.Hashtable; import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; -import com.cloud.api.ApiDBUtils; import com.cloud.api.ApiResponseHelper; -import com.cloud.api.response.DomainRouterResponse; -import com.cloud.api.response.EventResponse; -import com.cloud.api.response.NicResponse; -import com.cloud.api.response.ResourceTagResponse; -import com.cloud.api.response.SecurityGroupResponse; -import com.cloud.api.response.UserVmResponse; -import com.cloud.api.view.vo.DomainRouterJoinVO; -import com.cloud.api.view.vo.EventJoinVO; -import com.cloud.api.view.vo.ResourceTagJoinVO; -import com.cloud.dc.DataCenter; +import org.apache.cloudstack.api.response.EventResponse; +import org.apache.cloudstack.api.view.vo.EventJoinVO; import com.cloud.event.Event; -import com.cloud.event.EventVO; import com.cloud.event.Event.State; -import com.cloud.network.Network; -import com.cloud.network.Networks.TrafficType; -import com.cloud.network.router.VirtualRouter; -import com.cloud.offering.ServiceOffering; -import com.cloud.projects.Project; -import com.cloud.server.ResourceTag; -import com.cloud.user.Account; -import com.cloud.user.User; -import com.cloud.uservm.UserVm; -import com.cloud.utils.Pair; -import com.cloud.utils.db.Attribute; -import com.cloud.utils.db.DB; import com.cloud.utils.db.Filter; import com.cloud.utils.db.GenericDaoBase; -import com.cloud.utils.db.JoinBuilder; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.Transaction; -import com.cloud.utils.exception.CloudRuntimeException; -import com.cloud.vm.NicProfile; @Local(value={EventJoinDao.class}) diff --git a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java index 018369d7b31..57509ffea12 100644 --- a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java +++ b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java @@ -37,7 +37,7 @@ import org.apache.cloudstack.api.BaseListAccountResourcesCmd; 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.command.user.vm.DeployVMCmd; 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; diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java index 0a0ea005c69..c63e855eee0 100755 --- a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java +++ b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java @@ -36,7 +36,7 @@ import org.apache.log4j.Logger; 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 org.apache.cloudstack.api.response.ServiceResponse; import com.cloud.configuration.Config; import com.cloud.configuration.ConfigurationManager; import com.cloud.configuration.dao.ConfigurationDao; diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java index b22f2446e6d..a9d1f0bd7a3 100755 --- a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java +++ b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java @@ -46,7 +46,7 @@ import com.cloud.agent.api.SecurityGroupRulesCmd; import com.cloud.agent.api.SecurityGroupRulesCmd.IpPortAndProto; import com.cloud.agent.manager.Commands; import org.apache.cloudstack.api.command.user.securitygroup.RevokeSecurityGroupEgressCmd; -import com.cloud.api.view.vo.SecurityGroupJoinVO; +import org.apache.cloudstack.api.view.vo.SecurityGroupJoinVO; import com.cloud.configuration.Config; import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.domain.dao.DomainDao; diff --git a/server/src/com/cloud/network/security/dao/SecurityGroupJoinDao.java b/server/src/com/cloud/network/security/dao/SecurityGroupJoinDao.java index cc79cdaff14..30c089762d5 100644 --- a/server/src/com/cloud/network/security/dao/SecurityGroupJoinDao.java +++ b/server/src/com/cloud/network/security/dao/SecurityGroupJoinDao.java @@ -18,8 +18,8 @@ package com.cloud.network.security.dao; import java.util.List; -import com.cloud.api.response.SecurityGroupResponse; -import com.cloud.api.view.vo.SecurityGroupJoinVO; +import org.apache.cloudstack.api.response.SecurityGroupResponse; +import org.apache.cloudstack.api.view.vo.SecurityGroupJoinVO; import com.cloud.network.security.SecurityGroup; import com.cloud.user.Account; import com.cloud.utils.db.GenericDao; diff --git a/server/src/com/cloud/network/security/dao/SecurityGroupJoinDaoImpl.java b/server/src/com/cloud/network/security/dao/SecurityGroupJoinDaoImpl.java index 019cf2c4f1e..8afb0cd4883 100644 --- a/server/src/com/cloud/network/security/dao/SecurityGroupJoinDaoImpl.java +++ b/server/src/com/cloud/network/security/dao/SecurityGroupJoinDaoImpl.java @@ -16,12 +16,7 @@ // under the License. package com.cloud.network.security.dao; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.ArrayList; -import java.util.Collection; -import java.util.Hashtable; import java.util.List; import javax.ejb.Local; @@ -30,35 +25,16 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.ApiResponseHelper; -import com.cloud.api.response.DomainRouterResponse; -import com.cloud.api.response.NicResponse; -import com.cloud.api.response.ResourceTagResponse; -import com.cloud.api.response.SecurityGroupResponse; -import com.cloud.api.response.SecurityGroupRuleResponse; -import com.cloud.api.response.UserVmResponse; -import com.cloud.api.view.vo.DomainRouterJoinVO; -import com.cloud.api.view.vo.ResourceTagJoinVO; -import com.cloud.api.view.vo.SecurityGroupJoinVO; -import com.cloud.dc.DataCenter; -import com.cloud.network.Network; -import com.cloud.network.Networks.TrafficType; -import com.cloud.network.router.VirtualRouter; +import org.apache.cloudstack.api.response.SecurityGroupResponse; +import org.apache.cloudstack.api.response.SecurityGroupRuleResponse; +import org.apache.cloudstack.api.view.vo.ResourceTagJoinVO; +import org.apache.cloudstack.api.view.vo.SecurityGroupJoinVO; import com.cloud.network.security.SecurityGroup; import com.cloud.network.security.SecurityRule.SecurityRuleType; -import com.cloud.offering.ServiceOffering; import com.cloud.user.Account; -import com.cloud.uservm.UserVm; -import com.cloud.utils.Pair; -import com.cloud.utils.db.Attribute; -import com.cloud.utils.db.DB; -import com.cloud.utils.db.Filter; import com.cloud.utils.db.GenericDaoBase; -import com.cloud.utils.db.JoinBuilder; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.Transaction; -import com.cloud.utils.exception.CloudRuntimeException; -import com.cloud.vm.NicProfile; @Local(value={SecurityGroupJoinDao.class}) public class SecurityGroupJoinDaoImpl extends GenericDaoBase implements SecurityGroupJoinDao { diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java index 5a8d2851170..b24bf3f4f53 100644 --- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java @@ -30,11 +30,11 @@ import java.util.concurrent.TimeUnit; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.apache.cloudstack.api.command.user.vpc.ListStaticRoutesCmd; import org.apache.log4j.Logger; import com.cloud.acl.ControlledEntity.ACLType; -import org.apache.cloudstack.api.user.vpc.command.ListPrivateGatewaysCmd; -import org.apache.cloudstack.api.user.vpc.command.ListStaticRoutesCmd; +import org.apache.cloudstack.api.command.user.vpc.ListPrivateGatewaysCmd; import com.cloud.configuration.Config; import com.cloud.configuration.ConfigurationManager; import com.cloud.configuration.Resource.ResourceType; diff --git a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java index 2309cd3229e..46b5af95eb8 100755 --- a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java +++ b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java @@ -26,7 +26,7 @@ import javax.naming.ConfigurationException; import org.apache.cloudstack.api.command.user.user.ListVpnUsersCmd; import org.apache.log4j.Logger; -import org.apache.cloudstack.api.user.vpn.command.ListRemoteAccessVpnsCmd; +import org.apache.cloudstack.api.command.user.vpn.ListRemoteAccessVpnsCmd; import com.cloud.configuration.Config; import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.domain.DomainVO; diff --git a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java index 95ce099b5a5..5416db7e075 100644 --- a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java +++ b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java @@ -25,17 +25,17 @@ import javax.naming.ConfigurationException; import org.apache.log4j.Logger; -import org.apache.cloudstack.api.user.vpn.command.CreateVpnConnectionCmd; -import org.apache.cloudstack.api.user.vpn.command.CreateVpnCustomerGatewayCmd; -import org.apache.cloudstack.api.user.vpn.command.CreateVpnGatewayCmd; -import org.apache.cloudstack.api.user.vpn.command.DeleteVpnConnectionCmd; -import org.apache.cloudstack.api.user.vpn.command.DeleteVpnCustomerGatewayCmd; -import org.apache.cloudstack.api.user.vpn.command.DeleteVpnGatewayCmd; -import org.apache.cloudstack.api.user.vpn.command.ListVpnConnectionsCmd; -import org.apache.cloudstack.api.user.vpn.command.ListVpnCustomerGatewaysCmd; -import org.apache.cloudstack.api.user.vpn.command.ListVpnGatewaysCmd; -import org.apache.cloudstack.api.user.vpn.command.ResetVpnConnectionCmd; -import org.apache.cloudstack.api.user.vpn.command.UpdateVpnCustomerGatewayCmd; +import org.apache.cloudstack.api.command.user.vpn.CreateVpnConnectionCmd; +import org.apache.cloudstack.api.command.user.vpn.CreateVpnCustomerGatewayCmd; +import org.apache.cloudstack.api.command.user.vpn.CreateVpnGatewayCmd; +import org.apache.cloudstack.api.command.user.vpn.DeleteVpnConnectionCmd; +import org.apache.cloudstack.api.command.user.vpn.DeleteVpnCustomerGatewayCmd; +import org.apache.cloudstack.api.command.user.vpn.DeleteVpnGatewayCmd; +import org.apache.cloudstack.api.command.user.vpn.ListVpnConnectionsCmd; +import org.apache.cloudstack.api.command.user.vpn.ListVpnCustomerGatewaysCmd; +import org.apache.cloudstack.api.command.user.vpn.ListVpnGatewaysCmd; +import org.apache.cloudstack.api.command.user.vpn.ResetVpnConnectionCmd; +import org.apache.cloudstack.api.command.user.vpn.UpdateVpnCustomerGatewayCmd; import com.cloud.configuration.Config; import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.event.ActionEvent; diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 40b88c543fd..be6bbefc6c5 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -63,8 +63,9 @@ 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.cloudstack.api.command.user.vm.GetVMPasswordCmd; +import org.apache.cloudstack.api.command.user.vmgroup.ListVMGroupsCmd; +import org.apache.cloudstack.api.command.user.zone.ListZonesByCmd; import org.apache.commons.codec.binary.Base64; import org.apache.log4j.Logger; @@ -82,8 +83,7 @@ import com.cloud.alert.dao.AlertDao; import org.apache.cloudstack.api.ApiConstants; import com.cloud.api.ApiDBUtils; 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.command.user.volume.ExtractVolumeCmd; 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; @@ -95,11 +95,11 @@ 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.command.user.vmgroup.UpdateVMGroupCmd; 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; +import org.apache.cloudstack.api.response.ExtractResponse; +import org.apache.cloudstack.api.view.vo.DomainRouterJoinVO; +import org.apache.cloudstack.api.view.vo.EventJoinVO; import com.cloud.async.AsyncJob; import com.cloud.async.AsyncJobExecutor; import com.cloud.async.AsyncJobManager; diff --git a/server/src/com/cloud/server/api/response/BaremetalTemplateResponse.java b/server/src/com/cloud/server/api/response/BaremetalTemplateResponse.java index 1be4c285260..9718717c052 100644 --- a/server/src/com/cloud/server/api/response/BaremetalTemplateResponse.java +++ b/server/src/com/cloud/server/api/response/BaremetalTemplateResponse.java @@ -17,7 +17,7 @@ package com.cloud.server.api.response; import com.cloud.utils.IdentityProxy; -import com.cloud.api.response.BaseResponse; +import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; diff --git a/server/src/com/cloud/server/api/response/TrafficMonitorResponse.java b/server/src/com/cloud/server/api/response/TrafficMonitorResponse.java index 70732fbcc80..a01e658656c 100644 --- a/server/src/com/cloud/server/api/response/TrafficMonitorResponse.java +++ b/server/src/com/cloud/server/api/response/TrafficMonitorResponse.java @@ -18,7 +18,7 @@ package com.cloud.server.api.response; import org.apache.cloudstack.api.ApiConstants; import com.cloud.utils.IdentityProxy; -import com.cloud.api.response.BaseResponse; +import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; diff --git a/server/src/com/cloud/server/api/response/UsageRecordResponse.java b/server/src/com/cloud/server/api/response/UsageRecordResponse.java index 65361a11add..63712e14256 100644 --- a/server/src/com/cloud/server/api/response/UsageRecordResponse.java +++ b/server/src/com/cloud/server/api/response/UsageRecordResponse.java @@ -18,8 +18,8 @@ package com.cloud.server.api.response; import org.apache.cloudstack.api.ApiConstants; import com.cloud.utils.IdentityProxy; -import com.cloud.api.response.BaseResponse; -import com.cloud.api.response.ControlledEntityResponse; +import org.apache.cloudstack.api.BaseResponse; +import org.apache.cloudstack.api.response.ControlledEntityResponse; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; diff --git a/server/src/com/cloud/server/api/response/UsageTypeResponse.java b/server/src/com/cloud/server/api/response/UsageTypeResponse.java index 068f43c6a66..ea834fc3b57 100644 --- a/server/src/com/cloud/server/api/response/UsageTypeResponse.java +++ b/server/src/com/cloud/server/api/response/UsageTypeResponse.java @@ -17,7 +17,7 @@ package com.cloud.server.api.response; import org.apache.cloudstack.api.ApiConstants; -import com.cloud.api.response.BaseResponse; +import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; diff --git a/server/src/com/cloud/server/api/response/netapp/AssociateLunCmdResponse.java b/server/src/com/cloud/server/api/response/netapp/AssociateLunCmdResponse.java index 4093cf2a588..441b9788108 100644 --- a/server/src/com/cloud/server/api/response/netapp/AssociateLunCmdResponse.java +++ b/server/src/com/cloud/server/api/response/netapp/AssociateLunCmdResponse.java @@ -17,7 +17,7 @@ package com.cloud.server.api.response.netapp; import org.apache.cloudstack.api.ApiConstants; -import com.cloud.api.response.BaseResponse; +import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; diff --git a/server/src/com/cloud/server/api/response/netapp/CreateLunCmdResponse.java b/server/src/com/cloud/server/api/response/netapp/CreateLunCmdResponse.java index e87f6a117a4..56164eb7843 100644 --- a/server/src/com/cloud/server/api/response/netapp/CreateLunCmdResponse.java +++ b/server/src/com/cloud/server/api/response/netapp/CreateLunCmdResponse.java @@ -17,7 +17,7 @@ package com.cloud.server.api.response.netapp; import org.apache.cloudstack.api.ApiConstants; -import com.cloud.api.response.BaseResponse; +import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; diff --git a/server/src/com/cloud/server/api/response/netapp/CreateVolumeOnFilerCmdResponse.java b/server/src/com/cloud/server/api/response/netapp/CreateVolumeOnFilerCmdResponse.java index b561b01823a..066c1c0fa2c 100644 --- a/server/src/com/cloud/server/api/response/netapp/CreateVolumeOnFilerCmdResponse.java +++ b/server/src/com/cloud/server/api/response/netapp/CreateVolumeOnFilerCmdResponse.java @@ -16,7 +16,7 @@ // under the License. package com.cloud.server.api.response.netapp; -import com.cloud.api.response.BaseResponse; +import org.apache.cloudstack.api.BaseResponse; public class CreateVolumeOnFilerCmdResponse extends BaseResponse { } diff --git a/server/src/com/cloud/server/api/response/netapp/CreateVolumePoolCmdResponse.java b/server/src/com/cloud/server/api/response/netapp/CreateVolumePoolCmdResponse.java index 21afec15022..0c7acfa9189 100644 --- a/server/src/com/cloud/server/api/response/netapp/CreateVolumePoolCmdResponse.java +++ b/server/src/com/cloud/server/api/response/netapp/CreateVolumePoolCmdResponse.java @@ -16,7 +16,7 @@ // under the License. package com.cloud.server.api.response.netapp; -import com.cloud.api.response.BaseResponse; +import org.apache.cloudstack.api.BaseResponse; public class CreateVolumePoolCmdResponse extends BaseResponse{ } diff --git a/server/src/com/cloud/server/api/response/netapp/DeleteLUNCmdResponse.java b/server/src/com/cloud/server/api/response/netapp/DeleteLUNCmdResponse.java index 57af127ae58..b4e697b116e 100644 --- a/server/src/com/cloud/server/api/response/netapp/DeleteLUNCmdResponse.java +++ b/server/src/com/cloud/server/api/response/netapp/DeleteLUNCmdResponse.java @@ -16,7 +16,7 @@ // under the License. package com.cloud.server.api.response.netapp; -import com.cloud.api.response.BaseResponse; +import org.apache.cloudstack.api.BaseResponse; public class DeleteLUNCmdResponse extends BaseResponse{ } diff --git a/server/src/com/cloud/server/api/response/netapp/DeleteVolumeOnFilerCmdResponse.java b/server/src/com/cloud/server/api/response/netapp/DeleteVolumeOnFilerCmdResponse.java index 6d6f367302c..40083ec3a98 100644 --- a/server/src/com/cloud/server/api/response/netapp/DeleteVolumeOnFilerCmdResponse.java +++ b/server/src/com/cloud/server/api/response/netapp/DeleteVolumeOnFilerCmdResponse.java @@ -16,7 +16,7 @@ // under the License. package com.cloud.server.api.response.netapp; -import com.cloud.api.response.BaseResponse; +import org.apache.cloudstack.api.BaseResponse; public class DeleteVolumeOnFilerCmdResponse extends BaseResponse { } diff --git a/server/src/com/cloud/server/api/response/netapp/DeleteVolumePoolCmdResponse.java b/server/src/com/cloud/server/api/response/netapp/DeleteVolumePoolCmdResponse.java index 4f9dc46338f..1740ddc222a 100644 --- a/server/src/com/cloud/server/api/response/netapp/DeleteVolumePoolCmdResponse.java +++ b/server/src/com/cloud/server/api/response/netapp/DeleteVolumePoolCmdResponse.java @@ -16,7 +16,7 @@ // under the License. package com.cloud.server.api.response.netapp; -import com.cloud.api.response.BaseResponse; +import org.apache.cloudstack.api.BaseResponse; public class DeleteVolumePoolCmdResponse extends BaseResponse { } diff --git a/server/src/com/cloud/server/api/response/netapp/DissociateLunCmdResponse.java b/server/src/com/cloud/server/api/response/netapp/DissociateLunCmdResponse.java index fd9cd606038..ce3160b699d 100644 --- a/server/src/com/cloud/server/api/response/netapp/DissociateLunCmdResponse.java +++ b/server/src/com/cloud/server/api/response/netapp/DissociateLunCmdResponse.java @@ -16,7 +16,7 @@ // under the License. package com.cloud.server.api.response.netapp; -import com.cloud.api.response.BaseResponse; +import org.apache.cloudstack.api.BaseResponse; public class DissociateLunCmdResponse extends BaseResponse { } diff --git a/server/src/com/cloud/server/api/response/netapp/ListLunsCmdResponse.java b/server/src/com/cloud/server/api/response/netapp/ListLunsCmdResponse.java index ed907265bb0..bd0ee3f4614 100644 --- a/server/src/com/cloud/server/api/response/netapp/ListLunsCmdResponse.java +++ b/server/src/com/cloud/server/api/response/netapp/ListLunsCmdResponse.java @@ -17,7 +17,7 @@ package com.cloud.server.api.response.netapp; import org.apache.cloudstack.api.ApiConstants; -import com.cloud.api.response.BaseResponse; +import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; diff --git a/server/src/com/cloud/server/api/response/netapp/ListVolumePoolsCmdResponse.java b/server/src/com/cloud/server/api/response/netapp/ListVolumePoolsCmdResponse.java index 56359e52ee3..b3f0fe31b3b 100644 --- a/server/src/com/cloud/server/api/response/netapp/ListVolumePoolsCmdResponse.java +++ b/server/src/com/cloud/server/api/response/netapp/ListVolumePoolsCmdResponse.java @@ -17,7 +17,7 @@ package com.cloud.server.api.response.netapp; import org.apache.cloudstack.api.ApiConstants; -import com.cloud.api.response.BaseResponse; +import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; diff --git a/server/src/com/cloud/server/api/response/netapp/ListVolumesOnFilerCmdResponse.java b/server/src/com/cloud/server/api/response/netapp/ListVolumesOnFilerCmdResponse.java index 8c9ccba6b87..222e45c1320 100644 --- a/server/src/com/cloud/server/api/response/netapp/ListVolumesOnFilerCmdResponse.java +++ b/server/src/com/cloud/server/api/response/netapp/ListVolumesOnFilerCmdResponse.java @@ -17,7 +17,7 @@ package com.cloud.server.api.response.netapp; import org.apache.cloudstack.api.ApiConstants; -import com.cloud.api.response.BaseResponse; +import org.apache.cloudstack.api.BaseResponse; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; diff --git a/server/src/com/cloud/server/api/response/netapp/ModifyVolumePoolCmdResponse.java b/server/src/com/cloud/server/api/response/netapp/ModifyVolumePoolCmdResponse.java index 444c2e7f5a0..fa0c069c842 100644 --- a/server/src/com/cloud/server/api/response/netapp/ModifyVolumePoolCmdResponse.java +++ b/server/src/com/cloud/server/api/response/netapp/ModifyVolumePoolCmdResponse.java @@ -16,7 +16,7 @@ // under the License. package com.cloud.server.api.response.netapp; -import com.cloud.api.response.BaseResponse; +import org.apache.cloudstack.api.BaseResponse; public class ModifyVolumePoolCmdResponse extends BaseResponse { } diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index a86ec01c09a..1f625d3f69b 100755 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/com/cloud/storage/StorageManagerImpl.java @@ -45,7 +45,8 @@ 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.cloudstack.api.command.user.volume.CreateVolumeCmd; +import org.apache.cloudstack.api.command.user.volume.UploadVolumeCmd; import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; @@ -75,9 +76,8 @@ import com.cloud.alert.AlertManager; import com.cloud.api.ApiDBUtils; 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.command.user.volume.ListVolumesCmd; 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; import com.cloud.capacity.CapacityManager; diff --git a/server/src/com/cloud/storage/upload/UploadListener.java b/server/src/com/cloud/storage/upload/UploadListener.java index a2d9f01c8f9..4303e437bb6 100755 --- a/server/src/com/cloud/storage/upload/UploadListener.java +++ b/server/src/com/cloud/storage/upload/UploadListener.java @@ -25,7 +25,7 @@ import java.util.Timer; import java.util.TimerTask; import org.apache.cloudstack.api.command.user.iso.ExtractIsoCmd; -import org.apache.cloudstack.api.user.volume.command.ExtractVolumeCmd; +import org.apache.cloudstack.api.command.user.volume.ExtractVolumeCmd; import org.apache.log4j.Level; import org.apache.log4j.Logger; @@ -41,7 +41,7 @@ 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.command.user.template.ExtractTemplateCmd; -import com.cloud.api.response.ExtractResponse; +import org.apache.cloudstack.api.response.ExtractResponse; import com.cloud.async.AsyncJobManager; import com.cloud.async.AsyncJobResult; import com.cloud.exception.AgentUnavailableException; diff --git a/server/src/com/cloud/tags/TaggedResourceManagerImpl.java b/server/src/com/cloud/tags/TaggedResourceManagerImpl.java index 56240117ee8..0f82142d6b5 100644 --- a/server/src/com/cloud/tags/TaggedResourceManagerImpl.java +++ b/server/src/com/cloud/tags/TaggedResourceManagerImpl.java @@ -27,7 +27,7 @@ import javax.naming.ConfigurationException; import org.apache.cloudstack.api.command.user.tag.ListTagsCmd; import org.apache.log4j.Logger; -import com.cloud.api.view.vo.ResourceTagJoinVO; +import org.apache.cloudstack.api.view.vo.ResourceTagJoinVO; import com.cloud.domain.Domain; import com.cloud.event.ActionEvent; import com.cloud.event.EventTypes; diff --git a/server/src/com/cloud/tags/dao/ResourceTagJoinDao.java b/server/src/com/cloud/tags/dao/ResourceTagJoinDao.java index 8aa0a16f285..8dd3d82d02e 100644 --- a/server/src/com/cloud/tags/dao/ResourceTagJoinDao.java +++ b/server/src/com/cloud/tags/dao/ResourceTagJoinDao.java @@ -18,10 +18,9 @@ package com.cloud.tags.dao; import java.util.List; -import com.cloud.api.response.ResourceTagResponse; -import com.cloud.api.view.vo.ResourceTagJoinVO; +import org.apache.cloudstack.api.response.ResourceTagResponse; +import org.apache.cloudstack.api.view.vo.ResourceTagJoinVO; import com.cloud.server.ResourceTag; -import com.cloud.user.Account; import com.cloud.utils.db.GenericDao; public interface ResourceTagJoinDao extends GenericDao { diff --git a/server/src/com/cloud/tags/dao/ResourceTagJoinDaoImpl.java b/server/src/com/cloud/tags/dao/ResourceTagJoinDaoImpl.java index 55b2f7f69ed..59f8cad0eaa 100644 --- a/server/src/com/cloud/tags/dao/ResourceTagJoinDaoImpl.java +++ b/server/src/com/cloud/tags/dao/ResourceTagJoinDaoImpl.java @@ -16,47 +16,20 @@ // under the License. package com.cloud.tags.dao; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.ArrayList; -import java.util.Collection; -import java.util.Hashtable; import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; -import com.cloud.api.ApiDBUtils; import com.cloud.api.ApiResponseHelper; -import com.cloud.api.response.DomainRouterResponse; -import com.cloud.api.response.NicResponse; -import com.cloud.api.response.ResourceTagResponse; -import com.cloud.api.response.SecurityGroupResponse; -import com.cloud.api.response.UserVmResponse; -import com.cloud.api.view.vo.DomainRouterJoinVO; -import com.cloud.api.view.vo.ResourceTagJoinVO; -import com.cloud.dc.DataCenter; -import com.cloud.network.Network; -import com.cloud.network.Networks.TrafficType; -import com.cloud.network.router.VirtualRouter; -import com.cloud.offering.ServiceOffering; -import com.cloud.projects.Project; +import org.apache.cloudstack.api.response.ResourceTagResponse; +import org.apache.cloudstack.api.view.vo.ResourceTagJoinVO; import com.cloud.server.ResourceTag; -import com.cloud.user.Account; -import com.cloud.uservm.UserVm; -import com.cloud.utils.Pair; -import com.cloud.utils.db.Attribute; -import com.cloud.utils.db.DB; -import com.cloud.utils.db.Filter; import com.cloud.utils.db.GenericDaoBase; -import com.cloud.utils.db.JoinBuilder; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.Transaction; -import com.cloud.utils.exception.CloudRuntimeException; -import com.cloud.vm.NicProfile; @Local(value={ResourceTagJoinDao.class}) diff --git a/server/src/com/cloud/user/AccountManager.java b/server/src/com/cloud/user/AccountManager.java index 3cc7d12e7a2..56a2394d3c6 100755 --- a/server/src/com/cloud/user/AccountManager.java +++ b/server/src/com/cloud/user/AccountManager.java @@ -20,11 +20,8 @@ import java.util.List; import java.util.Map; import com.cloud.acl.ControlledEntity; -import com.cloud.acl.SecurityChecker.AccessType; -import com.cloud.api.view.vo.ControlledViewEntity; -import com.cloud.domain.Domain; +import org.apache.cloudstack.api.view.vo.ControlledViewEntity; import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.PermissionDeniedException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.projects.Project.ListProjectResourcesCriteria; import com.cloud.utils.Pair; diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java index 36dc4989132..c0cbe474636 100755 --- a/server/src/com/cloud/user/AccountManagerImpl.java +++ b/server/src/com/cloud/user/AccountManagerImpl.java @@ -43,7 +43,7 @@ import org.apache.commons.codec.binary.Base64; import org.apache.log4j.Logger; import com.cloud.acl.ControlledEntity; -import com.cloud.api.view.vo.ControlledViewEntity; +import org.apache.cloudstack.api.view.vo.ControlledViewEntity; import com.cloud.acl.SecurityChecker; import com.cloud.acl.SecurityChecker.AccessType; import com.cloud.api.ApiDBUtils; diff --git a/server/src/com/cloud/vm/UserVmManager.java b/server/src/com/cloud/vm/UserVmManager.java index 1a2f50808d3..f58b10e3034 100755 --- a/server/src/com/cloud/vm/UserVmManager.java +++ b/server/src/com/cloud/vm/UserVmManager.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Map; import com.cloud.agent.api.VmStatsEntry; -import com.cloud.api.view.vo.UserVmJoinVO; +import org.apache.cloudstack.api.view.vo.UserVmJoinVO; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceUnavailableException; diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index e04f009e8d5..a8241d02ea7 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -32,9 +32,11 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; 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; +import org.apache.cloudstack.api.command.user.vm.*; +import org.apache.cloudstack.api.command.user.vmgroup.CreateVMGroupCmd; +import org.apache.cloudstack.api.command.user.vmgroup.DeleteVMGroupCmd; +import org.apache.cloudstack.api.command.user.volume.AttachVolumeCmd; +import org.apache.cloudstack.api.command.user.volume.DetachVolumeCmd; import org.apache.commons.codec.binary.Base64; import org.apache.log4j.Logger; @@ -63,18 +65,16 @@ import com.cloud.alert.AlertManager; import com.cloud.api.ApiDBUtils; import org.apache.cloudstack.api.BaseCmd; 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.command.user.vm.DeployVMCmd; +import org.apache.cloudstack.api.command.user.vm.DestroyVMCmd; +import org.apache.cloudstack.api.command.user.vm.ListVMsCmd; +import org.apache.cloudstack.api.command.user.vm.RebootVMCmd; 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; -import org.apache.cloudstack.api.user.vm.command.UpdateVMCmd; -import org.apache.cloudstack.api.user.vm.command.UpgradeVMCmd; -import com.cloud.api.view.vo.UserVmJoinVO; +import org.apache.cloudstack.api.command.user.vm.ResetVMPasswordCmd; +import org.apache.cloudstack.api.command.user.vm.RestoreVMCmd; +import org.apache.cloudstack.api.command.user.vm.UpdateVMCmd; +import org.apache.cloudstack.api.command.user.vm.UpgradeVMCmd; +import org.apache.cloudstack.api.view.vo.UserVmJoinVO; import com.cloud.async.AsyncJobExecutor; import com.cloud.async.AsyncJobManager; import com.cloud.async.AsyncJobVO; diff --git a/server/src/com/cloud/vm/dao/DomainRouterJoinDao.java b/server/src/com/cloud/vm/dao/DomainRouterJoinDao.java index c7c749b5690..9bb03be7539 100644 --- a/server/src/com/cloud/vm/dao/DomainRouterJoinDao.java +++ b/server/src/com/cloud/vm/dao/DomainRouterJoinDao.java @@ -18,8 +18,8 @@ package com.cloud.vm.dao; import java.util.List; -import com.cloud.api.response.DomainRouterResponse; -import com.cloud.api.view.vo.DomainRouterJoinVO; +import org.apache.cloudstack.api.response.DomainRouterResponse; +import org.apache.cloudstack.api.view.vo.DomainRouterJoinVO; import com.cloud.network.router.VirtualRouter; import com.cloud.user.Account; import com.cloud.utils.db.GenericDao; diff --git a/server/src/com/cloud/vm/dao/DomainRouterJoinDaoImpl.java b/server/src/com/cloud/vm/dao/DomainRouterJoinDaoImpl.java index a3f7d77bcdf..f7a91466d5c 100644 --- a/server/src/com/cloud/vm/dao/DomainRouterJoinDaoImpl.java +++ b/server/src/com/cloud/vm/dao/DomainRouterJoinDaoImpl.java @@ -16,44 +16,23 @@ // under the License. package com.cloud.vm.dao; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.ArrayList; -import java.util.Collection; -import java.util.Hashtable; import java.util.List; import javax.ejb.Local; import org.apache.log4j.Logger; -import com.cloud.api.ApiDBUtils; import com.cloud.api.ApiResponseHelper; -import com.cloud.api.response.DomainRouterResponse; -import com.cloud.api.response.NicResponse; -import com.cloud.api.response.ResourceTagResponse; -import com.cloud.api.response.SecurityGroupResponse; -import com.cloud.api.response.UserVmResponse; -import com.cloud.api.view.vo.DomainRouterJoinVO; -import com.cloud.dc.DataCenter; -import com.cloud.network.Network; +import org.apache.cloudstack.api.response.DomainRouterResponse; +import org.apache.cloudstack.api.response.NicResponse; +import org.apache.cloudstack.api.view.vo.DomainRouterJoinVO; import com.cloud.network.Networks.TrafficType; import com.cloud.network.router.VirtualRouter; -import com.cloud.offering.ServiceOffering; import com.cloud.user.Account; -import com.cloud.uservm.UserVm; -import com.cloud.utils.Pair; -import com.cloud.utils.db.Attribute; -import com.cloud.utils.db.DB; -import com.cloud.utils.db.Filter; import com.cloud.utils.db.GenericDaoBase; -import com.cloud.utils.db.JoinBuilder; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.Transaction; -import com.cloud.utils.exception.CloudRuntimeException; -import com.cloud.vm.NicProfile; @Local(value={DomainRouterJoinDao.class}) diff --git a/server/src/com/cloud/vm/dao/UserVmData.java b/server/src/com/cloud/vm/dao/UserVmData.java index 82c737c0e5b..674fc005a85 100644 --- a/server/src/com/cloud/vm/dao/UserVmData.java +++ b/server/src/com/cloud/vm/dao/UserVmData.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import com.cloud.api.response.SecurityGroupRuleResponse; +import org.apache.cloudstack.api.response.SecurityGroupRuleResponse; public class UserVmData { private Long id; diff --git a/server/src/com/cloud/vm/dao/UserVmJoinDao.java b/server/src/com/cloud/vm/dao/UserVmJoinDao.java index 057e043295f..7788a62dca7 100644 --- a/server/src/com/cloud/vm/dao/UserVmJoinDao.java +++ b/server/src/com/cloud/vm/dao/UserVmJoinDao.java @@ -20,8 +20,8 @@ import java.util.EnumSet; import java.util.List; import org.apache.cloudstack.api.ApiConstants.VMDetails; -import com.cloud.api.response.UserVmResponse; -import com.cloud.api.view.vo.UserVmJoinVO; +import org.apache.cloudstack.api.response.UserVmResponse; +import org.apache.cloudstack.api.view.vo.UserVmJoinVO; import com.cloud.user.Account; import com.cloud.uservm.UserVm; import com.cloud.utils.db.GenericDao; diff --git a/server/src/com/cloud/vm/dao/UserVmJoinDaoImpl.java b/server/src/com/cloud/vm/dao/UserVmJoinDaoImpl.java index 742784cd42b..b20e53f10ea 100644 --- a/server/src/com/cloud/vm/dao/UserVmJoinDaoImpl.java +++ b/server/src/com/cloud/vm/dao/UserVmJoinDaoImpl.java @@ -16,12 +16,8 @@ // under the License. package com.cloud.vm.dao; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; import java.text.DecimalFormat; import java.util.ArrayList; -import java.util.Collection; import java.util.EnumSet; import java.util.Hashtable; import java.util.List; @@ -32,24 +28,16 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import org.apache.cloudstack.api.ApiConstants.VMDetails; -import com.cloud.api.response.NicResponse; -import com.cloud.api.response.ResourceTagResponse; -import com.cloud.api.response.SecurityGroupResponse; -import com.cloud.api.response.UserVmResponse; -import com.cloud.api.view.vo.ResourceTagJoinVO; -import com.cloud.api.view.vo.UserVmJoinVO; +import org.apache.cloudstack.api.response.NicResponse; +import org.apache.cloudstack.api.response.SecurityGroupResponse; +import org.apache.cloudstack.api.response.UserVmResponse; +import org.apache.cloudstack.api.view.vo.ResourceTagJoinVO; +import org.apache.cloudstack.api.view.vo.UserVmJoinVO; import com.cloud.user.Account; import com.cloud.uservm.UserVm; -import com.cloud.utils.Pair; -import com.cloud.utils.db.Attribute; -import com.cloud.utils.db.DB; -import com.cloud.utils.db.Filter; import com.cloud.utils.db.GenericDaoBase; -import com.cloud.utils.db.JoinBuilder; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.Transaction; -import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.vm.VmStats; diff --git a/server/test/com/cloud/keystore/KeystoreTest.java b/server/test/com/cloud/keystore/KeystoreTest.java index a0ffb688f26..21d5d9c13e0 100644 --- a/server/test/com/cloud/keystore/KeystoreTest.java +++ b/server/test/com/cloud/keystore/KeystoreTest.java @@ -23,8 +23,8 @@ import org.junit.After; import org.junit.Before; import com.cloud.api.ApiSerializerHelper; -import com.cloud.api.response.AlertResponse; -import com.cloud.api.response.UserVmResponse; +import org.apache.cloudstack.api.response.AlertResponse; +import org.apache.cloudstack.api.response.UserVmResponse; public class KeystoreTest extends TestCase { private final static Logger s_logger = Logger.getLogger(KeystoreTest.class); diff --git a/server/test/com/cloud/user/MockAccountManagerImpl.java b/server/test/com/cloud/user/MockAccountManagerImpl.java index 2c002fde9be..90422c72668 100644 --- a/server/test/com/cloud/user/MockAccountManagerImpl.java +++ b/server/test/com/cloud/user/MockAccountManagerImpl.java @@ -30,7 +30,7 @@ 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 org.apache.cloudstack.api.view.vo.ControlledViewEntity; import com.cloud.domain.Domain; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.PermissionDeniedException; diff --git a/server/test/com/cloud/vm/MockUserVmManagerImpl.java b/server/test/com/cloud/vm/MockUserVmManagerImpl.java index 074000bc1a3..08e7ee27555 100644 --- a/server/test/com/cloud/vm/MockUserVmManagerImpl.java +++ b/server/test/com/cloud/vm/MockUserVmManagerImpl.java @@ -30,21 +30,21 @@ import com.cloud.agent.api.to.VirtualMachineTO; import com.cloud.agent.manager.Commands; 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.command.user.vm.*; +import org.apache.cloudstack.api.command.user.vmgroup.DeleteVMGroupCmd; +import org.apache.cloudstack.api.command.user.volume.AttachVolumeCmd; +import org.apache.cloudstack.api.command.user.volume.DetachVolumeCmd; 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; -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.user.vm.command.ResetVMPasswordCmd; -import org.apache.cloudstack.api.user.vm.command.RestoreVMCmd; -import org.apache.cloudstack.api.user.vm.command.StartVMCmd; -import org.apache.cloudstack.api.user.vm.command.UpdateVMCmd; -import org.apache.cloudstack.api.user.vm.command.UpgradeVMCmd; -import com.cloud.api.view.vo.UserVmJoinVO; +import org.apache.cloudstack.api.command.user.vmgroup.CreateVMGroupCmd; +import org.apache.cloudstack.api.command.user.vm.DestroyVMCmd; +import org.apache.cloudstack.api.command.user.vm.ListVMsCmd; +import org.apache.cloudstack.api.command.user.vm.RebootVMCmd; +import org.apache.cloudstack.api.command.user.vm.ResetVMPasswordCmd; +import org.apache.cloudstack.api.command.user.vm.RestoreVMCmd; +import org.apache.cloudstack.api.command.user.vm.StartVMCmd; +import org.apache.cloudstack.api.command.user.vm.UpdateVMCmd; +import org.apache.cloudstack.api.command.user.vm.UpgradeVMCmd; +import org.apache.cloudstack.api.view.vo.UserVmJoinVO; import com.cloud.dc.DataCenter; import com.cloud.deploy.DeployDestination; import com.cloud.exception.ConcurrentOperationException; diff --git a/server/test/com/cloud/vpc/MockSite2SiteVpnManagerImpl.java b/server/test/com/cloud/vpc/MockSite2SiteVpnManagerImpl.java index 59ec5ce16f9..c112f31f73b 100644 --- a/server/test/com/cloud/vpc/MockSite2SiteVpnManagerImpl.java +++ b/server/test/com/cloud/vpc/MockSite2SiteVpnManagerImpl.java @@ -22,17 +22,16 @@ import java.util.Map; import javax.ejb.Local; import javax.naming.ConfigurationException; -import org.apache.cloudstack.api.user.vpn.command.CreateVpnConnectionCmd; -import org.apache.cloudstack.api.user.vpn.command.CreateVpnCustomerGatewayCmd; -import org.apache.cloudstack.api.user.vpn.command.CreateVpnGatewayCmd; -import org.apache.cloudstack.api.user.vpn.command.DeleteVpnConnectionCmd; -import org.apache.cloudstack.api.user.vpn.command.DeleteVpnCustomerGatewayCmd; -import org.apache.cloudstack.api.user.vpn.command.DeleteVpnGatewayCmd; -import org.apache.cloudstack.api.user.vpn.command.ListVpnConnectionsCmd; -import org.apache.cloudstack.api.user.vpn.command.ListVpnCustomerGatewaysCmd; -import org.apache.cloudstack.api.user.vpn.command.ListVpnGatewaysCmd; -import org.apache.cloudstack.api.user.vpn.command.ResetVpnConnectionCmd; -import org.apache.cloudstack.api.user.vpn.command.UpdateVpnCustomerGatewayCmd; +import org.apache.cloudstack.api.command.user.vpn.*; +import org.apache.cloudstack.api.command.user.vpn.CreateVpnCustomerGatewayCmd; +import org.apache.cloudstack.api.command.user.vpn.CreateVpnGatewayCmd; +import org.apache.cloudstack.api.command.user.vpn.DeleteVpnConnectionCmd; +import org.apache.cloudstack.api.command.user.vpn.DeleteVpnCustomerGatewayCmd; +import org.apache.cloudstack.api.command.user.vpn.DeleteVpnGatewayCmd; +import org.apache.cloudstack.api.command.user.vpn.ListVpnConnectionsCmd; +import org.apache.cloudstack.api.command.user.vpn.ListVpnCustomerGatewaysCmd; +import org.apache.cloudstack.api.command.user.vpn.ListVpnGatewaysCmd; +import org.apache.cloudstack.api.command.user.vpn.UpdateVpnCustomerGatewayCmd; import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.network.Site2SiteCustomerGateway; diff --git a/server/test/com/cloud/vpc/MockVpcManagerImpl.java b/server/test/com/cloud/vpc/MockVpcManagerImpl.java index 27ca4c1b607..090fc240bc6 100644 --- a/server/test/com/cloud/vpc/MockVpcManagerImpl.java +++ b/server/test/com/cloud/vpc/MockVpcManagerImpl.java @@ -24,8 +24,8 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import com.cloud.acl.ControlledEntity.ACLType; -import org.apache.cloudstack.api.user.vpc.command.ListPrivateGatewaysCmd; -import org.apache.cloudstack.api.user.vpc.command.ListStaticRoutesCmd; +import org.apache.cloudstack.api.command.user.vpc.ListPrivateGatewaysCmd; +import org.apache.cloudstack.api.command.user.vpc.ListStaticRoutesCmd; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientAddressCapacityException; import com.cloud.exception.InsufficientCapacityException;