From 91858002006da38265b579cd2a7ff21460145f42 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Wed, 5 Jan 2011 18:23:46 +0100 Subject: [PATCH] Issue 440: move sqs code into its own api module --- all/pom.xml | 5 + .../java/org/jclouds}/sqs/SQSAsyncClient.java | 20 +- .../main/java/org/jclouds}/sqs/SQSClient.java | 8 +- .../org/jclouds}/sqs/SQSContextBuilder.java | 4 +- .../jclouds}/sqs/SQSPropertiesBuilder.java | 2 +- .../sqs/config/SQSRestClientModule.java | 8 +- .../java/org/jclouds}/sqs/domain/Queue.java | 4 +- .../jclouds}/sqs/functions/QueueLocation.java | 6 +- .../sqs/options/CreateQueueOptions.java | 4 +- .../sqs/options/ListQueuesOptions.java | 4 +- .../java/org/jclouds}/sqs/package-info.java | 2 +- .../jclouds}/sqs/reference/SQSParameters.java | 2 +- .../jclouds}/sqs/reference/package-info.java | 2 +- .../sqs/xml/ListQueuesResponseHandler.java | 4 +- .../java/org/jclouds}/sqs/xml/MD5Handler.java | 2 +- .../org/jclouds}/sqs/xml/QueueHandler.java | 4 +- .../xml/RegexListQueuesResponseHandler.java | 8 +- .../org/jclouds}/sqs/xml/RegexMD5Handler.java | 2 +- .../jclouds}/sqs/xml/RegexQueueHandler.java | 8 +- .../xml/internal/BaseRegexQueueHandler.java | 6 +- .../org/jclouds}/sqs/SQSAsyncClientTest.java | 28 +-- .../org/jclouds}/sqs/SQSClientLiveTest.java | 6 +- .../sqs/config/SQSRestClientModuleTest.java | 6 +- .../sqs/options/CreateQueueOptionsTest.java | 4 +- .../sqs/options/ListQueuesOptionsTest.java | 4 +- .../xml/ListQueuesResponseHandlerTest.java | 6 +- .../sqs/src/test/resources}/list_queues.xml | 0 apis/sqs/src/test/resources/log4j.xml | 185 ++++++++++++++++++ .../aws/ProvidersInPropertiesTest.java | 2 - aws/demos/pom.xml | 1 - aws/pom.xml | 20 -- core/src/main/resources/rest.properties | 4 +- {aws/demos => demos}/speedtest-sqs/README.txt | 0 {aws/demos => demos}/speedtest-sqs/pom.xml | 0 .../java/org/jclouds/aws/sqs/SpeedTest.java | 0 35 files changed, 270 insertions(+), 101 deletions(-) rename {aws/core/src/main/java/org/jclouds/aws => apis/sqs/src/main/java/org/jclouds}/sqs/SQSAsyncClient.java (85%) rename {aws/core/src/main/java/org/jclouds/aws => apis/sqs/src/main/java/org/jclouds}/sqs/SQSClient.java (96%) rename {aws/core/src/main/java/org/jclouds/aws => apis/sqs/src/main/java/org/jclouds}/sqs/SQSContextBuilder.java (95%) mode change 100755 => 100644 rename {aws/core/src/main/java/org/jclouds/aws => apis/sqs/src/main/java/org/jclouds}/sqs/SQSPropertiesBuilder.java (98%) rename {aws/core/src/main/java/org/jclouds/aws => apis/sqs/src/main/java/org/jclouds}/sqs/config/SQSRestClientModule.java (91%) mode change 100755 => 100644 rename {aws/core/src/main/java/org/jclouds/aws => apis/sqs/src/main/java/org/jclouds}/sqs/domain/Queue.java (98%) rename {aws/core/src/main/java/org/jclouds/aws => apis/sqs/src/main/java/org/jclouds}/sqs/functions/QueueLocation.java (92%) rename {aws/core/src/main/java/org/jclouds/aws => apis/sqs/src/main/java/org/jclouds}/sqs/options/CreateQueueOptions.java (95%) rename {aws/core/src/main/java/org/jclouds/aws => apis/sqs/src/main/java/org/jclouds}/sqs/options/ListQueuesOptions.java (95%) rename {aws/core/src/main/java/org/jclouds/aws => apis/sqs/src/main/java/org/jclouds}/sqs/package-info.java (97%) mode change 100755 => 100644 rename {aws/core/src/main/java/org/jclouds/aws => apis/sqs/src/main/java/org/jclouds}/sqs/reference/SQSParameters.java (98%) rename {aws/core/src/main/java/org/jclouds/aws => apis/sqs/src/main/java/org/jclouds}/sqs/reference/package-info.java (95%) mode change 100755 => 100644 rename {aws/core/src/main/java/org/jclouds/aws => apis/sqs/src/main/java/org/jclouds}/sqs/xml/ListQueuesResponseHandler.java (95%) mode change 100755 => 100644 rename {aws/core/src/main/java/org/jclouds/aws => apis/sqs/src/main/java/org/jclouds}/sqs/xml/MD5Handler.java (98%) rename {aws/core/src/main/java/org/jclouds/aws => apis/sqs/src/main/java/org/jclouds}/sqs/xml/QueueHandler.java (97%) rename {aws/core/src/main/java/org/jclouds/aws => apis/sqs/src/main/java/org/jclouds}/sqs/xml/RegexListQueuesResponseHandler.java (92%) rename {aws/core/src/main/java/org/jclouds/aws => apis/sqs/src/main/java/org/jclouds}/sqs/xml/RegexMD5Handler.java (98%) rename {aws/core/src/main/java/org/jclouds/aws => apis/sqs/src/main/java/org/jclouds}/sqs/xml/RegexQueueHandler.java (92%) rename {aws/core/src/main/java/org/jclouds/aws => apis/sqs/src/main/java/org/jclouds}/sqs/xml/internal/BaseRegexQueueHandler.java (96%) rename {aws/core/src/test/java/org/jclouds/aws => apis/sqs/src/test/java/org/jclouds}/sqs/SQSAsyncClientTest.java (90%) rename {aws/core/src/test/java/org/jclouds/aws => apis/sqs/src/test/java/org/jclouds}/sqs/SQSClientLiveTest.java (97%) rename {aws/core/src/test/java/org/jclouds/aws => apis/sqs/src/test/java/org/jclouds}/sqs/config/SQSRestClientModuleTest.java (98%) rename {aws/core/src/test/java/org/jclouds/aws => apis/sqs/src/test/java/org/jclouds}/sqs/options/CreateQueueOptionsTest.java (94%) rename {aws/core/src/test/java/org/jclouds/aws => apis/sqs/src/test/java/org/jclouds}/sqs/options/ListQueuesOptionsTest.java (94%) rename {aws/core/src/test/java/org/jclouds/aws => apis/sqs/src/test/java/org/jclouds}/sqs/xml/ListQueuesResponseHandlerTest.java (98%) rename {aws/core/src/test/resources/sqs => apis/sqs/src/test/resources}/list_queues.xml (100%) create mode 100644 apis/sqs/src/test/resources/log4j.xml rename {aws/demos => demos}/speedtest-sqs/README.txt (100%) rename {aws/demos => demos}/speedtest-sqs/pom.xml (100%) rename {aws/demos => demos}/speedtest-sqs/src/main/java/org/jclouds/aws/sqs/SpeedTest.java (100%) diff --git a/all/pom.xml b/all/pom.xml index 3722ad0936..3cbd12c020 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -49,5 +49,10 @@ aws-elb ${project.version} + + org.jclouds.api + sqs + ${project.version} + diff --git a/aws/core/src/main/java/org/jclouds/aws/sqs/SQSAsyncClient.java b/apis/sqs/src/main/java/org/jclouds/sqs/SQSAsyncClient.java similarity index 85% rename from aws/core/src/main/java/org/jclouds/aws/sqs/SQSAsyncClient.java rename to apis/sqs/src/main/java/org/jclouds/sqs/SQSAsyncClient.java index f80b338f90..9595946fca 100644 --- a/aws/core/src/main/java/org/jclouds/aws/sqs/SQSAsyncClient.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/SQSAsyncClient.java @@ -17,10 +17,10 @@ * ==================================================================== */ -package org.jclouds.aws.sqs; +package org.jclouds.sqs; -import static org.jclouds.aws.sqs.reference.SQSParameters.ACTION; -import static org.jclouds.aws.sqs.reference.SQSParameters.VERSION; +import static org.jclouds.sqs.reference.SQSParameters.ACTION; +import static org.jclouds.sqs.reference.SQSParameters.VERSION; import java.util.Set; @@ -30,19 +30,19 @@ import javax.ws.rs.POST; import javax.ws.rs.Path; import org.jclouds.aws.filters.FormSigner; -import org.jclouds.aws.sqs.domain.Queue; -import org.jclouds.aws.sqs.functions.QueueLocation; -import org.jclouds.aws.sqs.options.CreateQueueOptions; -import org.jclouds.aws.sqs.options.ListQueuesOptions; -import org.jclouds.aws.sqs.xml.RegexListQueuesResponseHandler; -import org.jclouds.aws.sqs.xml.RegexMD5Handler; -import org.jclouds.aws.sqs.xml.RegexQueueHandler; import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull; import org.jclouds.rest.annotations.EndpointParam; import org.jclouds.rest.annotations.FormParams; import org.jclouds.rest.annotations.RequestFilters; import org.jclouds.rest.annotations.ResponseParser; import org.jclouds.rest.annotations.VirtualHost; +import org.jclouds.sqs.domain.Queue; +import org.jclouds.sqs.functions.QueueLocation; +import org.jclouds.sqs.options.CreateQueueOptions; +import org.jclouds.sqs.options.ListQueuesOptions; +import org.jclouds.sqs.xml.RegexListQueuesResponseHandler; +import org.jclouds.sqs.xml.RegexMD5Handler; +import org.jclouds.sqs.xml.RegexQueueHandler; import com.google.common.util.concurrent.ListenableFuture; diff --git a/aws/core/src/main/java/org/jclouds/aws/sqs/SQSClient.java b/apis/sqs/src/main/java/org/jclouds/sqs/SQSClient.java similarity index 96% rename from aws/core/src/main/java/org/jclouds/aws/sqs/SQSClient.java rename to apis/sqs/src/main/java/org/jclouds/sqs/SQSClient.java index cd382408fa..70f7f5b8f9 100644 --- a/aws/core/src/main/java/org/jclouds/aws/sqs/SQSClient.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/SQSClient.java @@ -17,16 +17,16 @@ * ==================================================================== */ -package org.jclouds.aws.sqs; +package org.jclouds.sqs; import java.util.Set; import java.util.concurrent.TimeUnit; import javax.annotation.Nullable; -import org.jclouds.aws.sqs.domain.Queue; -import org.jclouds.aws.sqs.options.CreateQueueOptions; -import org.jclouds.aws.sqs.options.ListQueuesOptions; +import org.jclouds.sqs.domain.Queue; +import org.jclouds.sqs.options.CreateQueueOptions; +import org.jclouds.sqs.options.ListQueuesOptions; import org.jclouds.concurrent.Timeout; /** diff --git a/aws/core/src/main/java/org/jclouds/aws/sqs/SQSContextBuilder.java b/apis/sqs/src/main/java/org/jclouds/sqs/SQSContextBuilder.java old mode 100755 new mode 100644 similarity index 95% rename from aws/core/src/main/java/org/jclouds/aws/sqs/SQSContextBuilder.java rename to apis/sqs/src/main/java/org/jclouds/sqs/SQSContextBuilder.java index 376aed7f35..a6895c9748 --- a/aws/core/src/main/java/org/jclouds/aws/sqs/SQSContextBuilder.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/SQSContextBuilder.java @@ -17,12 +17,12 @@ * ==================================================================== */ -package org.jclouds.aws.sqs; +package org.jclouds.sqs; import java.util.List; import java.util.Properties; -import org.jclouds.aws.sqs.config.SQSRestClientModule; +import org.jclouds.sqs.config.SQSRestClientModule; import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule; import org.jclouds.logging.jdk.config.JDKLoggingModule; import org.jclouds.rest.RestContextBuilder; diff --git a/aws/core/src/main/java/org/jclouds/aws/sqs/SQSPropertiesBuilder.java b/apis/sqs/src/main/java/org/jclouds/sqs/SQSPropertiesBuilder.java similarity index 98% rename from aws/core/src/main/java/org/jclouds/aws/sqs/SQSPropertiesBuilder.java rename to apis/sqs/src/main/java/org/jclouds/sqs/SQSPropertiesBuilder.java index 65a0d93a84..dba702da45 100644 --- a/aws/core/src/main/java/org/jclouds/aws/sqs/SQSPropertiesBuilder.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/SQSPropertiesBuilder.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.aws.sqs; +package org.jclouds.sqs; import static org.jclouds.Constants.PROPERTY_API_VERSION; import static org.jclouds.Constants.PROPERTY_ENDPOINT; diff --git a/aws/core/src/main/java/org/jclouds/aws/sqs/config/SQSRestClientModule.java b/apis/sqs/src/main/java/org/jclouds/sqs/config/SQSRestClientModule.java old mode 100755 new mode 100644 similarity index 91% rename from aws/core/src/main/java/org/jclouds/aws/sqs/config/SQSRestClientModule.java rename to apis/sqs/src/main/java/org/jclouds/sqs/config/SQSRestClientModule.java index 4ba6d7caa0..592b8dee5c --- a/aws/core/src/main/java/org/jclouds/aws/sqs/config/SQSRestClientModule.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/config/SQSRestClientModule.java @@ -17,13 +17,13 @@ * ==================================================================== */ -package org.jclouds.aws.sqs.config; +package org.jclouds.sqs.config; import org.jclouds.aws.config.FormSigningRestClientModule; -import org.jclouds.aws.sqs.SQSAsyncClient; -import org.jclouds.aws.sqs.SQSClient; import org.jclouds.http.RequiresHttp; import org.jclouds.rest.ConfiguresRestClient; +import org.jclouds.sqs.SQSAsyncClient; +import org.jclouds.sqs.SQSClient; /** * Configures the SQS connection. @@ -38,4 +38,4 @@ public class SQSRestClientModule extends FormSigningRestClientModule { } -} \ No newline at end of file +} diff --git a/aws/core/src/main/java/org/jclouds/aws/sqs/functions/QueueLocation.java b/apis/sqs/src/main/java/org/jclouds/sqs/functions/QueueLocation.java similarity index 92% rename from aws/core/src/main/java/org/jclouds/aws/sqs/functions/QueueLocation.java rename to apis/sqs/src/main/java/org/jclouds/sqs/functions/QueueLocation.java index 460d301127..82c70bdf5e 100644 --- a/aws/core/src/main/java/org/jclouds/aws/sqs/functions/QueueLocation.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/functions/QueueLocation.java @@ -17,13 +17,13 @@ * ==================================================================== */ -package org.jclouds.aws.sqs.functions; +package org.jclouds.sqs.functions; import java.net.URI; import javax.inject.Singleton; -import org.jclouds.aws.sqs.domain.Queue; +import org.jclouds.sqs.domain.Queue; import com.google.common.base.Function; @@ -38,4 +38,4 @@ public class QueueLocation implements Function { return ((Queue) from).getLocation(); } -} \ No newline at end of file +} diff --git a/aws/core/src/main/java/org/jclouds/aws/sqs/options/CreateQueueOptions.java b/apis/sqs/src/main/java/org/jclouds/sqs/options/CreateQueueOptions.java similarity index 95% rename from aws/core/src/main/java/org/jclouds/aws/sqs/options/CreateQueueOptions.java rename to apis/sqs/src/main/java/org/jclouds/sqs/options/CreateQueueOptions.java index fd76657231..eb46af90ba 100644 --- a/aws/core/src/main/java/org/jclouds/aws/sqs/options/CreateQueueOptions.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/options/CreateQueueOptions.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.aws.sqs.options; +package org.jclouds.sqs.options; import org.jclouds.http.options.BaseHttpRequestOptions; @@ -28,7 +28,7 @@ import org.jclouds.http.options.BaseHttpRequestOptions; * (if needed): *

