diff --git a/.gitignore b/.gitignore index 83311ed..8cdd65f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,14 @@ -.classpath -.project -.settings/ +# compile target/ test-output/ + +# eclipse +.settings/ +.classpath +.project + +# idea +.idea/ +*.iml +*.ipr +*.iws diff --git a/aliyun-ecs/pom.xml b/aliyun-ecs/pom.xml index f31625e..cd682d2 100644 --- a/aliyun-ecs/pom.xml +++ b/aliyun-ecs/pom.xml @@ -5,12 +5,11 @@ 4.0.0 - org.apache.jclouds.labs - jclouds-labs-aliyun - 2.0.0-SNAPSHOT + io.github.aliyun-beta + aliyun-jclouds + 1.9.2 - org.apache.jclouds.labs aliyun-ecs jclouds aliyun ecs jclouds components to access an implementation of ECS diff --git a/aliyun-ecs/src/main/java/org/apache/jclouds/ecs/ECSApi.java b/aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/ECSApi.java similarity index 92% rename from aliyun-ecs/src/main/java/org/apache/jclouds/ecs/ECSApi.java rename to aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/ECSApi.java index be354d8..3f68f1b 100644 --- a/aliyun-ecs/src/main/java/org/apache/jclouds/ecs/ECSApi.java +++ b/aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/ECSApi.java @@ -1,4 +1,4 @@ -package org.apache.jclouds.ecs; +package org.jclouds.aliyun.ecs; import java.io.Closeable; import java.util.Set; diff --git a/aliyun-ecs/src/main/java/org/apache/jclouds/ecs/ECSApiMetadata.java b/aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/ECSApiMetadata.java similarity index 89% rename from aliyun-ecs/src/main/java/org/apache/jclouds/ecs/ECSApiMetadata.java rename to aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/ECSApiMetadata.java index 2574262..3d2039f 100644 --- a/aliyun-ecs/src/main/java/org/apache/jclouds/ecs/ECSApiMetadata.java +++ b/aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/ECSApiMetadata.java @@ -1,9 +1,9 @@ -package org.apache.jclouds.ecs; +package org.jclouds.aliyun.ecs; import java.net.URI; -import org.apache.jclouds.ecs.compute.ECSComputeServiceContext; -import org.apache.jclouds.ecs.compute.config.ECSComputeServiceContextModule; +import org.jclouds.aliyun.ecs.compute.ECSComputeServiceContext; +import org.jclouds.aliyun.ecs.compute.config.ECSComputeServiceContextModule; import org.jclouds.apis.ApiMetadata; import org.jclouds.apis.internal.BaseApiMetadata; import org.jclouds.logging.log4j.config.Log4JLoggingModule; diff --git a/aliyun-ecs/src/main/java/org/apache/jclouds/ecs/ECSProviderMetadata.java b/aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/ECSProviderMetadata.java similarity index 97% rename from aliyun-ecs/src/main/java/org/apache/jclouds/ecs/ECSProviderMetadata.java rename to aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/ECSProviderMetadata.java index 8febe06..b0f3484 100644 --- a/aliyun-ecs/src/main/java/org/apache/jclouds/ecs/ECSProviderMetadata.java +++ b/aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/ECSProviderMetadata.java @@ -1,4 +1,4 @@ -package org.apache.jclouds.ecs; +package org.jclouds.aliyun.ecs; import java.util.Properties; diff --git a/aliyun-ecs/src/main/java/org/apache/jclouds/ecs/compute/ECSComputeService.java b/aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/compute/ECSComputeService.java similarity index 99% rename from aliyun-ecs/src/main/java/org/apache/jclouds/ecs/compute/ECSComputeService.java rename to aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/compute/ECSComputeService.java index c1912f0..f4afc82 100644 --- a/aliyun-ecs/src/main/java/org/apache/jclouds/ecs/compute/ECSComputeService.java +++ b/aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/compute/ECSComputeService.java @@ -1,4 +1,4 @@ -package org.apache.jclouds.ecs.compute; +package org.jclouds.aliyun.ecs.compute; import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_RUNNING; import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_SUSPENDED; diff --git a/aliyun-ecs/src/main/java/org/apache/jclouds/ecs/compute/ECSComputeServiceAdapter.java b/aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/compute/ECSComputeServiceAdapter.java similarity index 98% rename from aliyun-ecs/src/main/java/org/apache/jclouds/ecs/compute/ECSComputeServiceAdapter.java rename to aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/compute/ECSComputeServiceAdapter.java index a4d7028..1ec4ad9 100644 --- a/aliyun-ecs/src/main/java/org/apache/jclouds/ecs/compute/ECSComputeServiceAdapter.java +++ b/aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/compute/ECSComputeServiceAdapter.java @@ -1,4 +1,4 @@ -package org.apache.jclouds.ecs.compute; +package org.jclouds.aliyun.ecs.compute; import static com.google.common.collect.Iterables.transform; @@ -12,10 +12,10 @@ import javax.inject.Inject; import javax.inject.Named; -import org.apache.jclouds.ecs.ECSApi; -import org.apache.jclouds.ecs.compute.functions.ImageToImage; -import org.apache.jclouds.ecs.compute.functions.InstanceToNodeMetadata; -import org.apache.jclouds.ecs.compute.functions.RegionToLocation; +import org.jclouds.aliyun.ecs.ECSApi; +import org.jclouds.aliyun.ecs.compute.functions.ImageToImage; +import org.jclouds.aliyun.ecs.compute.functions.InstanceToNodeMetadata; +import org.jclouds.aliyun.ecs.compute.functions.RegionToLocation; import org.jclouds.compute.JCloudsNativeComputeServiceAdapter; import org.jclouds.compute.domain.Hardware; import org.jclouds.compute.domain.HardwareBuilder; diff --git a/aliyun-ecs/src/main/java/org/apache/jclouds/ecs/compute/ECSComputeServiceContext.java b/aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/compute/ECSComputeServiceContext.java similarity index 73% rename from aliyun-ecs/src/main/java/org/apache/jclouds/ecs/compute/ECSComputeServiceContext.java rename to aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/compute/ECSComputeServiceContext.java index b83f77c..074dfe9 100644 --- a/aliyun-ecs/src/main/java/org/apache/jclouds/ecs/compute/ECSComputeServiceContext.java +++ b/aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/compute/ECSComputeServiceContext.java @@ -1,6 +1,6 @@ -package org.apache.jclouds.ecs.compute; +package org.jclouds.aliyun.ecs.compute; -import org.apache.jclouds.ecs.compute.internal.ECSComputeServiceContextImpl; +import org.jclouds.aliyun.ecs.compute.internal.ECSComputeServiceContextImpl; import org.jclouds.compute.ComputeServiceContext; import com.google.inject.ImplementedBy; diff --git a/aliyun-ecs/src/main/java/org/apache/jclouds/ecs/compute/config/ECSComputeServiceContextModule.java b/aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/compute/config/ECSComputeServiceContextModule.java similarity index 89% rename from aliyun-ecs/src/main/java/org/apache/jclouds/ecs/compute/config/ECSComputeServiceContextModule.java rename to aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/compute/config/ECSComputeServiceContextModule.java index 9191e6d..25c521a 100644 --- a/aliyun-ecs/src/main/java/org/apache/jclouds/ecs/compute/config/ECSComputeServiceContextModule.java +++ b/aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/compute/config/ECSComputeServiceContextModule.java @@ -1,14 +1,14 @@ -package org.apache.jclouds.ecs.compute.config; +package org.jclouds.aliyun.ecs.compute.config; import java.util.Map; import javax.inject.Named; import javax.inject.Singleton; -import org.apache.jclouds.ecs.ECSApi; -import org.apache.jclouds.ecs.compute.ECSComputeService; -import org.apache.jclouds.ecs.compute.ECSComputeServiceAdapter; -import org.apache.jclouds.ecs.compute.internal.ECSApiImpl; +import org.jclouds.aliyun.ecs.ECSApi; +import org.jclouds.aliyun.ecs.compute.ECSComputeService; +import org.jclouds.aliyun.ecs.compute.ECSComputeServiceAdapter; +import org.jclouds.aliyun.ecs.compute.internal.ECSApiImpl; import org.jclouds.compute.ComputeService; import org.jclouds.compute.config.JCloudsNativeComputeServiceAdapterContextModule; import org.jclouds.compute.domain.Hardware; diff --git a/aliyun-ecs/src/main/java/org/apache/jclouds/ecs/compute/functions/ImageToImage.java b/aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/compute/functions/ImageToImage.java similarity index 92% rename from aliyun-ecs/src/main/java/org/apache/jclouds/ecs/compute/functions/ImageToImage.java rename to aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/compute/functions/ImageToImage.java index e650cb9..99b78bb 100644 --- a/aliyun-ecs/src/main/java/org/apache/jclouds/ecs/compute/functions/ImageToImage.java +++ b/aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/compute/functions/ImageToImage.java @@ -1,6 +1,6 @@ -package org.apache.jclouds.ecs.compute.functions; +package org.jclouds.aliyun.ecs.compute.functions; -import org.apache.jclouds.ecs.ECSApi; +import org.jclouds.aliyun.ecs.ECSApi; import org.jclouds.compute.domain.Image; import org.jclouds.compute.domain.ImageBuilder; import org.jclouds.compute.domain.OperatingSystem; diff --git a/aliyun-ecs/src/main/java/org/apache/jclouds/ecs/compute/functions/InstanceToNodeMetadata.java b/aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/compute/functions/InstanceToNodeMetadata.java similarity index 95% rename from aliyun-ecs/src/main/java/org/apache/jclouds/ecs/compute/functions/InstanceToNodeMetadata.java rename to aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/compute/functions/InstanceToNodeMetadata.java index 174ae2c..44e51ff 100644 --- a/aliyun-ecs/src/main/java/org/apache/jclouds/ecs/compute/functions/InstanceToNodeMetadata.java +++ b/aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/compute/functions/InstanceToNodeMetadata.java @@ -1,8 +1,8 @@ -package org.apache.jclouds.ecs.compute.functions; +package org.jclouds.aliyun.ecs.compute.functions; import java.util.Map; -import org.apache.jclouds.ecs.ECSApi; +import org.jclouds.aliyun.ecs.ECSApi; import org.jclouds.compute.domain.Hardware; import org.jclouds.compute.domain.HardwareBuilder; import org.jclouds.compute.domain.NodeMetadata; diff --git a/aliyun-ecs/src/main/java/org/apache/jclouds/ecs/compute/functions/RegionToLocation.java b/aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/compute/functions/RegionToLocation.java similarity index 90% rename from aliyun-ecs/src/main/java/org/apache/jclouds/ecs/compute/functions/RegionToLocation.java rename to aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/compute/functions/RegionToLocation.java index bf289da..597e96f 100644 --- a/aliyun-ecs/src/main/java/org/apache/jclouds/ecs/compute/functions/RegionToLocation.java +++ b/aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/compute/functions/RegionToLocation.java @@ -1,4 +1,4 @@ -package org.apache.jclouds.ecs.compute.functions; +package org.jclouds.aliyun.ecs.compute.functions; import org.jclouds.domain.Location; import org.jclouds.domain.LocationBuilder; diff --git a/aliyun-ecs/src/main/java/org/apache/jclouds/ecs/compute/internal/ECSApiImpl.java b/aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/compute/internal/ECSApiImpl.java similarity index 96% rename from aliyun-ecs/src/main/java/org/apache/jclouds/ecs/compute/internal/ECSApiImpl.java rename to aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/compute/internal/ECSApiImpl.java index 3fe3cf9..479eb1d 100644 --- a/aliyun-ecs/src/main/java/org/apache/jclouds/ecs/compute/internal/ECSApiImpl.java +++ b/aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/compute/internal/ECSApiImpl.java @@ -1,4 +1,4 @@ -package org.apache.jclouds.ecs.compute.internal; +package org.jclouds.aliyun.ecs.compute.internal; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @@ -10,7 +10,7 @@ import javax.inject.Inject; -import org.apache.jclouds.ecs.ECSApi; +import org.jclouds.aliyun.ecs.ECSApi; import org.jclouds.domain.Credentials; import org.jclouds.location.Provider; diff --git a/aliyun-ecs/src/main/java/org/apache/jclouds/ecs/compute/internal/ECSComputeServiceContextImpl.java b/aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/compute/internal/ECSComputeServiceContextImpl.java similarity index 83% rename from aliyun-ecs/src/main/java/org/apache/jclouds/ecs/compute/internal/ECSComputeServiceContextImpl.java rename to aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/compute/internal/ECSComputeServiceContextImpl.java index 71ef04d..e766efb 100644 --- a/aliyun-ecs/src/main/java/org/apache/jclouds/ecs/compute/internal/ECSComputeServiceContextImpl.java +++ b/aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/compute/internal/ECSComputeServiceContextImpl.java @@ -1,11 +1,11 @@ -package org.apache.jclouds.ecs.compute.internal; +package org.jclouds.aliyun.ecs.compute.internal; import javax.inject.Inject; import javax.inject.Singleton; -import org.apache.jclouds.ecs.compute.ECSComputeService; -import org.apache.jclouds.ecs.compute.ECSComputeServiceContext; import org.jclouds.Context; +import org.jclouds.aliyun.ecs.compute.ECSComputeService; +import org.jclouds.aliyun.ecs.compute.ECSComputeServiceContext; import org.jclouds.compute.ComputeService; import org.jclouds.compute.Utils; import org.jclouds.compute.internal.ComputeServiceContextImpl; diff --git a/aliyun-ecs/src/test/java/org/apache/jclouds/test/ECSTest.java b/aliyun-ecs/src/test/java/org/jclouds/aliyun/test/ECSTest.java similarity index 99% rename from aliyun-ecs/src/test/java/org/apache/jclouds/test/ECSTest.java rename to aliyun-ecs/src/test/java/org/jclouds/aliyun/test/ECSTest.java index 5f955dd..15aefae 100644 --- a/aliyun-ecs/src/test/java/org/apache/jclouds/test/ECSTest.java +++ b/aliyun-ecs/src/test/java/org/jclouds/aliyun/test/ECSTest.java @@ -1,4 +1,4 @@ -package org.apache.jclouds.test; +package org.jclouds.aliyun.test; import java.util.HashSet; import java.util.Set; diff --git a/aliyun-oss/pom.xml b/aliyun-oss/pom.xml index 204c14d..3c8a64a 100644 --- a/aliyun-oss/pom.xml +++ b/aliyun-oss/pom.xml @@ -5,12 +5,11 @@ 4.0.0 - org.apache.jclouds.labs - jclouds-labs-aliyun - 2.0.0-SNAPSHOT + io.github.aliyun-beta + aliyun-jclouds + 1.9.2 - org.apache.jclouds.labs aliyun-oss jclouds aliyun oss jclouds components to access an implementation of OSS diff --git a/aliyun-oss/src/main/java/org/apache/jclouds/oss/OSSApi.java b/aliyun-oss/src/main/java/org/jclouds/aliyun/oss/OSSApi.java similarity index 89% rename from aliyun-oss/src/main/java/org/apache/jclouds/oss/OSSApi.java rename to aliyun-oss/src/main/java/org/jclouds/aliyun/oss/OSSApi.java index 7c590b5..1f597c1 100644 --- a/aliyun-oss/src/main/java/org/apache/jclouds/oss/OSSApi.java +++ b/aliyun-oss/src/main/java/org/jclouds/aliyun/oss/OSSApi.java @@ -1,4 +1,4 @@ -package org.apache.jclouds.oss; +package org.jclouds.aliyun.oss; import java.io.Closeable; import java.util.Set; diff --git a/aliyun-oss/src/main/java/org/apache/jclouds/oss/OSSApiMetadata.java b/aliyun-oss/src/main/java/org/jclouds/aliyun/oss/OSSApiMetadata.java similarity index 91% rename from aliyun-oss/src/main/java/org/apache/jclouds/oss/OSSApiMetadata.java rename to aliyun-oss/src/main/java/org/jclouds/aliyun/oss/OSSApiMetadata.java index 13f9ce0..590ec07 100644 --- a/aliyun-oss/src/main/java/org/apache/jclouds/oss/OSSApiMetadata.java +++ b/aliyun-oss/src/main/java/org/jclouds/aliyun/oss/OSSApiMetadata.java @@ -1,10 +1,10 @@ -package org.apache.jclouds.oss; +package org.jclouds.aliyun.oss; import java.net.URI; import java.util.Properties; -import org.apache.jclouds.oss.blobstore.OSSBlobStoreContext; -import org.apache.jclouds.oss.blobstore.config.OSSBlobStoreContextModule; +import org.jclouds.aliyun.oss.blobstore.OSSBlobStoreContext; +import org.jclouds.aliyun.oss.blobstore.config.OSSBlobStoreContextModule; import org.jclouds.apis.ApiMetadata; import org.jclouds.apis.internal.BaseApiMetadata; import org.jclouds.logging.log4j.config.Log4JLoggingModule; diff --git a/aliyun-oss/src/main/java/org/apache/jclouds/oss/OSSProviderMetadata.java b/aliyun-oss/src/main/java/org/jclouds/aliyun/oss/OSSProviderMetadata.java similarity index 97% rename from aliyun-oss/src/main/java/org/apache/jclouds/oss/OSSProviderMetadata.java rename to aliyun-oss/src/main/java/org/jclouds/aliyun/oss/OSSProviderMetadata.java index a6ab571..acbe677 100644 --- a/aliyun-oss/src/main/java/org/apache/jclouds/oss/OSSProviderMetadata.java +++ b/aliyun-oss/src/main/java/org/jclouds/aliyun/oss/OSSProviderMetadata.java @@ -1,4 +1,4 @@ -package org.apache.jclouds.oss; +package org.jclouds.aliyun.oss; import java.util.Properties; diff --git a/aliyun-oss/src/main/java/org/apache/jclouds/oss/blobstore/OSSBlobRequestSigner.java b/aliyun-oss/src/main/java/org/jclouds/aliyun/oss/blobstore/OSSBlobRequestSigner.java similarity index 97% rename from aliyun-oss/src/main/java/org/apache/jclouds/oss/blobstore/OSSBlobRequestSigner.java rename to aliyun-oss/src/main/java/org/jclouds/aliyun/oss/blobstore/OSSBlobRequestSigner.java index 0571421..a4fe96f 100644 --- a/aliyun-oss/src/main/java/org/apache/jclouds/oss/blobstore/OSSBlobRequestSigner.java +++ b/aliyun-oss/src/main/java/org/jclouds/aliyun/oss/blobstore/OSSBlobRequestSigner.java @@ -1,4 +1,4 @@ -package org.apache.jclouds.oss.blobstore; +package org.jclouds.aliyun.oss.blobstore; import javax.inject.Singleton; diff --git a/aliyun-oss/src/main/java/org/apache/jclouds/oss/blobstore/OSSBlobStore.java b/aliyun-oss/src/main/java/org/jclouds/aliyun/oss/blobstore/OSSBlobStore.java similarity index 76% rename from aliyun-oss/src/main/java/org/apache/jclouds/oss/blobstore/OSSBlobStore.java rename to aliyun-oss/src/main/java/org/jclouds/aliyun/oss/blobstore/OSSBlobStore.java index c08f98a..b06a45d 100644 --- a/aliyun-oss/src/main/java/org/apache/jclouds/oss/blobstore/OSSBlobStore.java +++ b/aliyun-oss/src/main/java/org/jclouds/aliyun/oss/blobstore/OSSBlobStore.java @@ -1,13 +1,10 @@ -package org.apache.jclouds.oss.blobstore; +package org.jclouds.aliyun.oss.blobstore; import static com.google.common.collect.Iterables.transform; -import java.io.IOException; -import java.io.InputStream; import java.net.URI; import java.net.URISyntaxException; import java.net.URL; -import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import java.util.List; @@ -19,15 +16,13 @@ import javax.inject.Named; import javax.inject.Singleton; -import org.apache.jclouds.oss.OSSApi; -import org.apache.jclouds.oss.blobstore.functions.RegionToLocation; +import org.jclouds.aliyun.oss.OSSApi; +import org.jclouds.aliyun.oss.blobstore.functions.RegionToLocation; import org.jclouds.blobstore.BlobStoreContext; import org.jclouds.blobstore.domain.Blob; import org.jclouds.blobstore.domain.BlobAccess; import org.jclouds.blobstore.domain.BlobMetadata; import org.jclouds.blobstore.domain.ContainerAccess; -import org.jclouds.blobstore.domain.MultipartPart; -import org.jclouds.blobstore.domain.MultipartUpload; import org.jclouds.blobstore.domain.PageSet; import org.jclouds.blobstore.domain.StorageMetadata; import org.jclouds.blobstore.domain.StorageType; @@ -46,37 +41,25 @@ import org.jclouds.domain.LocationScope; import org.jclouds.io.ContentMetadata; import org.jclouds.io.ContentMetadataBuilder; -import org.jclouds.io.Payload; -import org.jclouds.io.PayloadSlicer; import org.jclouds.location.suppliers.LocationsSupplier; import org.jclouds.logging.Logger; import com.aliyun.oss.OSS; -import com.aliyun.oss.model.AbortMultipartUploadRequest; import com.aliyun.oss.model.AccessControlList; import com.aliyun.oss.model.Bucket; import com.aliyun.oss.model.CannedAccessControlList; -import com.aliyun.oss.model.CompleteMultipartUploadRequest; import com.aliyun.oss.model.CreateBucketRequest; import com.aliyun.oss.model.DeleteObjectsRequest; import com.aliyun.oss.model.GetObjectRequest; import com.aliyun.oss.model.Grant; import com.aliyun.oss.model.GroupGrantee; -import com.aliyun.oss.model.InitiateMultipartUploadRequest; -import com.aliyun.oss.model.InitiateMultipartUploadResult; import com.aliyun.oss.model.ListObjectsRequest; -import com.aliyun.oss.model.ListPartsRequest; import com.aliyun.oss.model.OSSObject; import com.aliyun.oss.model.OSSObjectSummary; import com.aliyun.oss.model.ObjectAcl; import com.aliyun.oss.model.ObjectListing; import com.aliyun.oss.model.ObjectPermission; -import com.aliyun.oss.model.PartETag; -import com.aliyun.oss.model.PartListing; -import com.aliyun.oss.model.PartSummary; import com.aliyun.oss.model.PutObjectResult; -import com.aliyun.oss.model.UploadPartRequest; -import com.aliyun.oss.model.UploadPartResult; import com.google.common.base.Function; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableList; @@ -102,9 +85,8 @@ protected OSSBlobStore( Supplier defaultLocation, LocationsSupplier locations, Supplier> bucketAccesses, - Supplier> blobAccesses, - PayloadSlicer slicer) { - super(context, blobUtils, defaultLocation, locations, slicer); + Supplier> blobAccesses) { + super(context, blobUtils, defaultLocation, locations); this.api = api; this.bucketAccesses = bucketAccesses.get(); this.blobAccesses = blobAccesses.get(); @@ -227,15 +209,9 @@ public PageSet list(String container, ListContainerOp .description(region) .build(); ListObjectsRequest req = new ListObjectsRequest(container); - if (options.getPrefix() != null) { - req.setPrefix(options.getPrefix()); - } if (options.getDir() != null) { req.setPrefix(options.getDir()); } - if (options.getDelimiter() != null) { - req.setDelimiter(options.getDelimiter()); - } if (options.getMaxResults() != null) { req.setMaxKeys(options.getMaxResults()); } @@ -346,15 +322,9 @@ public String apply(OSSObjectSummary input) { } }; ListObjectsRequest lreq = new ListObjectsRequest(container); - if (options.getPrefix() != null) { - lreq.setPrefix(options.getPrefix()); - } if (options.getDir() != null) { lreq.setPrefix(options.getDir()); } - if (options.getDelimiter() != null) { - lreq.setDelimiter(options.getDelimiter()); - } if (options.getMaxResults() != null) { lreq.setMaxKeys(options.getMaxResults()); } @@ -502,131 +472,6 @@ public void setBlobAccess(String container, String name, BlobAccess access) { oss.setObjectAcl(container, name, blobAccesses.get(access)); } - @Override - public MultipartUpload initiateMultipartUpload(String container, BlobMetadata blob, PutOptions options) { - OSS oss = api.getOSSClient(OSSApi.DEFAULT_REGION); - String region = oss.getBucketLocation(container); - oss = api.getOSSClient(region); - InitiateMultipartUploadRequest req = new InitiateMultipartUploadRequest(container, blob.getProviderId()); - InitiateMultipartUploadResult result = oss.initiateMultipartUpload(req); - return MultipartUpload.create( - container, - blob.getProviderId(), - result.getUploadId(), - blob, - options); - } - - @Override - public void abortMultipartUpload(MultipartUpload mpu) { - OSS oss = api.getOSSClient(OSSApi.DEFAULT_REGION); - String region = oss.getBucketLocation(mpu.containerName()); - oss = api.getOSSClient(region); - AbortMultipartUploadRequest req = new AbortMultipartUploadRequest( - mpu.containerName(), - mpu.blobMetadata().getProviderId(), - mpu.id()); - oss.abortMultipartUpload(req); - } - - @Override - public String completeMultipartUpload(MultipartUpload mpu, List parts) { - OSS oss = api.getOSSClient(OSSApi.DEFAULT_REGION); - String region = oss.getBucketLocation(mpu.containerName()); - oss = api.getOSSClient(region); - List etags = new ArrayList(); - for (MultipartPart mp : parts) { - PartETag etag = new PartETag(mp.partNumber(), mp.partETag()); - etags.add(etag); - } - CompleteMultipartUploadRequest req = new CompleteMultipartUploadRequest( - mpu.containerName(), - mpu.blobMetadata().getProviderId(), - mpu.id(), - etags); - return oss.completeMultipartUpload(req).getETag(); - } - - @Override - public MultipartPart uploadMultipartPart(MultipartUpload mpu, int partNumber, Payload payload) { - OSS oss = api.getOSSClient(OSSApi.DEFAULT_REGION); - String region = oss.getBucketLocation(mpu.containerName()); - oss = api.getOSSClient(region); - InputStream is = null; - try { - is = payload.openStream(); - } catch (IOException e) { - logger.warn(e, e.getMessage()); - } - UploadPartRequest req = new UploadPartRequest(); - req.setBucketName(mpu.containerName()); - req.setKey(mpu.blobMetadata().getProviderId()); - req.setUploadId(mpu.id()); - req.setInputStream(is); - req.setPartNumber(partNumber); - UploadPartResult result = oss.uploadPart(req); - return MultipartPart.create(result.getPartNumber(), req.getPartSize(), result.getETag()); - } - - @Override - public List listMultipartUpload(MultipartUpload mpu) { - OSS oss = api.getOSSClient(OSSApi.DEFAULT_REGION); - String region = oss.getBucketLocation(mpu.containerName()); - oss = api.getOSSClient(region); - ListPartsRequest req = new ListPartsRequest( - mpu.containerName(), - mpu.blobMetadata().getProviderId(), - mpu.id()); - List parts = new ArrayList(); - PartListing listing = new PartListing(); - listing.setTruncated(true); - while (listing.isTruncated()) { - listing = oss.listParts(req); - parts.addAll(listing.getParts()); - req.setPartNumberMarker(listing.getNextPartNumberMarker()); - } - return ImmutableList.builder() - .addAll(transform(parts, new Function() { - @Override - public MultipartPart apply(PartSummary input) { - return MultipartPart.create( - input.getPartNumber(), - input.getSize(), - input.getETag()); - } - })).build(); - } - - /** - * 100KB - * - * @return - */ - @Override - public long getMinimumMultipartPartSize() { - return 100 * 1024; - } - - /** - * 5MB - * - * @return - */ - @Override - public long getMaximumMultipartPartSize() { - return 5 * 1024 * 1024; - } - - /** - * 10000 parts - * - * @return - */ - @Override - public int getMaximumNumberOfParts() { - return 10000; - } - @Override protected boolean deleteAndVerifyContainerGone(String container) { OSS oss = api.getOSSClient(OSSApi.DEFAULT_REGION); @@ -644,10 +489,4 @@ protected boolean deleteAndVerifyContainerGone(String container) { } return result; } - - @Override - public List listMultipartUploads(String arg0) { - // TODO Auto-generated method stub - return null; - } } diff --git a/aliyun-oss/src/main/java/org/apache/jclouds/oss/blobstore/OSSBlobStoreContext.java b/aliyun-oss/src/main/java/org/jclouds/aliyun/oss/blobstore/OSSBlobStoreContext.java similarity index 70% rename from aliyun-oss/src/main/java/org/apache/jclouds/oss/blobstore/OSSBlobStoreContext.java rename to aliyun-oss/src/main/java/org/jclouds/aliyun/oss/blobstore/OSSBlobStoreContext.java index 7f24610..67922ab 100644 --- a/aliyun-oss/src/main/java/org/apache/jclouds/oss/blobstore/OSSBlobStoreContext.java +++ b/aliyun-oss/src/main/java/org/jclouds/aliyun/oss/blobstore/OSSBlobStoreContext.java @@ -1,6 +1,6 @@ -package org.apache.jclouds.oss.blobstore; +package org.jclouds.aliyun.oss.blobstore; -import org.apache.jclouds.oss.blobstore.internal.OSSBlobStoreContextImpl; +import org.jclouds.aliyun.oss.blobstore.internal.OSSBlobStoreContextImpl; import org.jclouds.blobstore.BlobStoreContext; import com.google.inject.ImplementedBy; diff --git a/aliyun-oss/src/main/java/org/apache/jclouds/oss/blobstore/config/OSSBlobStoreContextModule.java b/aliyun-oss/src/main/java/org/jclouds/aliyun/oss/blobstore/config/OSSBlobStoreContextModule.java similarity index 81% rename from aliyun-oss/src/main/java/org/apache/jclouds/oss/blobstore/config/OSSBlobStoreContextModule.java rename to aliyun-oss/src/main/java/org/jclouds/aliyun/oss/blobstore/config/OSSBlobStoreContextModule.java index 03f019e..2db34ae 100644 --- a/aliyun-oss/src/main/java/org/apache/jclouds/oss/blobstore/config/OSSBlobStoreContextModule.java +++ b/aliyun-oss/src/main/java/org/jclouds/aliyun/oss/blobstore/config/OSSBlobStoreContextModule.java @@ -1,17 +1,17 @@ -package org.apache.jclouds.oss.blobstore.config; +package org.jclouds.aliyun.oss.blobstore.config; import java.util.Map; import javax.inject.Singleton; -import org.apache.jclouds.oss.OSSApi; -import org.apache.jclouds.oss.blobstore.OSSBlobRequestSigner; -import org.apache.jclouds.oss.blobstore.OSSBlobStore; -import org.apache.jclouds.oss.blobstore.internal.OSSApiImpl; -import org.apache.jclouds.oss.blobstore.internal.OSSBlobBuilder; -import org.apache.jclouds.oss.blobstore.internal.OSSBlobUtils; -import org.apache.jclouds.oss.blobstore.internal.OSSLocationsSupplier; -import org.apache.jclouds.oss.blobstore.internal.OSSRegionIdsSupplier; +import org.jclouds.aliyun.oss.OSSApi; +import org.jclouds.aliyun.oss.blobstore.OSSBlobRequestSigner; +import org.jclouds.aliyun.oss.blobstore.OSSBlobStore; +import org.jclouds.aliyun.oss.blobstore.internal.OSSApiImpl; +import org.jclouds.aliyun.oss.blobstore.internal.OSSBlobBuilder; +import org.jclouds.aliyun.oss.blobstore.internal.OSSBlobUtils; +import org.jclouds.aliyun.oss.blobstore.internal.OSSLocationsSupplier; +import org.jclouds.aliyun.oss.blobstore.internal.OSSRegionIdsSupplier; import org.jclouds.blobstore.BlobRequestSigner; import org.jclouds.blobstore.BlobStore; import org.jclouds.blobstore.attr.ConsistencyModel; diff --git a/aliyun-oss/src/main/java/org/apache/jclouds/oss/blobstore/functions/RegionToLocation.java b/aliyun-oss/src/main/java/org/jclouds/aliyun/oss/blobstore/functions/RegionToLocation.java similarity index 90% rename from aliyun-oss/src/main/java/org/apache/jclouds/oss/blobstore/functions/RegionToLocation.java rename to aliyun-oss/src/main/java/org/jclouds/aliyun/oss/blobstore/functions/RegionToLocation.java index 76007ca..933be8d 100644 --- a/aliyun-oss/src/main/java/org/apache/jclouds/oss/blobstore/functions/RegionToLocation.java +++ b/aliyun-oss/src/main/java/org/jclouds/aliyun/oss/blobstore/functions/RegionToLocation.java @@ -1,4 +1,4 @@ -package org.apache.jclouds.oss.blobstore.functions; +package org.jclouds.aliyun.oss.blobstore.functions; import org.jclouds.domain.Location; import org.jclouds.domain.LocationBuilder; diff --git a/aliyun-oss/src/main/java/org/apache/jclouds/oss/blobstore/internal/OSSApiImpl.java b/aliyun-oss/src/main/java/org/jclouds/aliyun/oss/blobstore/internal/OSSApiImpl.java similarity index 93% rename from aliyun-oss/src/main/java/org/apache/jclouds/oss/blobstore/internal/OSSApiImpl.java rename to aliyun-oss/src/main/java/org/jclouds/aliyun/oss/blobstore/internal/OSSApiImpl.java index fa2e6ed..45e4594 100644 --- a/aliyun-oss/src/main/java/org/apache/jclouds/oss/blobstore/internal/OSSApiImpl.java +++ b/aliyun-oss/src/main/java/org/jclouds/aliyun/oss/blobstore/internal/OSSApiImpl.java @@ -1,11 +1,11 @@ -package org.apache.jclouds.oss.blobstore.internal; +package org.jclouds.aliyun.oss.blobstore.internal; import java.io.IOException; import java.util.Set; import javax.inject.Inject; -import org.apache.jclouds.oss.OSSApi; +import org.jclouds.aliyun.oss.OSSApi; import org.jclouds.domain.Credentials; import org.jclouds.location.Provider; import org.jclouds.location.suppliers.RegionIdsSupplier; diff --git a/aliyun-oss/src/main/java/org/apache/jclouds/oss/blobstore/internal/OSSBlobBuilder.java b/aliyun-oss/src/main/java/org/jclouds/aliyun/oss/blobstore/internal/OSSBlobBuilder.java similarity index 88% rename from aliyun-oss/src/main/java/org/apache/jclouds/oss/blobstore/internal/OSSBlobBuilder.java rename to aliyun-oss/src/main/java/org/jclouds/aliyun/oss/blobstore/internal/OSSBlobBuilder.java index 9a763d2..4784150 100644 --- a/aliyun-oss/src/main/java/org/apache/jclouds/oss/blobstore/internal/OSSBlobBuilder.java +++ b/aliyun-oss/src/main/java/org/jclouds/aliyun/oss/blobstore/internal/OSSBlobBuilder.java @@ -1,4 +1,4 @@ -package org.apache.jclouds.oss.blobstore.internal; +package org.jclouds.aliyun.oss.blobstore.internal; import org.jclouds.blobstore.domain.Blob; import org.jclouds.blobstore.domain.internal.BlobBuilderImpl; diff --git a/aliyun-oss/src/main/java/org/apache/jclouds/oss/blobstore/internal/OSSBlobStoreContextImpl.java b/aliyun-oss/src/main/java/org/jclouds/aliyun/oss/blobstore/internal/OSSBlobStoreContextImpl.java similarity index 85% rename from aliyun-oss/src/main/java/org/apache/jclouds/oss/blobstore/internal/OSSBlobStoreContextImpl.java rename to aliyun-oss/src/main/java/org/jclouds/aliyun/oss/blobstore/internal/OSSBlobStoreContextImpl.java index 44c6dc2..5d698f2 100644 --- a/aliyun-oss/src/main/java/org/apache/jclouds/oss/blobstore/internal/OSSBlobStoreContextImpl.java +++ b/aliyun-oss/src/main/java/org/jclouds/aliyun/oss/blobstore/internal/OSSBlobStoreContextImpl.java @@ -1,11 +1,11 @@ -package org.apache.jclouds.oss.blobstore.internal; +package org.jclouds.aliyun.oss.blobstore.internal; import javax.inject.Inject; import javax.inject.Singleton; -import org.apache.jclouds.oss.blobstore.OSSBlobStore; -import org.apache.jclouds.oss.blobstore.OSSBlobStoreContext; import org.jclouds.Context; +import org.jclouds.aliyun.oss.blobstore.OSSBlobStore; +import org.jclouds.aliyun.oss.blobstore.OSSBlobStoreContext; import org.jclouds.blobstore.BlobRequestSigner; import org.jclouds.blobstore.BlobStore; import org.jclouds.blobstore.attr.ConsistencyModel; diff --git a/aliyun-oss/src/main/java/org/apache/jclouds/oss/blobstore/internal/OSSBlobUtils.java b/aliyun-oss/src/main/java/org/jclouds/aliyun/oss/blobstore/internal/OSSBlobUtils.java similarity index 95% rename from aliyun-oss/src/main/java/org/apache/jclouds/oss/blobstore/internal/OSSBlobUtils.java rename to aliyun-oss/src/main/java/org/jclouds/aliyun/oss/blobstore/internal/OSSBlobUtils.java index b55ec42..5b6153f 100644 --- a/aliyun-oss/src/main/java/org/apache/jclouds/oss/blobstore/internal/OSSBlobUtils.java +++ b/aliyun-oss/src/main/java/org/jclouds/aliyun/oss/blobstore/internal/OSSBlobUtils.java @@ -1,4 +1,4 @@ -package org.apache.jclouds.oss.blobstore.internal; +package org.jclouds.aliyun.oss.blobstore.internal; import javax.inject.Inject; import javax.inject.Provider; diff --git a/aliyun-oss/src/main/java/org/apache/jclouds/oss/blobstore/internal/OSSLocationsSupplier.java b/aliyun-oss/src/main/java/org/jclouds/aliyun/oss/blobstore/internal/OSSLocationsSupplier.java similarity index 95% rename from aliyun-oss/src/main/java/org/apache/jclouds/oss/blobstore/internal/OSSLocationsSupplier.java rename to aliyun-oss/src/main/java/org/jclouds/aliyun/oss/blobstore/internal/OSSLocationsSupplier.java index fe0a805..debd94a 100644 --- a/aliyun-oss/src/main/java/org/apache/jclouds/oss/blobstore/internal/OSSLocationsSupplier.java +++ b/aliyun-oss/src/main/java/org/jclouds/aliyun/oss/blobstore/internal/OSSLocationsSupplier.java @@ -1,4 +1,4 @@ -package org.apache.jclouds.oss.blobstore.internal; +package org.jclouds.aliyun.oss.blobstore.internal; import java.util.Set; diff --git a/aliyun-oss/src/main/java/org/apache/jclouds/oss/blobstore/internal/OSSRegionIdsSupplier.java b/aliyun-oss/src/main/java/org/jclouds/aliyun/oss/blobstore/internal/OSSRegionIdsSupplier.java similarity index 94% rename from aliyun-oss/src/main/java/org/apache/jclouds/oss/blobstore/internal/OSSRegionIdsSupplier.java rename to aliyun-oss/src/main/java/org/jclouds/aliyun/oss/blobstore/internal/OSSRegionIdsSupplier.java index 6b1b03a..fd3c5db 100644 --- a/aliyun-oss/src/main/java/org/apache/jclouds/oss/blobstore/internal/OSSRegionIdsSupplier.java +++ b/aliyun-oss/src/main/java/org/jclouds/aliyun/oss/blobstore/internal/OSSRegionIdsSupplier.java @@ -1,4 +1,4 @@ -package org.apache.jclouds.oss.blobstore.internal; +package org.jclouds.aliyun.oss.blobstore.internal; import java.util.Set; diff --git a/aliyun-oss/src/test/java/org/apache/jclouds/test/OSSTest.java b/aliyun-oss/src/test/java/org/jclouds/aliyun/test/OSSTest.java similarity index 54% rename from aliyun-oss/src/test/java/org/apache/jclouds/test/OSSTest.java rename to aliyun-oss/src/test/java/org/jclouds/aliyun/test/OSSTest.java index a8903d4..b81022d 100644 --- a/aliyun-oss/src/test/java/org/apache/jclouds/test/OSSTest.java +++ b/aliyun-oss/src/test/java/org/jclouds/aliyun/test/OSSTest.java @@ -1,8 +1,6 @@ -package org.apache.jclouds.test; +package org.jclouds.aliyun.test; -import java.util.ArrayList; import java.util.Iterator; -import java.util.List; import java.util.UUID; import org.apache.log4j.BasicConfigurator; @@ -10,20 +8,13 @@ import org.jclouds.blobstore.BlobStore; import org.jclouds.blobstore.BlobStoreContext; import org.jclouds.blobstore.domain.Blob; -import org.jclouds.blobstore.domain.BlobAccess; -import org.jclouds.blobstore.domain.BlobMetadata; import org.jclouds.blobstore.domain.ContainerAccess; -import org.jclouds.blobstore.domain.MultipartPart; -import org.jclouds.blobstore.domain.MultipartUpload; import org.jclouds.blobstore.domain.StorageMetadata; -import org.jclouds.blobstore.domain.internal.BlobMetadataImpl; import org.jclouds.blobstore.options.CreateContainerOptions; -import org.jclouds.blobstore.options.GetOptions; import org.jclouds.blobstore.options.ListContainerOptions; import org.jclouds.blobstore.options.PutOptions; import org.jclouds.domain.LocationBuilder; import org.jclouds.domain.LocationScope; -import org.jclouds.io.ContentMetadataBuilder; import org.testng.annotations.AfterClass; import org.testng.annotations.AfterSuite; import org.testng.annotations.AfterTest; @@ -32,8 +23,6 @@ import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; -import com.google.common.collect.ImmutableMap; - public class OSSTest { private static BlobStore blobStore; @@ -130,63 +119,4 @@ public void list() { blobStore.list(testBucket); blobStore.list(testBucket, ListContainerOptions.NONE); } - - @Test - public void listConfig() { - blobStore.listAssignableLocations(); - blobStore.getMaximumMultipartPartSize(); - blobStore.getMaximumNumberOfParts(); - blobStore.getMinimumMultipartPartSize(); - } - - @Test - public void multipartUpload() { - BlobMetadata blobMetadata = new BlobMetadataImpl( - "mp-blob", "mp-blob", - null, null, null, null, null, - ImmutableMap.builder().build(), null, null, - ContentMetadataBuilder.create().build()); - MultipartUpload mpu = blobStore.initiateMultipartUpload(testBucket, blobMetadata, PutOptions.NONE); - byte[] bs = new byte[100 * 1024]; - for (int i = 0; i < 100 * 1024; i++) { - bs[i] = 0; - } - Blob blob1 = blobStore.blobBuilder(UUID.randomUUID().toString()).payload(bs).build(); - Blob blob2 = blobStore.blobBuilder(UUID.randomUUID().toString()).payload(bs).build(); - MultipartPart mp1 = blobStore.uploadMultipartPart(mpu, 1, blob1.getPayload()); - MultipartPart mp2 = blobStore.uploadMultipartPart(mpu, 2, blob2.getPayload()); - List parts = new ArrayList(); - parts.add(mp1); - parts.add(mp2); - blobStore.listMultipartUpload(mpu); - blobStore.completeMultipartUpload(mpu, parts); - blobStore.setBlobAccess(testBucket, "mp-blob", BlobAccess.PRIVATE); - blobStore.getBlobAccess(testBucket, "mp-blob"); - blobStore.getBlob(testBucket, "mp-blob"); - blobStore.getBlob(testBucket, "mp-blob", GetOptions.NONE); - blobStore.blobExists(testBucket, "mp-blob"); - blobStore.removeBlob(testBucket, "mp-blob"); - } - - @Test - public void abortMultipartUpload() { - BlobMetadata blobMetadata = new BlobMetadataImpl( - "abortblob", "abortblob", - null, null, null, null, null, - ImmutableMap.builder().build(), null, null, - ContentMetadataBuilder.create().build()); - MultipartUpload mpu = blobStore.initiateMultipartUpload(testBucket, blobMetadata, PutOptions.NONE); - byte[] bs = new byte[100 * 1024]; - for (int i = 0; i < 100 * 1024; i++) { - bs[i] = 0; - } - Blob blob1 = blobStore.blobBuilder(UUID.randomUUID().toString()).payload(bs).build(); - Blob blob2 = blobStore.blobBuilder(UUID.randomUUID().toString()).payload(bs).build(); - MultipartPart mp1 = blobStore.uploadMultipartPart(mpu, 1, blob1.getPayload()); - MultipartPart mp2 = blobStore.uploadMultipartPart(mpu, 2, blob2.getPayload()); - List parts = new ArrayList(); - parts.add(mp1); - parts.add(mp2); - blobStore.abortMultipartUpload(mpu); - } } diff --git a/aliyun-slb/pom.xml b/aliyun-slb/pom.xml index cc192e2..a311efe 100644 --- a/aliyun-slb/pom.xml +++ b/aliyun-slb/pom.xml @@ -5,12 +5,11 @@ 4.0.0 - org.apache.jclouds.labs - jclouds-labs-aliyun - 2.0.0-SNAPSHOT + io.github.aliyun-beta + aliyun-jclouds + 1.9.2 - org.apache.jclouds.labs aliyun-slb jclouds aliyun slb jclouds components to access an implementation of SLB diff --git a/aliyun-slb/src/main/java/org/apache/jclouds/slb/SLBApi.java b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/SLBApi.java similarity index 92% rename from aliyun-slb/src/main/java/org/apache/jclouds/slb/SLBApi.java rename to aliyun-slb/src/main/java/org/jclouds/aliyun/slb/SLBApi.java index 1560502..4336a5c 100644 --- a/aliyun-slb/src/main/java/org/apache/jclouds/slb/SLBApi.java +++ b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/SLBApi.java @@ -1,4 +1,4 @@ -package org.apache.jclouds.slb; +package org.jclouds.aliyun.slb; import java.io.Closeable; import java.util.Set; diff --git a/aliyun-slb/src/main/java/org/apache/jclouds/slb/SLBApiMetadata.java b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/SLBApiMetadata.java similarity index 91% rename from aliyun-slb/src/main/java/org/apache/jclouds/slb/SLBApiMetadata.java rename to aliyun-slb/src/main/java/org/jclouds/aliyun/slb/SLBApiMetadata.java index 93d34a5..a65d73b 100644 --- a/aliyun-slb/src/main/java/org/apache/jclouds/slb/SLBApiMetadata.java +++ b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/SLBApiMetadata.java @@ -1,10 +1,10 @@ -package org.apache.jclouds.slb; +package org.jclouds.aliyun.slb; import java.net.URI; import java.util.Properties; -import org.apache.jclouds.slb.loadbalancer.SLBLoadBalancerServiceContext; -import org.apache.jclouds.slb.loadbalancer.config.SLBLoadBalancerServiceContextModule; +import org.jclouds.aliyun.slb.loadbalancer.SLBLoadBalancerServiceContext; +import org.jclouds.aliyun.slb.loadbalancer.config.SLBLoadBalancerServiceContextModule; import org.jclouds.apis.ApiMetadata; import org.jclouds.apis.internal.BaseApiMetadata; import org.jclouds.logging.log4j.config.Log4JLoggingModule; diff --git a/aliyun-slb/src/main/java/org/apache/jclouds/slb/SLBProviderMetadata.java b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/SLBProviderMetadata.java similarity index 97% rename from aliyun-slb/src/main/java/org/apache/jclouds/slb/SLBProviderMetadata.java rename to aliyun-slb/src/main/java/org/jclouds/aliyun/slb/SLBProviderMetadata.java index f4a35de..34a47a3 100644 --- a/aliyun-slb/src/main/java/org/apache/jclouds/slb/SLBProviderMetadata.java +++ b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/SLBProviderMetadata.java @@ -1,4 +1,4 @@ -package org.apache.jclouds.slb; +package org.jclouds.aliyun.slb; import java.util.Properties; diff --git a/aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/SLBLoadBalancerService.java b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/SLBLoadBalancerService.java similarity index 97% rename from aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/SLBLoadBalancerService.java rename to aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/SLBLoadBalancerService.java index da182a5..5e969f3 100644 --- a/aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/SLBLoadBalancerService.java +++ b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/SLBLoadBalancerService.java @@ -1,4 +1,4 @@ -package org.apache.jclouds.slb.loadbalancer; +package org.jclouds.aliyun.slb.loadbalancer; import java.util.Set; diff --git a/aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/SLBLoadBalancerServiceAdapter.java b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/SLBLoadBalancerServiceAdapter.java similarity index 96% rename from aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/SLBLoadBalancerServiceAdapter.java rename to aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/SLBLoadBalancerServiceAdapter.java index 7e3a140..23b1378 100644 --- a/aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/SLBLoadBalancerServiceAdapter.java +++ b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/SLBLoadBalancerServiceAdapter.java @@ -1,4 +1,4 @@ -package org.apache.jclouds.slb.loadbalancer; +package org.jclouds.aliyun.slb.loadbalancer; import static com.google.common.collect.Iterables.transform; @@ -9,9 +9,9 @@ import javax.inject.Inject; import javax.inject.Named; -import org.apache.jclouds.slb.SLBApi; -import org.apache.jclouds.slb.loadbalancer.functions.LoadBalancerToLoadBalancerMetadata; -import org.apache.jclouds.slb.loadbalancer.functions.RegionToLocation; +import org.jclouds.aliyun.slb.SLBApi; +import org.jclouds.aliyun.slb.loadbalancer.functions.LoadBalancerToLoadBalancerMetadata; +import org.jclouds.aliyun.slb.loadbalancer.functions.RegionToLocation; import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.domain.Location; import org.jclouds.domain.LocationBuilder; diff --git a/aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/SLBLoadBalancerServiceContext.java b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/SLBLoadBalancerServiceContext.java similarity index 75% rename from aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/SLBLoadBalancerServiceContext.java rename to aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/SLBLoadBalancerServiceContext.java index 69d1d32..05576e1 100644 --- a/aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/SLBLoadBalancerServiceContext.java +++ b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/SLBLoadBalancerServiceContext.java @@ -1,6 +1,6 @@ -package org.apache.jclouds.slb.loadbalancer; +package org.jclouds.aliyun.slb.loadbalancer; -import org.apache.jclouds.slb.loadbalancer.internal.SLBLoadBalancerServiceContextImpl; +import org.jclouds.aliyun.slb.loadbalancer.internal.SLBLoadBalancerServiceContextImpl; import org.jclouds.loadbalancer.LoadBalancerServiceContext; import com.google.inject.ImplementedBy; diff --git a/aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/config/SLBBindLoadBalancerStrategiesByClass.java b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/config/SLBBindLoadBalancerStrategiesByClass.java similarity index 79% rename from aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/config/SLBBindLoadBalancerStrategiesByClass.java rename to aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/config/SLBBindLoadBalancerStrategiesByClass.java index 7f9a57b..bb94614 100644 --- a/aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/config/SLBBindLoadBalancerStrategiesByClass.java +++ b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/config/SLBBindLoadBalancerStrategiesByClass.java @@ -1,9 +1,9 @@ -package org.apache.jclouds.slb.loadbalancer.config; +package org.jclouds.aliyun.slb.loadbalancer.config; -import org.apache.jclouds.slb.loadbalancer.strategy.SLBDestroyLoadBalancerStrategy; -import org.apache.jclouds.slb.loadbalancer.strategy.SLBGetLoadBalancerMetadataStrategy; -import org.apache.jclouds.slb.loadbalancer.strategy.SLBListLoadBalancersStrategy; -import org.apache.jclouds.slb.loadbalancer.strategy.SLBLoadBalanceNodesStrategy; +import org.jclouds.aliyun.slb.loadbalancer.strategy.SLBDestroyLoadBalancerStrategy; +import org.jclouds.aliyun.slb.loadbalancer.strategy.SLBGetLoadBalancerMetadataStrategy; +import org.jclouds.aliyun.slb.loadbalancer.strategy.SLBListLoadBalancersStrategy; +import org.jclouds.aliyun.slb.loadbalancer.strategy.SLBLoadBalanceNodesStrategy; import org.jclouds.loadbalancer.config.BindLoadBalancerStrategiesByClass; import org.jclouds.loadbalancer.strategy.DestroyLoadBalancerStrategy; import org.jclouds.loadbalancer.strategy.GetLoadBalancerMetadataStrategy; diff --git a/aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/config/SLBLoadBalancerServiceContextModule.java b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/config/SLBLoadBalancerServiceContextModule.java similarity index 82% rename from aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/config/SLBLoadBalancerServiceContextModule.java rename to aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/config/SLBLoadBalancerServiceContextModule.java index 352be68..8b8e670 100644 --- a/aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/config/SLBLoadBalancerServiceContextModule.java +++ b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/config/SLBLoadBalancerServiceContextModule.java @@ -1,13 +1,13 @@ -package org.apache.jclouds.slb.loadbalancer.config; +package org.jclouds.aliyun.slb.loadbalancer.config; import java.util.Map; import javax.inject.Singleton; -import org.apache.jclouds.slb.SLBApi; -import org.apache.jclouds.slb.loadbalancer.SLBLoadBalancerService; -import org.apache.jclouds.slb.loadbalancer.SLBLoadBalancerServiceAdapter; -import org.apache.jclouds.slb.loadbalancer.internal.SLBApiImpl; +import org.jclouds.aliyun.slb.SLBApi; +import org.jclouds.aliyun.slb.loadbalancer.SLBLoadBalancerService; +import org.jclouds.aliyun.slb.loadbalancer.SLBLoadBalancerServiceAdapter; +import org.jclouds.aliyun.slb.loadbalancer.internal.SLBApiImpl; import org.jclouds.domain.Location; import org.jclouds.loadbalancer.LoadBalancerService; import org.jclouds.loadbalancer.LoadBalancerServiceAdapter; diff --git a/aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/domain/SLBLoadBalancerProtocol.java b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/domain/SLBLoadBalancerProtocol.java similarity index 55% rename from aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/domain/SLBLoadBalancerProtocol.java rename to aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/domain/SLBLoadBalancerProtocol.java index 3434c24..8b4beeb 100644 --- a/aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/domain/SLBLoadBalancerProtocol.java +++ b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/domain/SLBLoadBalancerProtocol.java @@ -1,4 +1,4 @@ -package org.apache.jclouds.slb.loadbalancer.domain; +package org.jclouds.aliyun.slb.loadbalancer.domain; public enum SLBLoadBalancerProtocol { HTTP, HTTPS, TCP, UDP diff --git a/aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/functions/LoadBalancerToLoadBalancerMetadata.java b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/functions/LoadBalancerToLoadBalancerMetadata.java similarity index 97% rename from aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/functions/LoadBalancerToLoadBalancerMetadata.java rename to aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/functions/LoadBalancerToLoadBalancerMetadata.java index 98b6476..aa5596e 100644 --- a/aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/functions/LoadBalancerToLoadBalancerMetadata.java +++ b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/functions/LoadBalancerToLoadBalancerMetadata.java @@ -1,4 +1,4 @@ -package org.apache.jclouds.slb.loadbalancer.functions; +package org.jclouds.aliyun.slb.loadbalancer.functions; import java.util.Map; diff --git a/aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/functions/RegionToLocation.java b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/functions/RegionToLocation.java similarity index 89% rename from aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/functions/RegionToLocation.java rename to aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/functions/RegionToLocation.java index e2f07ad..f88475a 100644 --- a/aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/functions/RegionToLocation.java +++ b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/functions/RegionToLocation.java @@ -1,4 +1,4 @@ -package org.apache.jclouds.slb.loadbalancer.functions; +package org.jclouds.aliyun.slb.loadbalancer.functions; import org.jclouds.domain.Location; import org.jclouds.domain.LocationBuilder; diff --git a/aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/internal/SLBApiImpl.java b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/internal/SLBApiImpl.java similarity index 96% rename from aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/internal/SLBApiImpl.java rename to aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/internal/SLBApiImpl.java index 671294f..3324b17 100644 --- a/aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/internal/SLBApiImpl.java +++ b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/internal/SLBApiImpl.java @@ -1,4 +1,4 @@ -package org.apache.jclouds.slb.loadbalancer.internal; +package org.jclouds.aliyun.slb.loadbalancer.internal; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @@ -10,7 +10,7 @@ import javax.inject.Inject; -import org.apache.jclouds.slb.SLBApi; +import org.jclouds.aliyun.slb.SLBApi; import org.jclouds.domain.Credentials; import org.jclouds.location.Provider; diff --git a/aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/internal/SLBLoadBalancerServiceContextImpl.java b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/internal/SLBLoadBalancerServiceContextImpl.java similarity index 83% rename from aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/internal/SLBLoadBalancerServiceContextImpl.java rename to aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/internal/SLBLoadBalancerServiceContextImpl.java index a87d46e..00e6d4f 100644 --- a/aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/internal/SLBLoadBalancerServiceContextImpl.java +++ b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/internal/SLBLoadBalancerServiceContextImpl.java @@ -1,11 +1,11 @@ -package org.apache.jclouds.slb.loadbalancer.internal; +package org.jclouds.aliyun.slb.loadbalancer.internal; import javax.inject.Inject; import javax.inject.Singleton; -import org.apache.jclouds.slb.loadbalancer.SLBLoadBalancerService; -import org.apache.jclouds.slb.loadbalancer.SLBLoadBalancerServiceContext; import org.jclouds.Context; +import org.jclouds.aliyun.slb.loadbalancer.SLBLoadBalancerService; +import org.jclouds.aliyun.slb.loadbalancer.SLBLoadBalancerServiceContext; import org.jclouds.loadbalancer.LoadBalancerService; import org.jclouds.loadbalancer.internal.LoadBalancerServiceContextImpl; import org.jclouds.location.Provider; diff --git a/aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/strategy/SLBDestroyLoadBalancerStrategy.java b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/strategy/SLBDestroyLoadBalancerStrategy.java similarity index 93% rename from aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/strategy/SLBDestroyLoadBalancerStrategy.java rename to aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/strategy/SLBDestroyLoadBalancerStrategy.java index c632f6e..a0ef786 100644 --- a/aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/strategy/SLBDestroyLoadBalancerStrategy.java +++ b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/strategy/SLBDestroyLoadBalancerStrategy.java @@ -1,4 +1,4 @@ -package org.apache.jclouds.slb.loadbalancer.strategy; +package org.jclouds.aliyun.slb.loadbalancer.strategy; import javax.inject.Inject; diff --git a/aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/strategy/SLBGetLoadBalancerMetadataStrategy.java b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/strategy/SLBGetLoadBalancerMetadataStrategy.java similarity index 93% rename from aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/strategy/SLBGetLoadBalancerMetadataStrategy.java rename to aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/strategy/SLBGetLoadBalancerMetadataStrategy.java index 1683ce1..c6114f3 100644 --- a/aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/strategy/SLBGetLoadBalancerMetadataStrategy.java +++ b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/strategy/SLBGetLoadBalancerMetadataStrategy.java @@ -1,4 +1,4 @@ -package org.apache.jclouds.slb.loadbalancer.strategy; +package org.jclouds.aliyun.slb.loadbalancer.strategy; import javax.inject.Inject; diff --git a/aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/strategy/SLBListLoadBalancersStrategy.java b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/strategy/SLBListLoadBalancersStrategy.java similarity index 93% rename from aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/strategy/SLBListLoadBalancersStrategy.java rename to aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/strategy/SLBListLoadBalancersStrategy.java index 409e7ca..8961c98 100644 --- a/aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/strategy/SLBListLoadBalancersStrategy.java +++ b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/strategy/SLBListLoadBalancersStrategy.java @@ -1,4 +1,4 @@ -package org.apache.jclouds.slb.loadbalancer.strategy; +package org.jclouds.aliyun.slb.loadbalancer.strategy; import javax.inject.Inject; diff --git a/aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/strategy/SLBLoadBalanceNodesStrategy.java b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/strategy/SLBLoadBalanceNodesStrategy.java similarity index 97% rename from aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/strategy/SLBLoadBalanceNodesStrategy.java rename to aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/strategy/SLBLoadBalanceNodesStrategy.java index e8a8e1f..ff7620e 100644 --- a/aliyun-slb/src/main/java/org/apache/jclouds/slb/loadbalancer/strategy/SLBLoadBalanceNodesStrategy.java +++ b/aliyun-slb/src/main/java/org/jclouds/aliyun/slb/loadbalancer/strategy/SLBLoadBalanceNodesStrategy.java @@ -1,4 +1,4 @@ -package org.apache.jclouds.slb.loadbalancer.strategy; +package org.jclouds.aliyun.slb.loadbalancer.strategy; import java.util.ArrayList; import java.util.HashMap; @@ -11,8 +11,8 @@ import javax.inject.Inject; import javax.inject.Named; -import org.apache.jclouds.slb.SLBApi; -import org.apache.jclouds.slb.loadbalancer.domain.SLBLoadBalancerProtocol; +import org.jclouds.aliyun.slb.SLBApi; +import org.jclouds.aliyun.slb.loadbalancer.domain.SLBLoadBalancerProtocol; import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.domain.Location; import org.jclouds.loadbalancer.LoadBalancerServiceAdapter; diff --git a/aliyun-slb/src/test/java/org/apache/jclouds/test/SLBTest.java b/aliyun-slb/src/test/java/org/jclouds/aliyun/test/SLBTest.java similarity index 98% rename from aliyun-slb/src/test/java/org/apache/jclouds/test/SLBTest.java rename to aliyun-slb/src/test/java/org/jclouds/aliyun/test/SLBTest.java index 0d7e2c0..278e801 100644 --- a/aliyun-slb/src/test/java/org/apache/jclouds/test/SLBTest.java +++ b/aliyun-slb/src/test/java/org/jclouds/aliyun/test/SLBTest.java @@ -1,4 +1,4 @@ -package org.apache.jclouds.test; +package org.jclouds.aliyun.test; import java.util.Set; diff --git a/pom.xml b/pom.xml index f505cdc..76b62c2 100644 --- a/pom.xml +++ b/pom.xml @@ -7,26 +7,35 @@ org.apache.jclouds jclouds-project - 2.0.0-SNAPSHOT + 1.9.2 - org.apache.jclouds.labs - jclouds-labs-aliyun - Apache jclouds labs aliyun + io.github.aliyun-beta + aliyun-jclouds + 1.9.2 pom + Jclouds for aliyun + Parent for modules of aliyun-jclouds + https://github.com/aliyun-beta/aliyun-jclouds - - - apache-snapshots - https://repository.apache.org/content/repositories/snapshots - - false - - - true - - - + + The Aliyun Company + https://www.aliyun.com + + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + + suizhen + suizhen@ucress.com + + aliyun-ecs @@ -34,6 +43,33 @@ aliyun-slb + + scm:git:https://github.com/aliyun-beta/aliyun-jclouds.git + scm:git:https://github.com/anyways/aliyun-jclouds.git + HEAD + https://github.com/aliyun-beta/aliyun-jclouds + + + + Github Issues + https://github.com/aliyun-beta/aliyun-jclouds/issues + + + + + ossrh-releases + https://oss.sonatype.org/content/repositories/releases + + + ossrh-snapshots + https://oss.sonatype.org/content/repositories/snapshots + + + + + 1.9.2 + + org.apache.jclouds @@ -67,27 +103,34 @@ org.apache.jclouds jclouds-core - ${project.version} + ${jclouds.version} org.apache.jclouds.driver jclouds-log4j - ${project.version} + ${jclouds.version} org.apache.jclouds jclouds-compute - ${project.version} + ${jclouds.version} org.apache.jclouds jclouds-blobstore - ${project.version} + ${jclouds.version} org.apache.jclouds jclouds-loadbalancer - ${project.version} + ${jclouds.version} + + + org.apache.jclouds + jclouds-core + ${jclouds.version} + test-jar + test com.aliyun @@ -109,18 +152,15 @@ aliyun-java-sdk-slb 2.0.0-rc1 - - org.apache.jclouds - jclouds-core - ${project.version} - test-jar - test - - src/test/java + + + src/main/resources + + org.apache.maven.plugins @@ -134,6 +174,18 @@ org.apache.maven.plugins maven-resources-plugin + + org.apache.maven.plugins + maven-source-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + + + org.apache.maven.plugins + maven-gpg-plugin + org.apache.rat apache-rat-plugin @@ -174,12 +226,12 @@ true - org/apache/jclouds/ecs/ECSApi.class - org/apache/jclouds/ecs/compute/ECSComputeServiceContext.class - org/apache/jclouds/oss/OSSApi.class - org/apache/jclouds/oss/blobstore/OSSBlobStoreContext.class - org/apache/jclouds/slb/SLBApi.class - org/apache/jclouds/slb/loadbalancer/SLBLoadBalancerServiceContext.class + org/jclouds/aliyun/ecs/ECSApi.class + org/jclouds/aliyun/ecs/compute/ECSComputeServiceContext.class + org/jclouds/aliyun/oss/OSSApi.class + org/jclouds/aliyun/oss/blobstore/OSSBlobStoreContext.class + org/jclouds/aliyun/slb/SLBApi.class + org/jclouds/aliyun/slb/loadbalancer/SLBLoadBalancerServiceContext.class @@ -193,8 +245,8 @@ 2.10 true - false - false + true + true @@ -213,6 +265,53 @@ utf-8 + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + + attach-sources + package + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + + + attach-javadocs + package + + jar + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + + sign-artifacts + + sign + + + + +