Issue 440: move sqs code into its own api module

all/pom.xml

@@ -49,5 +49,10 @@
             <artifactId>aws-elb</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.jclouds.api</groupId>
+            <artifactId>sqs</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 </project>

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;
 

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;
 
 /**

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;

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;

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<SQSClient,
       super(SQSClient.class, SQSAsyncClient.class);
    }
 
-}
+}

apis/sqs/src/main/java/org/jclouds/sqs/domain/Queue.java

@@ -17,7 +17,7 @@
  * ====================================================================
  */
 
-package org.jclouds.aws.sqs.domain;
+package org.jclouds.sqs.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -100,4 +100,4 @@ public class Queue implements Comparable<Queue> {
    }
 
 
-}
+}

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<Object, URI> {
       return ((Queue) from).getLocation();
    }
 
-}
+}

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):
  * <p/>
  * <code>
- * import static org.jclouds.aws.sqs.options.CreateQueueOptions.Builder.*
+ * import static org.jclouds.sqs.options.CreateQueueOptions.Builder.*
  * <p/>
  * SQSClient connection = // get connection
  * Queue queue = connection.createQueueInRegion(defaultVisibilityTimeout("foo"));

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):
  * <p/>
  * <code>
- * import static org.jclouds.aws.sqs.options.ListQueuesOptions.Builder.*
+ * import static org.jclouds.sqs.options.ListQueuesOptions.Builder.*
  * <p/>
  * SQSClient connection = // get connection
  * Set<Queue> queues = connection.listQueuesInRegion(queuePrefix("foo"));

apis/sqs/src/main/java/org/jclouds/sqs/package-info.java

@@ -23,4 +23,4 @@
  * @see <a href="http://docs.amazonwebservices.com/AWSSimpleQueueService/latest/APIReference/index.html"/>
  * @author Adrian Cole
  */
-package org.jclouds.aws.sqs;
+package org.jclouds.sqs;

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.

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;
+package org.jclouds.sqs.reference;

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;

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;

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;
 

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));
    }
 
-}
+}

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;

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)));
    }
-}
+}

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;
    }
 
-}
+}

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<SQSAsyncClient> {
    }
 
    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<SQSAsyncClient> {
    }
 
    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<SQSAsyncClient> {
    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<SQSAsyncClient> {
       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());
    }
 
 }

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;

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);
    }
 
-}
+}

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;

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;

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());

apis/sqs/src/test/resources/log4j.xml

@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="UTF-8"?>
+    <!--
+
+
+        Copyright (C) 2010 Cloud Conscious, LLC.
+        <info@cloudconscious.com>
+
+        ====================================================================
+        Licensed under the Apache License, Version 2.0 (the "License");
+        you may not use this file except in compliance with the License.
+        You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+        applicable law or agreed to in writing, software distributed
+        under the License is distributed on an "AS IS" BASIS, WITHOUT
+        WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+        See the License for the specific language governing permissions
+        and limitations under the License.
+        ====================================================================
+    -->
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+    <!--
+        For more configuration infromation and examples see the Apache
+        Log4j website: http://logging.apache.org/log4j/
+    -->
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
+    debug="false">
+
+    <!-- A time/date based rolling appender -->
+    <appender name="WIREFILE" class="org.apache.log4j.DailyRollingFileAppender">
+        <param name="File" value="target/test-data/jclouds-wire.log" />
+        <param name="Append" value="true" />
+
+        <!-- Rollover at midnight each day -->
+        <param name="DatePattern" value="'.'yyyy-MM-dd" />
+
+        <param name="Threshold" value="TRACE" />
+
+        <layout class="org.apache.log4j.PatternLayout">
+            <!-- The default pattern: Date Priority [Category] Message\n -->
+            <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
+
+            <!--
+                The full pattern: Date MS Priority [Category]
+                (Thread:NDC) Message\n <param name="ConversionPattern"
+                value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+            -->
+        </layout>
+    </appender>
+
+    <!-- A time/date based rolling appender -->
+    <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
+        <param name="File" value="target/test-data/jclouds.log" />
+        <param name="Append" value="true" />
+
+        <!-- Rollover at midnight each day -->
+        <param name="DatePattern" value="'.'yyyy-MM-dd" />
+
+        <param name="Threshold" value="TRACE" />
+
+        <layout class="org.apache.log4j.PatternLayout">
+            <!-- The default pattern: Date Priority [Category] Message\n -->
+            <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
+
+            <!--
+                The full pattern: Date MS Priority [Category]
+                (Thread:NDC) Message\n <param name="ConversionPattern"
+                value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+            -->
+        </layout>
+    </appender>
+    <!-- A time/date based rolling appender -->
+    <appender name="BLOBSTOREFILE" class="org.apache.log4j.DailyRollingFileAppender">
+        <param name="File" value="target/test-data/jclouds-blobstore.log" />
+        <param name="Append" value="true" />
+        <param name="DatePattern" value="'.'yyyy-MM-dd" />
+        <param name="Threshold" value="TRACE" />
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
+        </layout>
+    </appender>
+
+    <!-- A time/date based rolling appender -->
+    <appender name="COMPUTEFILE" class="org.apache.log4j.DailyRollingFileAppender">
+        <param name="File" value="target/test-data/jclouds-compute.log" />
+        <param name="Append" value="true" />
+
+        <!-- Rollover at midnight each day -->
+        <param name="DatePattern" value="'.'yyyy-MM-dd" />
+
+        <param name="Threshold" value="TRACE" />
+
+        <layout class="org.apache.log4j.PatternLayout">
+            <!-- The default pattern: Date Priority [Category] Message\n -->
+            <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
+
+            <!--
+                The full pattern: Date MS Priority [Category]
+                (Thread:NDC) Message\n <param name="ConversionPattern"
+                value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+            -->
+        </layout>
+    </appender>
+
+    <!-- A time/date based rolling appender -->
+    <appender name="SSHFILE" class="org.apache.log4j.DailyRollingFileAppender">
+        <param name="File" value="target/test-data/jclouds-ssh.log" />
+        <param name="Append" value="true" />
+
+        <!-- Rollover at midnight each day -->
+        <param name="DatePattern" value="'.'yyyy-MM-dd" />
+
+        <param name="Threshold" value="TRACE" />
+
+        <layout class="org.apache.log4j.PatternLayout">
+            <!-- The default pattern: Date Priority [Category] Message\n -->
+            <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
+
+            <!--
+                The full pattern: Date MS Priority [Category]
+                (Thread:NDC) Message\n <param name="ConversionPattern"
+                value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+            -->
+        </layout>
+    </appender>
+
+    <appender name="ASYNCCOMPUTE" class="org.apache.log4j.AsyncAppender">
+        <appender-ref ref="COMPUTEFILE" />
+    </appender>
+
+    <appender name="ASYNCSSH" class="org.apache.log4j.AsyncAppender">
+        <appender-ref ref="SSHFILE" />
+    </appender>
+
+    <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
+        <appender-ref ref="FILE" />
+    </appender>
+
+    <appender name="ASYNCWIRE" class="org.apache.log4j.AsyncAppender">
+        <appender-ref ref="WIREFILE" />
+    </appender>
+
+    <appender name="ASYNCBLOBSTORE" class="org.apache.log4j.AsyncAppender">
+        <appender-ref ref="BLOBSTOREFILE" />
+    </appender>
+    <!-- ================ -->
+    <!-- Limit categories -->
+    <!-- ================ -->
+
+    <category name="org.jclouds">
+        <priority value="DEBUG" />
+        <appender-ref ref="ASYNC" />
+    </category>
+
+    <category name="jclouds.headers">
+        <priority value="DEBUG" />
+        <appender-ref ref="ASYNCWIRE" />
+    </category>
+
+    <category name="jclouds.ssh">
+        <priority value="DEBUG" />
+        <appender-ref ref="ASYNCSSH" />
+    </category>
+    <category name="jclouds.wire">
+        <priority value="DEBUG" />
+        <appender-ref ref="ASYNCWIRE" />
+    </category>
+    <category name="jclouds.blobstore">
+        <priority value="DEBUG" />
+        <appender-ref ref="ASYNCBLOBSTORE" />
+    </category>
+    <category name="jclouds.compute">
+        <priority value="TRACE" />
+        <appender-ref ref="ASYNCCOMPUTE" />
+    </category>
+    <!-- ======================= -->
+    <!-- Setup the Root category -->
+    <!-- ======================= -->
+
+    <root>
+        <priority value="WARN" />
+    </root>
+
+</log4j:configuration>