* - * import static org.jclouds.aws.sqs.options.CreateQueueOptions.Builder.* + * import static org.jclouds.sqs.options.CreateQueueOptions.Builder.* *

* SQSClient connection = // get connection * Queue queue = connection.createQueueInRegion(defaultVisibilityTimeout("foo")); diff --git a/aws/core/src/main/java/org/jclouds/aws/sqs/options/ListQueuesOptions.java b/apis/sqs/src/main/java/org/jclouds/sqs/options/ListQueuesOptions.java similarity index 95% rename from aws/core/src/main/java/org/jclouds/aws/sqs/options/ListQueuesOptions.java rename to apis/sqs/src/main/java/org/jclouds/sqs/options/ListQueuesOptions.java index b16d9af5f1..8e530ecc72 100644 --- a/aws/core/src/main/java/org/jclouds/aws/sqs/options/ListQueuesOptions.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/options/ListQueuesOptions.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.aws.sqs.options; +package org.jclouds.sqs.options; import org.jclouds.http.options.BaseHttpRequestOptions; @@ -28,7 +28,7 @@ import org.jclouds.http.options.BaseHttpRequestOptions; * (if needed): *

* - * import static org.jclouds.aws.sqs.options.ListQueuesOptions.Builder.* + * import static org.jclouds.sqs.options.ListQueuesOptions.Builder.* *

