diff --git a/api/src/com/cloud/resource/ResourceService.java b/api/src/com/cloud/resource/ResourceService.java index ade10127773..b9db8e734d9 100755 --- a/api/src/com/cloud/resource/ResourceService.java +++ b/api/src/com/cloud/resource/ResourceService.java @@ -21,11 +21,11 @@ import java.util.List; import org.apache.cloudstack.api.command.admin.cluster.AddClusterCmd; import org.apache.cloudstack.api.command.admin.cluster.DeleteClusterCmd; import org.apache.cloudstack.api.command.admin.host.*; +import org.apache.cloudstack.api.command.admin.storage.AddS3Cmd; +import org.apache.cloudstack.api.command.admin.storage.ListS3sCmd; import org.apache.cloudstack.api.command.admin.swift.AddSwiftCmd; import org.apache.cloudstack.api.command.admin.swift.ListSwiftsCmd; import org.apache.cloudstack.api.command.admin.host.PrepareForMaintenanceCmd; -import com.cloud.api.commands.AddS3Cmd; -import com.cloud.api.commands.ListS3sCmd; import com.cloud.exception.DiscoveryException; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceInUseException; diff --git a/api/src/org/apache/cloudstack/api/ResponseGenerator.java b/api/src/org/apache/cloudstack/api/ResponseGenerator.java index 559a7ad0ffb..e9f988ade60 100644 --- a/api/src/org/apache/cloudstack/api/ResponseGenerator.java +++ b/api/src/org/apache/cloudstack/api/ResponseGenerator.java @@ -92,7 +92,7 @@ import org.apache.cloudstack.api.response.VpcResponse; import org.apache.cloudstack.api.response.VpnUsersResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import com.cloud.api.response.S3Response; +import org.apache.cloudstack.api.response.S3Response; import com.cloud.async.AsyncJob; import com.cloud.capacity.Capacity; diff --git a/api/src/com/cloud/api/commands/AddS3Cmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/AddS3Cmd.java similarity index 98% rename from api/src/com/cloud/api/commands/AddS3Cmd.java rename to api/src/org/apache/cloudstack/api/command/admin/storage/AddS3Cmd.java index 2dfc8ff3044..13f066a6e57 100644 --- a/api/src/com/cloud/api/commands/AddS3Cmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storage/AddS3Cmd.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.cloud.api.commands; +package org.apache.cloudstack.api.command.admin.storage; import static org.apache.cloudstack.api.ApiConstants.S3_ACCESS_KEY; import static org.apache.cloudstack.api.ApiConstants.S3_CONNECTION_TIMEOUT; @@ -35,7 +35,7 @@ import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import com.cloud.api.response.S3Response; +import org.apache.cloudstack.api.response.S3Response; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.DiscoveryException; import com.cloud.exception.InsufficientCapacityException; diff --git a/api/src/com/cloud/api/commands/ListS3sCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/ListS3sCmd.java similarity index 95% rename from api/src/com/cloud/api/commands/ListS3sCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/storage/ListS3sCmd.java index 89da5151ab5..d0f6d722179 100644 --- a/api/src/com/cloud/api/commands/ListS3sCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storage/ListS3sCmd.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.cloud.api.commands; +package org.apache.cloudstack.api.command.admin.storage; import java.util.ArrayList; import java.util.List; @@ -25,7 +25,7 @@ import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ListResponse; -import com.cloud.api.response.S3Response; +import org.apache.cloudstack.api.response.S3Response; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.NetworkRuleConflictException; diff --git a/api/src/com/cloud/api/response/S3Response.java b/api/src/org/apache/cloudstack/api/response/S3Response.java similarity index 99% rename from api/src/com/cloud/api/response/S3Response.java rename to api/src/org/apache/cloudstack/api/response/S3Response.java index 0d2cf7e4ea7..5dd0ef0e041 100644 --- a/api/src/com/cloud/api/response/S3Response.java +++ b/api/src/org/apache/cloudstack/api/response/S3Response.java @@ -16,7 +16,7 @@ * 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.cloud.utils.IdentityProxy; diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index fdd594e72af..72cdb4b520d 100755 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -229,8 +229,8 @@ addSwift=org.apache.cloudstack.api.command.admin.swift.AddSwiftCmd;1 listSwifts=org.apache.cloudstack.api.command.admin.swift.ListSwiftsCmd;1 #### s3 commands -addS3=com.cloud.api.commands.AddS3Cmd;1 -listS3s=com.cloud.api.commands.ListS3sCmd;1 +addS3=org.apache.cloudstack.api.command.admin.storage.AddS3Cmd;1 +listS3s=org.apache.cloudstack.api.command.admin.storage.ListS3sCmd;1 #### host commands addHost=org.apache.cloudstack.api.command.admin.host.AddHostCmd;3 diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index 21b2c2e85e3..ebe7abba214 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -21,11 +21,9 @@ import static java.util.Collections.singletonList; import java.text.DecimalFormat; import java.util.ArrayList; -import java.util.Date; import java.util.EnumSet; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -33,8 +31,6 @@ import java.util.StringTokenizer; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.ResponseGenerator; -import org.apache.cloudstack.api.ResponseObject; -import org.apache.cloudstack.api.ServerApiException; import org.apache.log4j.Logger; import com.cloud.acl.ControlledEntity; @@ -134,14 +130,13 @@ import org.apache.cloudstack.api.response.VpcResponse; import org.apache.cloudstack.api.response.VpnUsersResponse; import org.apache.cloudstack.api.response.ZoneResponse; -import com.cloud.api.response.S3Response; +import org.apache.cloudstack.api.response.S3Response; import com.cloud.async.AsyncJob; import com.cloud.capacity.Capacity; import com.cloud.capacity.CapacityVO; import com.cloud.capacity.dao.CapacityDaoImpl.SummedCapacity; import com.cloud.configuration.Configuration; import com.cloud.configuration.Resource.ResourceOwnerType; -import com.cloud.configuration.Resource.ResourceType; import com.cloud.configuration.ResourceCount; import com.cloud.configuration.ResourceLimit; import com.cloud.dc.ClusterVO; @@ -156,7 +151,6 @@ import com.cloud.dc.VlanVO; import com.cloud.domain.Domain; import com.cloud.event.Event; import com.cloud.host.Host; -import com.cloud.host.HostStats; import com.cloud.host.HostVO; import com.cloud.hypervisor.HypervisorCapabilities; import com.cloud.network.IPAddressVO; @@ -174,23 +168,17 @@ import com.cloud.network.PhysicalNetworkTrafficType; import com.cloud.network.PhysicalNetworkVO; import com.cloud.network.RemoteAccessVpn; import com.cloud.network.Site2SiteCustomerGateway; -import com.cloud.network.Site2SiteCustomerGatewayVO; import com.cloud.network.Site2SiteVpnConnection; import com.cloud.network.Site2SiteVpnGateway; -import com.cloud.network.Site2SiteVpnGatewayVO; import com.cloud.network.VirtualRouterProvider; import com.cloud.network.VpnUser; import com.cloud.network.as.AutoScalePolicy; -import com.cloud.network.as.AutoScalePolicyVO; import com.cloud.network.as.AutoScaleVmGroup; -import com.cloud.network.as.AutoScaleVmGroupVO; import com.cloud.network.as.AutoScaleVmProfile; import com.cloud.network.as.AutoScaleVmProfileVO; import com.cloud.network.as.Condition; import com.cloud.network.as.ConditionVO; import com.cloud.network.as.Counter; -import com.cloud.network.as.CounterVO; -import com.cloud.network.dao.PhysicalNetworkTrafficTypeVO; import com.cloud.network.router.VirtualRouter; import com.cloud.network.rules.FirewallRule; import com.cloud.network.rules.FirewallRuleVO; @@ -203,11 +191,8 @@ import com.cloud.network.security.SecurityRule; import com.cloud.network.security.SecurityRule.SecurityRuleType; import com.cloud.network.vpc.PrivateGateway; import com.cloud.network.vpc.StaticRoute; -import com.cloud.network.vpc.StaticRouteVO; import com.cloud.network.vpc.Vpc; -import com.cloud.network.vpc.VpcGatewayVO; import com.cloud.network.vpc.VpcOffering; -import com.cloud.network.vpc.VpcVO; import com.cloud.offering.DiskOffering; import com.cloud.offering.NetworkOffering; import com.cloud.offering.ServiceOffering; @@ -218,12 +203,10 @@ import com.cloud.projects.ProjectInvitation; import com.cloud.server.Criteria; import com.cloud.server.ResourceTag; import com.cloud.server.ResourceTag.TaggedResourceType; -import com.cloud.storage.DiskOfferingVO; import com.cloud.storage.GuestOS; import com.cloud.storage.GuestOSCategoryVO; import com.cloud.storage.S3; import com.cloud.storage.Snapshot; -import com.cloud.storage.Storage; import com.cloud.storage.Storage.ImageFormat; import com.cloud.storage.Storage.StoragePoolType; import com.cloud.storage.Storage.TemplateType; @@ -242,13 +225,10 @@ import com.cloud.storage.VolumeVO; import com.cloud.storage.snapshot.SnapshotPolicy; import com.cloud.storage.snapshot.SnapshotSchedule; import com.cloud.template.VirtualMachineTemplate; -import com.cloud.test.PodZoneConfig; import com.cloud.user.Account; import com.cloud.user.User; import com.cloud.user.UserAccount; import com.cloud.user.UserContext; -import com.cloud.user.UserStatisticsVO; -import com.cloud.user.UserVO; import com.cloud.uservm.UserVm; import com.cloud.utils.Pair; import com.cloud.utils.StringUtils; @@ -256,9 +236,7 @@ import com.cloud.utils.net.NetUtils; import com.cloud.vm.ConsoleProxyVO; import com.cloud.vm.InstanceGroup; import com.cloud.vm.NicProfile; -import com.cloud.vm.VMInstanceVO; import com.cloud.vm.VirtualMachine; -import com.cloud.vm.VirtualMachine.State; import com.cloud.vm.VirtualMachine.Type; public class ApiResponseHelper implements ResponseGenerator { diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java index db01c3dd435..ffc09f0effe 100755 --- a/server/src/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/com/cloud/resource/ResourceManagerImpl.java @@ -31,12 +31,12 @@ import javax.ejb.Local; import javax.naming.ConfigurationException; import org.apache.cloudstack.api.command.admin.cluster.AddClusterCmd; +import org.apache.cloudstack.api.command.admin.storage.ListS3sCmd; import org.apache.cloudstack.api.command.admin.swift.AddSwiftCmd; import org.apache.cloudstack.api.command.admin.cluster.DeleteClusterCmd; import org.apache.cloudstack.api.command.admin.host.*; import org.apache.cloudstack.api.command.admin.swift.ListSwiftsCmd; -import com.cloud.api.commands.AddS3Cmd; -import com.cloud.api.commands.ListS3sCmd; +import org.apache.cloudstack.api.command.admin.storage.AddS3Cmd; import com.cloud.storage.S3; import com.cloud.storage.S3VO; import com.cloud.storage.s3.S3Manager; diff --git a/server/src/com/cloud/storage/s3/S3Manager.java b/server/src/com/cloud/storage/s3/S3Manager.java index 357f2aed463..0e47d7273d6 100644 --- a/server/src/com/cloud/storage/s3/S3Manager.java +++ b/server/src/com/cloud/storage/s3/S3Manager.java @@ -21,8 +21,8 @@ package com.cloud.storage.s3; import java.util.List; import com.cloud.agent.api.to.S3TO; -import com.cloud.api.commands.AddS3Cmd; -import com.cloud.api.commands.ListS3sCmd; +import org.apache.cloudstack.api.command.admin.storage.AddS3Cmd; +import org.apache.cloudstack.api.command.admin.storage.ListS3sCmd; import com.cloud.dc.DataCenterVO; import com.cloud.exception.DiscoveryException; import com.cloud.storage.S3; diff --git a/server/src/com/cloud/storage/s3/S3ManagerImpl.java b/server/src/com/cloud/storage/s3/S3ManagerImpl.java index 0da11ffa590..1db809b07b2 100644 --- a/server/src/com/cloud/storage/s3/S3ManagerImpl.java +++ b/server/src/com/cloud/storage/s3/S3ManagerImpl.java @@ -44,6 +44,7 @@ import java.util.concurrent.Callable; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.apache.cloudstack.api.command.admin.storage.AddS3Cmd; import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; @@ -52,8 +53,7 @@ import com.cloud.agent.api.DeleteTemplateFromS3Command; import com.cloud.agent.api.DownloadTemplateFromS3ToSecondaryStorageCommand; import com.cloud.agent.api.UploadTemplateToS3FromSecondaryStorageCommand; import com.cloud.agent.api.to.S3TO; -import com.cloud.api.commands.AddS3Cmd; -import com.cloud.api.commands.ListS3sCmd; +import org.apache.cloudstack.api.command.admin.storage.ListS3sCmd; import com.cloud.configuration.Config; import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.dc.DataCenterVO;