aws/core/src/test/java/org/jclouds/aws/ProvidersInPropertiesTest.java

@@ -36,7 +36,6 @@ public class ProvidersInPropertiesTest {
    @Test
    public void testSupportedComputeServiceProviders() {
       Iterable<String> 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<String> 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;

aws/demos/pom.xml

@@ -35,7 +35,6 @@
                 <module>googleappengine</module>
         -->
        <module>createlamp</module>
-       <module>speedtest-sqs</module>
        <module>createandlistbuckets</module>
 
     </modules>

aws/pom.xml

@@ -49,10 +49,6 @@
         <test.cloudwatch.apiversion>2009-05-15</test.cloudwatch.apiversion>
         <test.cloudwatch.identity>${test.aws.identity}</test.cloudwatch.identity>
         <test.cloudwatch.credential>${test.aws.credential}</test.cloudwatch.credential>
-        <test.sqs.endpoint>https://sqs.us-east-1.amazonaws.com</test.sqs.endpoint>
-        <test.sqs.apiversion>2009-02-01</test.sqs.apiversion>
-        <test.sqs.identity>${test.aws.identity}</test.sqs.identity>
-        <test.sqs.credential>${test.aws.credential}</test.sqs.credential>
         <test.eucalyptus.endpoint>http://173.205.188.130:8773/services/Eucalyptus</test.eucalyptus.endpoint>
         <test.eucalyptus.apiversion>2010-06-15</test.eucalyptus.apiversion>
         <test.eucalyptus.identity>FIXME</test.eucalyptus.identity>
@@ -162,22 +158,6 @@
                                             <name>jclouds.compute.blacklist.nodes</name>
                                             <value>${jclouds.compute.blacklist.nodes}</value>
                                         </property>
-                                        <property>
-                                            <name>test.sqs.endpoint</name>
-                                            <value>${test.sqs.endpoint}</value>
-                                        </property>
-                                        <property>
-                                            <name>test.sqs.apiversion</name>
-                                            <value>${test.sqs.apiversion}</value>
-                                        </property>
-                                        <property>
-                                            <name>test.sqs.identity</name>
-                                            <value>${test.sqs.identity}</value>
-                                        </property>
-                                        <property>
-                                            <name>test.sqs.credential</name>
-                                            <value>${test.sqs.credential}</value>
-                                        </property>
                                         <property>
                                             <name>test.cloudwatch.endpoint</name>
                                             <value>${test.cloudwatch.endpoint}</value>

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