* SQSClient connection = // get connection * Set queues = connection.listQueuesInRegion(queuePrefix("foo")); diff --git a/aws/core/src/main/java/org/jclouds/aws/sqs/package-info.java b/apis/sqs/src/main/java/org/jclouds/sqs/package-info.java old mode 100755 new mode 100644 similarity index 97% rename from aws/core/src/main/java/org/jclouds/aws/sqs/package-info.java rename to apis/sqs/src/main/java/org/jclouds/sqs/package-info.java index aab9cb8fde..dadf9e027e --- a/aws/core/src/main/java/org/jclouds/aws/sqs/package-info.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/package-info.java @@ -23,4 +23,4 @@ * @see * @author Adrian Cole */ -package org.jclouds.aws.sqs; \ No newline at end of file +package org.jclouds.sqs; diff --git a/aws/core/src/main/java/org/jclouds/aws/sqs/reference/SQSParameters.java b/apis/sqs/src/main/java/org/jclouds/sqs/reference/SQSParameters.java similarity index 98% rename from aws/core/src/main/java/org/jclouds/aws/sqs/reference/SQSParameters.java rename to apis/sqs/src/main/java/org/jclouds/sqs/reference/SQSParameters.java index 972b8b7702..b8c457e02a 100644 --- a/aws/core/src/main/java/org/jclouds/aws/sqs/reference/SQSParameters.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/reference/SQSParameters.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.aws.sqs.reference; +package org.jclouds.sqs.reference; /** * Configuration properties and constants used in SQS connections. diff --git a/aws/core/src/main/java/org/jclouds/aws/sqs/reference/package-info.java b/apis/sqs/src/main/java/org/jclouds/sqs/reference/package-info.java old mode 100755 new mode 100644 similarity index 95% rename from aws/core/src/main/java/org/jclouds/aws/sqs/reference/package-info.java rename to apis/sqs/src/main/java/org/jclouds/sqs/reference/package-info.java index f7b86afd35..d8ba3636a8 --- a/aws/core/src/main/java/org/jclouds/aws/sqs/reference/package-info.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/reference/package-info.java @@ -21,4 +21,4 @@ * This package contains properties and reference data used in SQS. * @author Adrian Cole */ -package org.jclouds.aws.sqs.reference; \ No newline at end of file +package org.jclouds.sqs.reference; diff --git a/aws/core/src/main/java/org/jclouds/aws/sqs/xml/ListQueuesResponseHandler.java b/apis/sqs/src/main/java/org/jclouds/sqs/xml/ListQueuesResponseHandler.java old mode 100755 new mode 100644 similarity index 95% rename from aws/core/src/main/java/org/jclouds/aws/sqs/xml/ListQueuesResponseHandler.java rename to apis/sqs/src/main/java/org/jclouds/sqs/xml/ListQueuesResponseHandler.java index 3aa65f78c6..232b65493e --- a/aws/core/src/main/java/org/jclouds/aws/sqs/xml/ListQueuesResponseHandler.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/xml/ListQueuesResponseHandler.java @@ -17,13 +17,13 @@ * ==================================================================== */ -package org.jclouds.aws.sqs.xml; +package org.jclouds.sqs.xml; import java.util.Set; import javax.inject.Inject; -import org.jclouds.aws.sqs.domain.Queue; +import org.jclouds.sqs.domain.Queue; import org.jclouds.http.functions.ParseSax; import com.google.common.collect.Sets; diff --git a/aws/core/src/main/java/org/jclouds/aws/sqs/xml/MD5Handler.java b/apis/sqs/src/main/java/org/jclouds/sqs/xml/MD5Handler.java similarity index 98% rename from aws/core/src/main/java/org/jclouds/aws/sqs/xml/MD5Handler.java rename to apis/sqs/src/main/java/org/jclouds/sqs/xml/MD5Handler.java index b79288f56c..c8b2a07be9 100644 --- a/aws/core/src/main/java/org/jclouds/aws/sqs/xml/MD5Handler.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/xml/MD5Handler.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.aws.sqs.xml; +package org.jclouds.sqs.xml; import org.jclouds.crypto.CryptoStreams; import org.jclouds.http.functions.ParseSax; diff --git a/aws/core/src/main/java/org/jclouds/aws/sqs/xml/QueueHandler.java b/apis/sqs/src/main/java/org/jclouds/sqs/xml/QueueHandler.java similarity index 97% rename from aws/core/src/main/java/org/jclouds/aws/sqs/xml/QueueHandler.java rename to apis/sqs/src/main/java/org/jclouds/sqs/xml/QueueHandler.java index e0f9d355af..95554644d8 100644 --- a/aws/core/src/main/java/org/jclouds/aws/sqs/xml/QueueHandler.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/xml/QueueHandler.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.aws.sqs.xml; +package org.jclouds.sqs.xml; import java.net.URI; import java.util.Map; @@ -26,7 +26,7 @@ import javax.inject.Inject; import javax.inject.Provider; import javax.ws.rs.core.UriBuilder; -import org.jclouds.aws.sqs.domain.Queue; +import org.jclouds.sqs.domain.Queue; import org.jclouds.http.functions.ParseSax; import org.jclouds.location.Region; diff --git a/aws/core/src/main/java/org/jclouds/aws/sqs/xml/RegexListQueuesResponseHandler.java b/apis/sqs/src/main/java/org/jclouds/sqs/xml/RegexListQueuesResponseHandler.java similarity index 92% rename from aws/core/src/main/java/org/jclouds/aws/sqs/xml/RegexListQueuesResponseHandler.java rename to apis/sqs/src/main/java/org/jclouds/sqs/xml/RegexListQueuesResponseHandler.java index 23e7bd1638..0f50f40c8d 100644 --- a/aws/core/src/main/java/org/jclouds/aws/sqs/xml/RegexListQueuesResponseHandler.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/xml/RegexListQueuesResponseHandler.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.aws.sqs.xml; +package org.jclouds.sqs.xml; import java.net.URI; import java.util.Map; @@ -26,8 +26,8 @@ import java.util.Set; import javax.inject.Inject; import javax.inject.Singleton; -import org.jclouds.aws.sqs.domain.Queue; -import org.jclouds.aws.sqs.xml.internal.BaseRegexQueueHandler; +import org.jclouds.sqs.domain.Queue; +import org.jclouds.sqs.xml.internal.BaseRegexQueueHandler; import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.ReturnStringIf2xx; import org.jclouds.location.Region; @@ -57,4 +57,4 @@ public class RegexListQueuesResponseHandler extends BaseRegexQueueHandler implem return parse(returnStringIf200.apply(response)); } -} \ No newline at end of file +} diff --git a/aws/core/src/main/java/org/jclouds/aws/sqs/xml/RegexMD5Handler.java b/apis/sqs/src/main/java/org/jclouds/sqs/xml/RegexMD5Handler.java similarity index 98% rename from aws/core/src/main/java/org/jclouds/aws/sqs/xml/RegexMD5Handler.java rename to apis/sqs/src/main/java/org/jclouds/sqs/xml/RegexMD5Handler.java index 3c585c0ed9..39fa288d06 100644 --- a/aws/core/src/main/java/org/jclouds/aws/sqs/xml/RegexMD5Handler.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/xml/RegexMD5Handler.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.aws.sqs.xml; +package org.jclouds.sqs.xml; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/aws/core/src/main/java/org/jclouds/aws/sqs/xml/RegexQueueHandler.java b/apis/sqs/src/main/java/org/jclouds/sqs/xml/RegexQueueHandler.java similarity index 92% rename from aws/core/src/main/java/org/jclouds/aws/sqs/xml/RegexQueueHandler.java rename to apis/sqs/src/main/java/org/jclouds/sqs/xml/RegexQueueHandler.java index 647495ac93..174df47bbf 100644 --- a/aws/core/src/main/java/org/jclouds/aws/sqs/xml/RegexQueueHandler.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/xml/RegexQueueHandler.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.aws.sqs.xml; +package org.jclouds.sqs.xml; import java.net.URI; import java.util.Map; @@ -25,8 +25,8 @@ import java.util.Map; import javax.inject.Inject; import javax.inject.Singleton; -import org.jclouds.aws.sqs.domain.Queue; -import org.jclouds.aws.sqs.xml.internal.BaseRegexQueueHandler; +import org.jclouds.sqs.domain.Queue; +import org.jclouds.sqs.xml.internal.BaseRegexQueueHandler; import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.ReturnStringIf2xx; import org.jclouds.location.Region; @@ -55,4 +55,4 @@ public class RegexQueueHandler extends BaseRegexQueueHandler implements public Queue apply(HttpResponse response) { return Iterables.getOnlyElement(parse(returnStringIf200.apply(response))); } -} \ No newline at end of file +} diff --git a/aws/core/src/main/java/org/jclouds/aws/sqs/xml/internal/BaseRegexQueueHandler.java b/apis/sqs/src/main/java/org/jclouds/sqs/xml/internal/BaseRegexQueueHandler.java similarity index 96% rename from aws/core/src/main/java/org/jclouds/aws/sqs/xml/internal/BaseRegexQueueHandler.java rename to apis/sqs/src/main/java/org/jclouds/sqs/xml/internal/BaseRegexQueueHandler.java index a738345529..52f6113c7a 100644 --- a/aws/core/src/main/java/org/jclouds/aws/sqs/xml/internal/BaseRegexQueueHandler.java +++ b/apis/sqs/src/main/java/org/jclouds/sqs/xml/internal/BaseRegexQueueHandler.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.aws.sqs.xml.internal; +package org.jclouds.sqs.xml.internal; import java.net.URI; import java.util.Map; @@ -28,7 +28,7 @@ import java.util.regex.Pattern; import javax.inject.Inject; import javax.inject.Singleton; -import org.jclouds.aws.sqs.domain.Queue; +import org.jclouds.sqs.domain.Queue; import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.Sets; @@ -64,4 +64,4 @@ public class BaseRegexQueueHandler { return queues; } -} \ No newline at end of file +} diff --git a/aws/core/src/test/java/org/jclouds/aws/sqs/SQSAsyncClientTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/SQSAsyncClientTest.java similarity index 90% rename from aws/core/src/test/java/org/jclouds/aws/sqs/SQSAsyncClientTest.java rename to apis/sqs/src/test/java/org/jclouds/sqs/SQSAsyncClientTest.java index d9f352b365..8e2cff6049 100644 --- a/aws/core/src/test/java/org/jclouds/aws/sqs/SQSAsyncClientTest.java +++ b/apis/sqs/src/test/java/org/jclouds/sqs/SQSAsyncClientTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.aws.sqs; +package org.jclouds.sqs; import static com.google.common.base.Predicates.equalTo; import static com.google.common.base.Predicates.not; @@ -33,11 +33,6 @@ import javax.inject.Named; import org.jclouds.Constants; import org.jclouds.aws.domain.Region; import org.jclouds.aws.filters.FormSigner; -import org.jclouds.aws.sqs.config.SQSRestClientModule; -import org.jclouds.aws.sqs.options.CreateQueueOptions; -import org.jclouds.aws.sqs.options.ListQueuesOptions; -import org.jclouds.aws.sqs.xml.RegexListQueuesResponseHandler; -import org.jclouds.aws.sqs.xml.RegexQueueHandler; import org.jclouds.date.DateService; import org.jclouds.http.HttpRequest; import org.jclouds.http.RequiresHttp; @@ -46,6 +41,11 @@ import org.jclouds.rest.RestClientTest; import org.jclouds.rest.RestContextFactory; import org.jclouds.rest.RestContextSpec; import org.jclouds.rest.internal.RestAnnotationProcessor; +import org.jclouds.sqs.config.SQSRestClientModule; +import org.jclouds.sqs.options.CreateQueueOptions; +import org.jclouds.sqs.options.ListQueuesOptions; +import org.jclouds.sqs.xml.RegexListQueuesResponseHandler; +import org.jclouds.sqs.xml.RegexQueueHandler; import org.testng.annotations.Test; import com.google.common.collect.Iterables; @@ -77,8 +77,8 @@ public class SQSAsyncClientTest extends RestClientTest { } public void testListQueuesInRegion() throws SecurityException, NoSuchMethodException, IOException { - Method method = SQSAsyncClient.class.getMethod("listQueuesInRegion", String.class, Array.newInstance( - ListQueuesOptions.class, 0).getClass()); + Method method = SQSAsyncClient.class.getMethod("listQueuesInRegion", String.class, + Array.newInstance(ListQueuesOptions.class, 0).getClass()); HttpRequest request = processor.createRequest(method, (String) null); assertRequestLineEquals(request, "POST https://sqs.us-east-1.amazonaws.com/ HTTP/1.1"); @@ -93,8 +93,8 @@ public class SQSAsyncClientTest extends RestClientTest { } public void testListQueuesInRegionOptions() throws SecurityException, NoSuchMethodException, IOException { - Method method = SQSAsyncClient.class.getMethod("listQueuesInRegion", String.class, Array.newInstance( - ListQueuesOptions.class, 0).getClass()); + Method method = SQSAsyncClient.class.getMethod("listQueuesInRegion", String.class, + Array.newInstance(ListQueuesOptions.class, 0).getClass()); HttpRequest request = processor.createRequest(method, null, ListQueuesOptions.Builder.queuePrefix("prefix")); assertRequestLineEquals(request, "POST https://sqs.us-east-1.amazonaws.com/ HTTP/1.1"); @@ -129,8 +129,8 @@ public class SQSAsyncClientTest extends RestClientTest { public void testCreateQueueInRegionOptions() throws SecurityException, NoSuchMethodException, IOException { Method method = SQSAsyncClient.class.getMethod("createQueueInRegion", String.class, String.class, Array .newInstance(CreateQueueOptions.class, 0).getClass()); - HttpRequest request = processor.createRequest(method, null, "queueName", CreateQueueOptions.Builder - .defaultVisibilityTimeout(45)); + HttpRequest request = processor.createRequest(method, null, "queueName", + CreateQueueOptions.Builder.defaultVisibilityTimeout(45)); assertRequestLineEquals(request, "POST https://sqs.us-east-1.amazonaws.com/ HTTP/1.1"); assertNonPayloadHeadersEqual(request, "Host: sqs.us-east-1.amazonaws.com\n"); @@ -170,9 +170,11 @@ public class SQSAsyncClientTest extends RestClientTest { return new TestSQSRestClientModule(); } + protected String provider = "sqs"; + @Override public RestContextSpec createContextSpec() { - return new RestContextFactory().createContextSpec("sqs", "identity", "credential", new Properties()); + return new RestContextFactory().createContextSpec(provider, "identity", "credential", new Properties()); } } diff --git a/aws/core/src/test/java/org/jclouds/aws/sqs/SQSClientLiveTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/SQSClientLiveTest.java similarity index 97% rename from aws/core/src/test/java/org/jclouds/aws/sqs/SQSClientLiveTest.java rename to apis/sqs/src/test/java/org/jclouds/sqs/SQSClientLiveTest.java index fc856c9c2e..ec6fd38373 100644 --- a/aws/core/src/test/java/org/jclouds/aws/sqs/SQSClientLiveTest.java +++ b/apis/sqs/src/test/java/org/jclouds/sqs/SQSClientLiveTest.java @@ -17,10 +17,10 @@ * ==================================================================== */ -package org.jclouds.aws.sqs; +package org.jclouds.sqs; import static com.google.common.base.Preconditions.checkNotNull; -import static org.jclouds.aws.sqs.options.ListQueuesOptions.Builder.queuePrefix; +import static org.jclouds.sqs.options.ListQueuesOptions.Builder.queuePrefix; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; @@ -32,11 +32,11 @@ import java.util.SortedSet; import org.jclouds.Constants; import org.jclouds.aws.AWSResponseException; import org.jclouds.aws.domain.Region; -import org.jclouds.aws.sqs.domain.Queue; import org.jclouds.crypto.CryptoStreams; import org.jclouds.logging.log4j.config.Log4JLoggingModule; import org.jclouds.rest.RestContext; import org.jclouds.rest.RestContextFactory; +import org.jclouds.sqs.domain.Queue; import org.testng.annotations.AfterTest; import org.testng.annotations.BeforeGroups; import org.testng.annotations.Test; diff --git a/aws/core/src/test/java/org/jclouds/aws/sqs/config/SQSRestClientModuleTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/config/SQSRestClientModuleTest.java similarity index 98% rename from aws/core/src/test/java/org/jclouds/aws/sqs/config/SQSRestClientModuleTest.java rename to apis/sqs/src/test/java/org/jclouds/sqs/config/SQSRestClientModuleTest.java index c6cce67893..7874a12f37 100644 --- a/aws/core/src/test/java/org/jclouds/aws/sqs/config/SQSRestClientModuleTest.java +++ b/apis/sqs/src/test/java/org/jclouds/sqs/config/SQSRestClientModuleTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.aws.sqs.config; +package org.jclouds.sqs.config; import static org.testng.Assert.assertEquals; @@ -31,8 +31,8 @@ import org.jclouds.aws.handlers.ParseAWSErrorFromXmlContent; import org.jclouds.http.handlers.DelegatingErrorHandler; import org.jclouds.http.handlers.DelegatingRetryHandler; import org.jclouds.logging.config.NullLoggingModule; -import org.jclouds.rest.RestContextFactory; import org.jclouds.rest.BaseRestClientTest.MockModule; +import org.jclouds.rest.RestContextFactory; import org.testng.annotations.Test; import com.google.common.collect.ImmutableMap; @@ -90,4 +90,4 @@ public class SQSRestClientModuleTest { AWSRedirectionRetryHandler.class); } -} \ No newline at end of file +} diff --git a/aws/core/src/test/java/org/jclouds/aws/sqs/options/CreateQueueOptionsTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/options/CreateQueueOptionsTest.java similarity index 94% rename from aws/core/src/test/java/org/jclouds/aws/sqs/options/CreateQueueOptionsTest.java rename to apis/sqs/src/test/java/org/jclouds/sqs/options/CreateQueueOptionsTest.java index 2de60fc5a5..b31205f2ae 100644 --- a/aws/core/src/test/java/org/jclouds/aws/sqs/options/CreateQueueOptionsTest.java +++ b/apis/sqs/src/test/java/org/jclouds/sqs/options/CreateQueueOptionsTest.java @@ -17,9 +17,9 @@ * ==================================================================== */ -package org.jclouds.aws.sqs.options; +package org.jclouds.sqs.options; -import static org.jclouds.aws.sqs.options.CreateQueueOptions.Builder.defaultVisibilityTimeout; +import static org.jclouds.sqs.options.CreateQueueOptions.Builder.defaultVisibilityTimeout; import static org.testng.Assert.assertEquals; import java.util.Collections; diff --git a/aws/core/src/test/java/org/jclouds/aws/sqs/options/ListQueuesOptionsTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/options/ListQueuesOptionsTest.java similarity index 94% rename from aws/core/src/test/java/org/jclouds/aws/sqs/options/ListQueuesOptionsTest.java rename to apis/sqs/src/test/java/org/jclouds/sqs/options/ListQueuesOptionsTest.java index 5c2d811156..c578e61906 100644 --- a/aws/core/src/test/java/org/jclouds/aws/sqs/options/ListQueuesOptionsTest.java +++ b/apis/sqs/src/test/java/org/jclouds/sqs/options/ListQueuesOptionsTest.java @@ -17,9 +17,9 @@ * ==================================================================== */ -package org.jclouds.aws.sqs.options; +package org.jclouds.sqs.options; -import static org.jclouds.aws.sqs.options.ListQueuesOptions.Builder.queuePrefix; +import static org.jclouds.sqs.options.ListQueuesOptions.Builder.queuePrefix; import static org.testng.Assert.assertEquals; import java.util.Collections; diff --git a/aws/core/src/test/java/org/jclouds/aws/sqs/xml/ListQueuesResponseHandlerTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/xml/ListQueuesResponseHandlerTest.java similarity index 98% rename from aws/core/src/test/java/org/jclouds/aws/sqs/xml/ListQueuesResponseHandlerTest.java rename to apis/sqs/src/test/java/org/jclouds/sqs/xml/ListQueuesResponseHandlerTest.java index 4edae58195..37d04bf02b 100644 --- a/aws/core/src/test/java/org/jclouds/aws/sqs/xml/ListQueuesResponseHandlerTest.java +++ b/apis/sqs/src/test/java/org/jclouds/sqs/xml/ListQueuesResponseHandlerTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.aws.sqs.xml; +package org.jclouds.sqs.xml; import static org.testng.Assert.assertEquals; @@ -35,12 +35,12 @@ import javax.ws.rs.core.UriBuilder; import org.jclouds.PerformanceTest; import org.jclouds.aws.domain.Region; -import org.jclouds.aws.sqs.domain.Queue; import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.ParseSax; import org.jclouds.http.functions.ParseSax.Factory; import org.jclouds.http.functions.config.SaxParserModule; import org.jclouds.io.Payloads; +import org.jclouds.sqs.domain.Queue; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; @@ -98,7 +98,7 @@ public class ListQueuesResponseHandlerTest extends PerformanceTest { handler = injector.getInstance(RegexListQueuesResponseHandler.class); factory = injector.getInstance(ParseSax.Factory.class); - InputStream inputStream = getClass().getResourceAsStream("/sqs/list_queues.xml"); + InputStream inputStream = getClass().getResourceAsStream("/list_queues.xml"); ByteArrayOutputStream out = new ByteArrayOutputStream(); ByteStreams.copy(inputStream, out); supplier = ByteStreams.newInputStreamSupplier(out.toByteArray()); diff --git a/aws/core/src/test/resources/sqs/list_queues.xml b/apis/sqs/src/test/resources/list_queues.xml similarity index 100% rename from aws/core/src/test/resources/sqs/list_queues.xml rename to apis/sqs/src/test/resources/list_queues.xml diff --git a/apis/sqs/src/test/resources/log4j.xml b/apis/sqs/src/test/resources/log4j.xml new file mode 100644 index 0000000000..5b548a0f48 --- /dev/null +++ b/apis/sqs/src/test/resources/log4j.xml @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/aws/core/src/test/java/org/jclouds/aws/ProvidersInPropertiesTest.java b/aws/core/src/test/java/org/jclouds/aws/ProvidersInPropertiesTest.java index 073a1d31b6..4e8c9c2fa5 100644 --- a/aws/core/src/test/java/org/jclouds/aws/ProvidersInPropertiesTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/ProvidersInPropertiesTest.java @@ -36,7 +36,6 @@ public class ProvidersInPropertiesTest { @Test public void testSupportedComputeServiceProviders() { Iterable providers = ComputeServiceUtils.getSupportedProviders(); - assert !Iterables.contains(providers, "sqs") : providers; assert Iterables.contains(providers, "ec2") : providers; assert Iterables.contains(providers, "nova") : providers; assert Iterables.contains(providers, "eucalyptus") : providers; @@ -45,7 +44,6 @@ public class ProvidersInPropertiesTest { @Test public void testSupportedProviders() { Iterable providers = Providers.getSupportedProviders(); - assert Iterables.contains(providers, "sqs") : providers; assert Iterables.contains(providers, "ec2") : providers; assert Iterables.contains(providers, "nova") : providers; assert Iterables.contains(providers, "eucalyptus") : providers; diff --git a/aws/demos/pom.xml b/aws/demos/pom.xml index b1d6a76dd1..fa9e3b1b44 100644 --- a/aws/demos/pom.xml +++ b/aws/demos/pom.xml @@ -35,7 +35,6 @@ googleappengine --> createlamp - speedtest-sqs createandlistbuckets diff --git a/aws/pom.xml b/aws/pom.xml index 3ae5915288..eb991d3c7b 100644 --- a/aws/pom.xml +++ b/aws/pom.xml @@ -49,10 +49,6 @@ 2009-05-15 ${test.aws.identity} ${test.aws.credential} - https://sqs.us-east-1.amazonaws.com - 2009-02-01 - ${test.aws.identity} - ${test.aws.credential} http://173.205.188.130:8773/services/Eucalyptus 2010-06-15 FIXME @@ -162,22 +158,6 @@ jclouds.compute.blacklist.nodes ${jclouds.compute.blacklist.nodes} - - test.sqs.endpoint - ${test.sqs.endpoint} - - - test.sqs.apiversion - ${test.sqs.apiversion} - - - test.sqs.identity - ${test.sqs.identity} - - - test.sqs.credential - ${test.sqs.credential} - test.cloudwatch.endpoint ${test.cloudwatch.endpoint} diff --git a/core/src/main/resources/rest.properties b/core/src/main/resources/rest.properties index 688a92d401..5f7ea675e9 100644 --- a/core/src/main/resources/rest.properties +++ b/core/src/main/resources/rest.properties @@ -32,8 +32,8 @@ pcs.apiVersion=unknown sdn.contextbuilder=org.jclouds.nirvanix.sdn.SDNContextBuilder sdn.propertiesbuilder=org.jclouds.nirvanix.sdn.SDNPropertiesBuilder -sqs.contextbuilder=org.jclouds.aws.sqs.SQSContextBuilder -sqs.propertiesbuilder=org.jclouds.aws.sqs.SQSPropertiesBuilder +sqs.contextbuilder=org.jclouds.sqs.SQSContextBuilder +sqs.propertiesbuilder=org.jclouds.sqs.SQSPropertiesBuilder simpledb.contextbuilder=org.jclouds.simpledb.SimpleDBContextBuilder simpledb.propertiesbuilder=org.jclouds.simpledb.SimpleDBPropertiesBuilder diff --git a/aws/demos/speedtest-sqs/README.txt b/demos/speedtest-sqs/README.txt similarity index 100% rename from aws/demos/speedtest-sqs/README.txt rename to demos/speedtest-sqs/README.txt diff --git a/aws/demos/speedtest-sqs/pom.xml b/demos/speedtest-sqs/pom.xml similarity index 100% rename from aws/demos/speedtest-sqs/pom.xml rename to demos/speedtest-sqs/pom.xml diff --git a/aws/demos/speedtest-sqs/src/main/java/org/jclouds/aws/sqs/SpeedTest.java b/demos/speedtest-sqs/src/main/java/org/jclouds/aws/sqs/SpeedTest.java similarity index 100% rename from aws/demos/speedtest-sqs/src/main/java/org/jclouds/aws/sqs/SpeedTest.java rename to demos/speedtest-sqs/src/main/java/org/jclouds/aws/sqs/SpeedTest.java