diff --git a/README.txt b/README.txt deleted file mode 100644 index c765ebaf56..0000000000 --- a/README.txt +++ /dev/null @@ -1,136 +0,0 @@ -Overview: - -jclouds allows provisioning and control of cloud resources, including blobstore -and compute, from Java and Clojure. Our API gives allows developers to use -both portable abstractions and cloud-specific features. We test support of 30 -cloud providers and cloud software stacks, including Amazon, Azure, GoGrid, -Ninefold, OpenStack, and vCloud. jclouds is licensed under the Apache License, -Version 2.0 - -our current version is 1.4.2 -our next maintenance version is 1.4.2-SNAPSHOT -our dev version is 1.5.0-SNAPSHOT - -check out our examples site! https://github.com/jclouds/jclouds-examples - -our compute api supports: aws-ec2, gogrid, cloudservers-us, stub (in-memory), deltacloud, - cloudservers-uk, vcloud (generic), ec2 (generic), byon, nova, - trmk-ecloud, trmk-vcloudexpress, eucalyptus (generic) - cloudsigma-zrh, elasticstack(generic), go2cloud-jhb1, cloudsigma-lvs, - bluelock-vcloud-zone01, stratogen-vcloud-mycloud, rimuhosting, - slicehost, eucalyptus-partnercloud-ec2, elastichosts-lon-p (Peer 1), - elastichosts-sat-p (Peer 1), elastichosts-lon-b (BlueSquare), - openhosting-east1, serverlove-z1-man, skalicloud-sdg-my, - greenhousedata-element-vcloud, softlayer, cloudsigma (generic), - cloudstack (generic), ninefold-compute, openstack-nov (keystone), - hpcloud-compute, trystack-nova, openstack-nova-ec2, - rackspace-cloudservers-us (next gen), rackspace-cloudservers-uk (next gen) - - * note * the pom dependency org.jclouds/jclouds-allcompute gives you access to - to all of these providers - -our blobstore api supports: aws-s3, cloudfiles-us, cloudfiles-uk, filesystem, - azureblob, atmos (generic), synaptic-storage, hpcloud-objectstorage, - cloudonestorage, walrus(generic), ninefold-storage, - eucalyptus-partnercloud-s3, swift (generic), transient (in-mem) - - * note * the pom dependency org.jclouds/jclouds-allblobstore gives you access to - to all of these providers - -our loadbalancer api supports: cloudloadbalancers-us - - * note * the pom dependency org.jclouds/jclouds-allloadbalancer gives you access to - to all of these providers - -we also have aws-cloudwatch support. - -we also have support for: ibmdev, mezeo, nirvanix, boxdotnet, openstack nova, scality ring, - hosteurope-storage, tiscali-storage, scaleup-storage, googlestorage, - azurequeue, simpledb, as well as a async-http-client - driver in the sandbox - - -If you want access to all jclouds components, include the maven dependency org.jclouds/jclouds-all - - -BlobStore Example (Java): - // init - context = new BlobStoreContextFactory().createContext( - "aws-s3", - accesskeyid, - secretaccesskey); - blobStore = context.getBlobStore(); - - // create container - blobStore.createContainerInLocation(null, "mycontainer"); - - // add blob - blob = blobStore.blobBuilder("test").payload("testdata").build(); - blobStore.putBlob("mycontainer", blob); - -BlobStore Example (Clojure): - (use 'org.jclouds.blobstore2) - - (def *blobstore* (blobstore "azureblob" account encodedkey)) - (create-container *blobstore* "mycontainer") - (put-blob *blobstore* "mycontainer" (blob "test" :payload "testdata")) - -Compute Example (Java): - // init - context = new ComputeServiceContextFactory().createContext( - "aws-ec2", - accesskeyid, - secretaccesskey, - ImmutableSet.of(new Log4JLoggingModule(), - new SshjSshClientModule())); - client = context.getComputeService(); - - // define the requirements of your node - template = client.templateBuilder().osFamily(UBUNTU).smallest().build(); - - // setup a boot user which is the same as your login - template.getOptions().runScript(AdminAccess.standard()); - - // these nodes will be accessible via ssh when the call returns - nodes = client.createNodesInGroup("mycluster", 2, template); - - // you can now run ad-hoc commands on the nodes based on predicates - responses = client.runScriptOnNodesMatching(inGroup("mycluster"), "uptime", - wrapInInitScript(false)); - -Compute Example (Clojure): - (use 'org.jclouds.compute2) - - ; create a compute service using sshj and log4j extensions - (def compute - (*compute* "trmk`-ecloud" "user" "password" :sshj :log4j)) - - ; launch a couple nodes with the default operating system, installing your user. - (create-nodes *compute* "mycluster" 2 - (TemplateOptions$Builder/runScript (AdminAccess/standard))) - - ; run a command on that group - (run-script-on-nodes-matching *compute* (in-group? "mycluster") "uptime" - (RunScriptOptions$Builder/wrapInInitScript false)) - -Downloads: - * release notes: http://www.jclouds.org/documentation/releasenotes/1.3 - * installation guide: http://www.jclouds.org/documentation/userguide/installation-guide - * maven repo: http://repo2.maven.org/maven2 (maven central - the default repository) - * snapshot repo: https://oss.sonatype.org/content/repositories/snapshots - -Links: - * project page: http://jclouds.org/ - * documentation: http://www.jclouds.org/documentation/index - * javadocs (1.1.0): http://jclouds.rimuhosting.com/apidocs/ - * javadocs (1.0-SNAPSHOT): http://jclouds.rimuhosting.com/apidocs-SNAPSHOT/ - * community: http://www.jclouds.org/documentation/reference/apps-that-use-jclouds - * user group: http://groups.google.com/group/jclouds - * dev group: http://groups.google.com/group/jclouds-dev - * twitter: http://twitter.com/jclouds - -## License - -Copyright (C) 2009-2012 jclouds, Inc. - -Licensed under the Apache License, Version 2.0 diff --git a/all/pom.xml b/all/pom.xml index c0ed79dfd8..cfd5ff314b 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -40,6 +40,11 @@ aws-cloudwatch ${project.version} + + org.jclouds.provider + aws-sqs + ${project.version} + ${project.groupId} jclouds-allloadbalancer diff --git a/apis/pom.xml b/apis/pom.xml index bde1678588..29c3c5a57a 100644 --- a/apis/pom.xml +++ b/apis/pom.xml @@ -54,5 +54,6 @@ cloudsigma cloudstack rackspace-cloudidentity + sqs diff --git a/labs/sqs/pom.xml b/apis/sqs/pom.xml similarity index 99% rename from labs/sqs/pom.xml rename to apis/sqs/pom.xml index 43f9c737c9..83f4cbf0e0 100644 --- a/labs/sqs/pom.xml +++ b/apis/sqs/pom.xml @@ -27,7 +27,7 @@ 1.5.0-SNAPSHOT ../../project/pom.xml - org.jclouds.labs + org.jclouds.api sqs jcloud sqs api jclouds components to access an implementation of Simple Queue Service diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/SQSApi.java b/apis/sqs/src/main/java/org/jclouds/sqs/SQSApi.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/SQSApi.java rename to apis/sqs/src/main/java/org/jclouds/sqs/SQSApi.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/SQSApiMetadata.java b/apis/sqs/src/main/java/org/jclouds/sqs/SQSApiMetadata.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/SQSApiMetadata.java rename to apis/sqs/src/main/java/org/jclouds/sqs/SQSApiMetadata.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/SQSAsyncApi.java b/apis/sqs/src/main/java/org/jclouds/sqs/SQSAsyncApi.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/SQSAsyncApi.java rename to apis/sqs/src/main/java/org/jclouds/sqs/SQSAsyncApi.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/binders/BindAttributeNamesToIndexedFormParams.java b/apis/sqs/src/main/java/org/jclouds/sqs/binders/BindAttributeNamesToIndexedFormParams.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/binders/BindAttributeNamesToIndexedFormParams.java rename to apis/sqs/src/main/java/org/jclouds/sqs/binders/BindAttributeNamesToIndexedFormParams.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/binders/BindChangeMessageVisibilityBatchRequestEntryToIndexedFormParams.java b/apis/sqs/src/main/java/org/jclouds/sqs/binders/BindChangeMessageVisibilityBatchRequestEntryToIndexedFormParams.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/binders/BindChangeMessageVisibilityBatchRequestEntryToIndexedFormParams.java rename to apis/sqs/src/main/java/org/jclouds/sqs/binders/BindChangeMessageVisibilityBatchRequestEntryToIndexedFormParams.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/binders/BindDeleteMessageBatchRequestEntryToIndexedFormParams.java b/apis/sqs/src/main/java/org/jclouds/sqs/binders/BindDeleteMessageBatchRequestEntryToIndexedFormParams.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/binders/BindDeleteMessageBatchRequestEntryToIndexedFormParams.java rename to apis/sqs/src/main/java/org/jclouds/sqs/binders/BindDeleteMessageBatchRequestEntryToIndexedFormParams.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/binders/BindSendMessageBatchRequestEntryToIndexedFormParams.java b/apis/sqs/src/main/java/org/jclouds/sqs/binders/BindSendMessageBatchRequestEntryToIndexedFormParams.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/binders/BindSendMessageBatchRequestEntryToIndexedFormParams.java rename to apis/sqs/src/main/java/org/jclouds/sqs/binders/BindSendMessageBatchRequestEntryToIndexedFormParams.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/binders/BindSendMessageBatchRequestEntryWithDelaysToIndexedFormParams.java b/apis/sqs/src/main/java/org/jclouds/sqs/binders/BindSendMessageBatchRequestEntryWithDelaysToIndexedFormParams.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/binders/BindSendMessageBatchRequestEntryWithDelaysToIndexedFormParams.java rename to apis/sqs/src/main/java/org/jclouds/sqs/binders/BindSendMessageBatchRequestEntryWithDelaysToIndexedFormParams.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/config/SQSProperties.java b/apis/sqs/src/main/java/org/jclouds/sqs/config/SQSProperties.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/config/SQSProperties.java rename to apis/sqs/src/main/java/org/jclouds/sqs/config/SQSProperties.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/config/SQSRestClientModule.java b/apis/sqs/src/main/java/org/jclouds/sqs/config/SQSRestClientModule.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/config/SQSRestClientModule.java rename to apis/sqs/src/main/java/org/jclouds/sqs/config/SQSRestClientModule.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/domain/Action.java b/apis/sqs/src/main/java/org/jclouds/sqs/domain/Action.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/domain/Action.java rename to apis/sqs/src/main/java/org/jclouds/sqs/domain/Action.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/domain/Attribute.java b/apis/sqs/src/main/java/org/jclouds/sqs/domain/Attribute.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/domain/Attribute.java rename to apis/sqs/src/main/java/org/jclouds/sqs/domain/Attribute.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/domain/BatchError.java b/apis/sqs/src/main/java/org/jclouds/sqs/domain/BatchError.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/domain/BatchError.java rename to apis/sqs/src/main/java/org/jclouds/sqs/domain/BatchError.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/domain/BatchResult.java b/apis/sqs/src/main/java/org/jclouds/sqs/domain/BatchResult.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/domain/BatchResult.java rename to apis/sqs/src/main/java/org/jclouds/sqs/domain/BatchResult.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/domain/Message.java b/apis/sqs/src/main/java/org/jclouds/sqs/domain/Message.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/domain/Message.java rename to apis/sqs/src/main/java/org/jclouds/sqs/domain/Message.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/domain/MessageIdAndMD5.java b/apis/sqs/src/main/java/org/jclouds/sqs/domain/MessageIdAndMD5.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/domain/MessageIdAndMD5.java rename to apis/sqs/src/main/java/org/jclouds/sqs/domain/MessageIdAndMD5.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/domain/QueueAttributes.java b/apis/sqs/src/main/java/org/jclouds/sqs/domain/QueueAttributes.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/domain/QueueAttributes.java rename to apis/sqs/src/main/java/org/jclouds/sqs/domain/QueueAttributes.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/features/MessageApi.java b/apis/sqs/src/main/java/org/jclouds/sqs/features/MessageApi.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/features/MessageApi.java rename to apis/sqs/src/main/java/org/jclouds/sqs/features/MessageApi.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/features/MessageAsyncApi.java b/apis/sqs/src/main/java/org/jclouds/sqs/features/MessageAsyncApi.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/features/MessageAsyncApi.java rename to apis/sqs/src/main/java/org/jclouds/sqs/features/MessageAsyncApi.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/features/PermissionApi.java b/apis/sqs/src/main/java/org/jclouds/sqs/features/PermissionApi.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/features/PermissionApi.java rename to apis/sqs/src/main/java/org/jclouds/sqs/features/PermissionApi.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/features/PermissionAsyncApi.java b/apis/sqs/src/main/java/org/jclouds/sqs/features/PermissionAsyncApi.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/features/PermissionAsyncApi.java rename to apis/sqs/src/main/java/org/jclouds/sqs/features/PermissionAsyncApi.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/features/QueueApi.java b/apis/sqs/src/main/java/org/jclouds/sqs/features/QueueApi.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/features/QueueApi.java rename to apis/sqs/src/main/java/org/jclouds/sqs/features/QueueApi.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/features/QueueAsyncApi.java b/apis/sqs/src/main/java/org/jclouds/sqs/features/QueueAsyncApi.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/features/QueueAsyncApi.java rename to apis/sqs/src/main/java/org/jclouds/sqs/features/QueueAsyncApi.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/functions/MapToQueueAttributes.java b/apis/sqs/src/main/java/org/jclouds/sqs/functions/MapToQueueAttributes.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/functions/MapToQueueAttributes.java rename to apis/sqs/src/main/java/org/jclouds/sqs/functions/MapToQueueAttributes.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/handlers/ParseSQSErrorFromXmlContent.java b/apis/sqs/src/main/java/org/jclouds/sqs/handlers/ParseSQSErrorFromXmlContent.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/handlers/ParseSQSErrorFromXmlContent.java rename to apis/sqs/src/main/java/org/jclouds/sqs/handlers/ParseSQSErrorFromXmlContent.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/handlers/SQSErrorRetryHandler.java b/apis/sqs/src/main/java/org/jclouds/sqs/handlers/SQSErrorRetryHandler.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/handlers/SQSErrorRetryHandler.java rename to apis/sqs/src/main/java/org/jclouds/sqs/handlers/SQSErrorRetryHandler.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/options/CreateQueueOptions.java b/apis/sqs/src/main/java/org/jclouds/sqs/options/CreateQueueOptions.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/options/CreateQueueOptions.java rename to apis/sqs/src/main/java/org/jclouds/sqs/options/CreateQueueOptions.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/options/ListQueuesOptions.java b/apis/sqs/src/main/java/org/jclouds/sqs/options/ListQueuesOptions.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/options/ListQueuesOptions.java rename to apis/sqs/src/main/java/org/jclouds/sqs/options/ListQueuesOptions.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/options/ReceiveMessageOptions.java b/apis/sqs/src/main/java/org/jclouds/sqs/options/ReceiveMessageOptions.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/options/ReceiveMessageOptions.java rename to apis/sqs/src/main/java/org/jclouds/sqs/options/ReceiveMessageOptions.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/options/SendMessageOptions.java b/apis/sqs/src/main/java/org/jclouds/sqs/options/SendMessageOptions.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/options/SendMessageOptions.java rename to apis/sqs/src/main/java/org/jclouds/sqs/options/SendMessageOptions.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/package-info.java b/apis/sqs/src/main/java/org/jclouds/sqs/package-info.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/package-info.java rename to apis/sqs/src/main/java/org/jclouds/sqs/package-info.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/reference/SQSParameters.java b/apis/sqs/src/main/java/org/jclouds/sqs/reference/SQSParameters.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/reference/SQSParameters.java rename to apis/sqs/src/main/java/org/jclouds/sqs/reference/SQSParameters.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/reference/package-info.java b/apis/sqs/src/main/java/org/jclouds/sqs/reference/package-info.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/reference/package-info.java rename to apis/sqs/src/main/java/org/jclouds/sqs/reference/package-info.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/xml/AttributesHandler.java b/apis/sqs/src/main/java/org/jclouds/sqs/xml/AttributesHandler.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/xml/AttributesHandler.java rename to apis/sqs/src/main/java/org/jclouds/sqs/xml/AttributesHandler.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/xml/BatchErrorHandler.java b/apis/sqs/src/main/java/org/jclouds/sqs/xml/BatchErrorHandler.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/xml/BatchErrorHandler.java rename to apis/sqs/src/main/java/org/jclouds/sqs/xml/BatchErrorHandler.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/xml/BatchResponseHandler.java b/apis/sqs/src/main/java/org/jclouds/sqs/xml/BatchResponseHandler.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/xml/BatchResponseHandler.java rename to apis/sqs/src/main/java/org/jclouds/sqs/xml/BatchResponseHandler.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/xml/ChangeMessageVisibilityBatchResponseHandler.java b/apis/sqs/src/main/java/org/jclouds/sqs/xml/ChangeMessageVisibilityBatchResponseHandler.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/xml/ChangeMessageVisibilityBatchResponseHandler.java rename to apis/sqs/src/main/java/org/jclouds/sqs/xml/ChangeMessageVisibilityBatchResponseHandler.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/xml/DeleteMessageBatchResponseHandler.java b/apis/sqs/src/main/java/org/jclouds/sqs/xml/DeleteMessageBatchResponseHandler.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/xml/DeleteMessageBatchResponseHandler.java rename to apis/sqs/src/main/java/org/jclouds/sqs/xml/DeleteMessageBatchResponseHandler.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/xml/IdHandler.java b/apis/sqs/src/main/java/org/jclouds/sqs/xml/IdHandler.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/xml/IdHandler.java rename to apis/sqs/src/main/java/org/jclouds/sqs/xml/IdHandler.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/xml/MessageHandler.java b/apis/sqs/src/main/java/org/jclouds/sqs/xml/MessageHandler.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/xml/MessageHandler.java rename to apis/sqs/src/main/java/org/jclouds/sqs/xml/MessageHandler.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/xml/ReceiveMessageResponseHandler.java b/apis/sqs/src/main/java/org/jclouds/sqs/xml/ReceiveMessageResponseHandler.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/xml/ReceiveMessageResponseHandler.java rename to apis/sqs/src/main/java/org/jclouds/sqs/xml/ReceiveMessageResponseHandler.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/xml/RegexListQueuesResponseHandler.java b/apis/sqs/src/main/java/org/jclouds/sqs/xml/RegexListQueuesResponseHandler.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/xml/RegexListQueuesResponseHandler.java rename to apis/sqs/src/main/java/org/jclouds/sqs/xml/RegexListQueuesResponseHandler.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/xml/RegexMessageIdAndMD5Handler.java b/apis/sqs/src/main/java/org/jclouds/sqs/xml/RegexMessageIdAndMD5Handler.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/xml/RegexMessageIdAndMD5Handler.java rename to apis/sqs/src/main/java/org/jclouds/sqs/xml/RegexMessageIdAndMD5Handler.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/xml/RegexQueueHandler.java b/apis/sqs/src/main/java/org/jclouds/sqs/xml/RegexQueueHandler.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/xml/RegexQueueHandler.java rename to apis/sqs/src/main/java/org/jclouds/sqs/xml/RegexQueueHandler.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/xml/SendMessageBatchResponseHandler.java b/apis/sqs/src/main/java/org/jclouds/sqs/xml/SendMessageBatchResponseHandler.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/xml/SendMessageBatchResponseHandler.java rename to apis/sqs/src/main/java/org/jclouds/sqs/xml/SendMessageBatchResponseHandler.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/xml/SendMessageBatchResultEntryHandler.java b/apis/sqs/src/main/java/org/jclouds/sqs/xml/SendMessageBatchResultEntryHandler.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/xml/SendMessageBatchResultEntryHandler.java rename to apis/sqs/src/main/java/org/jclouds/sqs/xml/SendMessageBatchResultEntryHandler.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/xml/TextFromSingleElementHandler.java b/apis/sqs/src/main/java/org/jclouds/sqs/xml/TextFromSingleElementHandler.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/xml/TextFromSingleElementHandler.java rename to apis/sqs/src/main/java/org/jclouds/sqs/xml/TextFromSingleElementHandler.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/xml/ValueHandler.java b/apis/sqs/src/main/java/org/jclouds/sqs/xml/ValueHandler.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/xml/ValueHandler.java rename to apis/sqs/src/main/java/org/jclouds/sqs/xml/ValueHandler.java diff --git a/labs/sqs/src/main/java/org/jclouds/sqs/xml/internal/BaseRegexQueueHandler.java b/apis/sqs/src/main/java/org/jclouds/sqs/xml/internal/BaseRegexQueueHandler.java similarity index 100% rename from labs/sqs/src/main/java/org/jclouds/sqs/xml/internal/BaseRegexQueueHandler.java rename to apis/sqs/src/main/java/org/jclouds/sqs/xml/internal/BaseRegexQueueHandler.java diff --git a/labs/sqs/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/sqs/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata similarity index 100% rename from labs/sqs/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata rename to apis/sqs/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata diff --git a/labs/sqs/src/test/java/org/jclouds/sqs/SQSApiMetadataTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/SQSApiMetadataTest.java similarity index 100% rename from labs/sqs/src/test/java/org/jclouds/sqs/SQSApiMetadataTest.java rename to apis/sqs/src/test/java/org/jclouds/sqs/SQSApiMetadataTest.java diff --git a/labs/sqs/src/test/java/org/jclouds/sqs/features/BulkMessageApiLiveTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/features/BulkMessageApiLiveTest.java similarity index 100% rename from labs/sqs/src/test/java/org/jclouds/sqs/features/BulkMessageApiLiveTest.java rename to apis/sqs/src/test/java/org/jclouds/sqs/features/BulkMessageApiLiveTest.java diff --git a/labs/sqs/src/test/java/org/jclouds/sqs/features/MessageApiExpectTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/features/MessageApiExpectTest.java similarity index 100% rename from labs/sqs/src/test/java/org/jclouds/sqs/features/MessageApiExpectTest.java rename to apis/sqs/src/test/java/org/jclouds/sqs/features/MessageApiExpectTest.java diff --git a/labs/sqs/src/test/java/org/jclouds/sqs/features/MessageApiLiveTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/features/MessageApiLiveTest.java similarity index 100% rename from labs/sqs/src/test/java/org/jclouds/sqs/features/MessageApiLiveTest.java rename to apis/sqs/src/test/java/org/jclouds/sqs/features/MessageApiLiveTest.java diff --git a/labs/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiExpectTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiExpectTest.java similarity index 100% rename from labs/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiExpectTest.java rename to apis/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiExpectTest.java diff --git a/labs/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiLiveTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiLiveTest.java similarity index 100% rename from labs/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiLiveTest.java rename to apis/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiLiveTest.java diff --git a/labs/sqs/src/test/java/org/jclouds/sqs/features/QueueApiExpectTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/features/QueueApiExpectTest.java similarity index 100% rename from labs/sqs/src/test/java/org/jclouds/sqs/features/QueueApiExpectTest.java rename to apis/sqs/src/test/java/org/jclouds/sqs/features/QueueApiExpectTest.java diff --git a/labs/sqs/src/test/java/org/jclouds/sqs/features/QueueApiLiveTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/features/QueueApiLiveTest.java similarity index 100% rename from labs/sqs/src/test/java/org/jclouds/sqs/features/QueueApiLiveTest.java rename to apis/sqs/src/test/java/org/jclouds/sqs/features/QueueApiLiveTest.java diff --git a/labs/sqs/src/test/java/org/jclouds/sqs/functions/MapToQueueAttributesTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/functions/MapToQueueAttributesTest.java similarity index 100% rename from labs/sqs/src/test/java/org/jclouds/sqs/functions/MapToQueueAttributesTest.java rename to apis/sqs/src/test/java/org/jclouds/sqs/functions/MapToQueueAttributesTest.java diff --git a/labs/sqs/src/test/java/org/jclouds/sqs/handlers/SQSErrorRetryHandlerTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/handlers/SQSErrorRetryHandlerTest.java similarity index 100% rename from labs/sqs/src/test/java/org/jclouds/sqs/handlers/SQSErrorRetryHandlerTest.java rename to apis/sqs/src/test/java/org/jclouds/sqs/handlers/SQSErrorRetryHandlerTest.java diff --git a/labs/sqs/src/test/java/org/jclouds/sqs/internal/BaseSQSApiExpectTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/internal/BaseSQSApiExpectTest.java similarity index 100% rename from labs/sqs/src/test/java/org/jclouds/sqs/internal/BaseSQSApiExpectTest.java rename to apis/sqs/src/test/java/org/jclouds/sqs/internal/BaseSQSApiExpectTest.java diff --git a/labs/sqs/src/test/java/org/jclouds/sqs/internal/BaseSQSApiLiveTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/internal/BaseSQSApiLiveTest.java similarity index 100% rename from labs/sqs/src/test/java/org/jclouds/sqs/internal/BaseSQSApiLiveTest.java rename to apis/sqs/src/test/java/org/jclouds/sqs/internal/BaseSQSApiLiveTest.java diff --git a/labs/sqs/src/test/java/org/jclouds/sqs/internal/BaseSQSExpectTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/internal/BaseSQSExpectTest.java similarity index 100% rename from labs/sqs/src/test/java/org/jclouds/sqs/internal/BaseSQSExpectTest.java rename to apis/sqs/src/test/java/org/jclouds/sqs/internal/BaseSQSExpectTest.java diff --git a/labs/sqs/src/test/java/org/jclouds/sqs/options/CreateQueueOptionsTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/options/CreateQueueOptionsTest.java similarity index 100% rename from labs/sqs/src/test/java/org/jclouds/sqs/options/CreateQueueOptionsTest.java rename to apis/sqs/src/test/java/org/jclouds/sqs/options/CreateQueueOptionsTest.java diff --git a/labs/sqs/src/test/java/org/jclouds/sqs/options/ListQueuesOptionsTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/options/ListQueuesOptionsTest.java similarity index 100% rename from labs/sqs/src/test/java/org/jclouds/sqs/options/ListQueuesOptionsTest.java rename to apis/sqs/src/test/java/org/jclouds/sqs/options/ListQueuesOptionsTest.java diff --git a/labs/sqs/src/test/java/org/jclouds/sqs/options/ReceiveMessageOptionsTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/options/ReceiveMessageOptionsTest.java similarity index 100% rename from labs/sqs/src/test/java/org/jclouds/sqs/options/ReceiveMessageOptionsTest.java rename to apis/sqs/src/test/java/org/jclouds/sqs/options/ReceiveMessageOptionsTest.java diff --git a/labs/sqs/src/test/java/org/jclouds/sqs/options/SendMessageOptionsTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/options/SendMessageOptionsTest.java similarity index 100% rename from labs/sqs/src/test/java/org/jclouds/sqs/options/SendMessageOptionsTest.java rename to apis/sqs/src/test/java/org/jclouds/sqs/options/SendMessageOptionsTest.java diff --git a/labs/sqs/src/test/java/org/jclouds/sqs/parse/ChangeMessageVisibilityBatchResponseTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/parse/ChangeMessageVisibilityBatchResponseTest.java similarity index 100% rename from labs/sqs/src/test/java/org/jclouds/sqs/parse/ChangeMessageVisibilityBatchResponseTest.java rename to apis/sqs/src/test/java/org/jclouds/sqs/parse/ChangeMessageVisibilityBatchResponseTest.java diff --git a/labs/sqs/src/test/java/org/jclouds/sqs/parse/CreateQueueResponseTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/parse/CreateQueueResponseTest.java similarity index 100% rename from labs/sqs/src/test/java/org/jclouds/sqs/parse/CreateQueueResponseTest.java rename to apis/sqs/src/test/java/org/jclouds/sqs/parse/CreateQueueResponseTest.java diff --git a/labs/sqs/src/test/java/org/jclouds/sqs/parse/DeleteMessageBatchResponseTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/parse/DeleteMessageBatchResponseTest.java similarity index 100% rename from labs/sqs/src/test/java/org/jclouds/sqs/parse/DeleteMessageBatchResponseTest.java rename to apis/sqs/src/test/java/org/jclouds/sqs/parse/DeleteMessageBatchResponseTest.java diff --git a/labs/sqs/src/test/java/org/jclouds/sqs/parse/GetQueueAttributesResponseTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/parse/GetQueueAttributesResponseTest.java similarity index 100% rename from labs/sqs/src/test/java/org/jclouds/sqs/parse/GetQueueAttributesResponseTest.java rename to apis/sqs/src/test/java/org/jclouds/sqs/parse/GetQueueAttributesResponseTest.java diff --git a/labs/sqs/src/test/java/org/jclouds/sqs/parse/ReceiveMessageResponseTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/parse/ReceiveMessageResponseTest.java similarity index 100% rename from labs/sqs/src/test/java/org/jclouds/sqs/parse/ReceiveMessageResponseTest.java rename to apis/sqs/src/test/java/org/jclouds/sqs/parse/ReceiveMessageResponseTest.java diff --git a/labs/sqs/src/test/java/org/jclouds/sqs/parse/SendMessageBatchResponseTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/parse/SendMessageBatchResponseTest.java similarity index 100% rename from labs/sqs/src/test/java/org/jclouds/sqs/parse/SendMessageBatchResponseTest.java rename to apis/sqs/src/test/java/org/jclouds/sqs/parse/SendMessageBatchResponseTest.java diff --git a/labs/sqs/src/test/java/org/jclouds/sqs/parse/SendMessageResponseTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/parse/SendMessageResponseTest.java similarity index 100% rename from labs/sqs/src/test/java/org/jclouds/sqs/parse/SendMessageResponseTest.java rename to apis/sqs/src/test/java/org/jclouds/sqs/parse/SendMessageResponseTest.java diff --git a/labs/sqs/src/test/resources/attributes.xml b/apis/sqs/src/test/resources/attributes.xml similarity index 100% rename from labs/sqs/src/test/resources/attributes.xml rename to apis/sqs/src/test/resources/attributes.xml diff --git a/labs/sqs/src/test/resources/change_message_visibility_batch.xml b/apis/sqs/src/test/resources/change_message_visibility_batch.xml similarity index 100% rename from labs/sqs/src/test/resources/change_message_visibility_batch.xml rename to apis/sqs/src/test/resources/change_message_visibility_batch.xml diff --git a/labs/sqs/src/test/resources/create_queue.xml b/apis/sqs/src/test/resources/create_queue.xml similarity index 100% rename from labs/sqs/src/test/resources/create_queue.xml rename to apis/sqs/src/test/resources/create_queue.xml diff --git a/labs/sqs/src/test/resources/delete_message_batch.xml b/apis/sqs/src/test/resources/delete_message_batch.xml similarity index 100% rename from labs/sqs/src/test/resources/delete_message_batch.xml rename to apis/sqs/src/test/resources/delete_message_batch.xml diff --git a/labs/sqs/src/test/resources/list_queues.xml b/apis/sqs/src/test/resources/list_queues.xml similarity index 100% rename from labs/sqs/src/test/resources/list_queues.xml rename to apis/sqs/src/test/resources/list_queues.xml diff --git a/labs/sqs/src/test/resources/log4j.xml b/apis/sqs/src/test/resources/log4j.xml similarity index 100% rename from labs/sqs/src/test/resources/log4j.xml rename to apis/sqs/src/test/resources/log4j.xml diff --git a/labs/sqs/src/test/resources/messages.xml b/apis/sqs/src/test/resources/messages.xml similarity index 100% rename from labs/sqs/src/test/resources/messages.xml rename to apis/sqs/src/test/resources/messages.xml diff --git a/labs/sqs/src/test/resources/send_message.xml b/apis/sqs/src/test/resources/send_message.xml similarity index 100% rename from labs/sqs/src/test/resources/send_message.xml rename to apis/sqs/src/test/resources/send_message.xml diff --git a/labs/sqs/src/test/resources/send_message_batch.xml b/apis/sqs/src/test/resources/send_message_batch.xml similarity index 100% rename from labs/sqs/src/test/resources/send_message_batch.xml rename to apis/sqs/src/test/resources/send_message_batch.xml diff --git a/labs/pom.xml b/labs/pom.xml index c12e25c585..0ddb6ed9e2 100644 --- a/labs/pom.xml +++ b/labs/pom.xml @@ -61,7 +61,5 @@ fgcp fgcp-au fgcp-de - sqs - aws-sqs diff --git a/labs/aws-sqs/pom.xml b/providers/aws-sqs/pom.xml similarity index 97% rename from labs/aws-sqs/pom.xml rename to providers/aws-sqs/pom.xml index 9572ac5b42..233f329590 100644 --- a/labs/aws-sqs/pom.xml +++ b/providers/aws-sqs/pom.xml @@ -27,7 +27,7 @@ 1.5.0-SNAPSHOT ../../project/pom.xml - org.jclouds.labs + org.jclouds.provider aws-sqs jclouds Amazon Simple Queue Service provider Simple Queue Service implementation targeted to Amazon Web Services @@ -46,13 +46,13 @@ - org.jclouds.labs + org.jclouds.api sqs ${project.version} jar - org.jclouds.labs + org.jclouds.api sqs ${project.version} test-jar diff --git a/labs/aws-sqs/src/main/java/org/jclouds/aws/sqs/AWSSQSProviderMetadata.java b/providers/aws-sqs/src/main/java/org/jclouds/aws/sqs/AWSSQSProviderMetadata.java similarity index 100% rename from labs/aws-sqs/src/main/java/org/jclouds/aws/sqs/AWSSQSProviderMetadata.java rename to providers/aws-sqs/src/main/java/org/jclouds/aws/sqs/AWSSQSProviderMetadata.java diff --git a/labs/aws-sqs/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/aws-sqs/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata similarity index 100% rename from labs/aws-sqs/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata rename to providers/aws-sqs/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata diff --git a/labs/aws-sqs/src/test/java/org/jclouds/aws/sqs/AWSSQSProviderTest.java b/providers/aws-sqs/src/test/java/org/jclouds/aws/sqs/AWSSQSProviderTest.java similarity index 100% rename from labs/aws-sqs/src/test/java/org/jclouds/aws/sqs/AWSSQSProviderTest.java rename to providers/aws-sqs/src/test/java/org/jclouds/aws/sqs/AWSSQSProviderTest.java diff --git a/labs/aws-sqs/src/test/java/org/jclouds/aws/sqs/features/AWSMessageApiLiveTest.java b/providers/aws-sqs/src/test/java/org/jclouds/aws/sqs/features/AWSMessageApiLiveTest.java similarity index 100% rename from labs/aws-sqs/src/test/java/org/jclouds/aws/sqs/features/AWSMessageApiLiveTest.java rename to providers/aws-sqs/src/test/java/org/jclouds/aws/sqs/features/AWSMessageApiLiveTest.java diff --git a/labs/aws-sqs/src/test/java/org/jclouds/aws/sqs/features/AWSPermissionApiLiveTest.java b/providers/aws-sqs/src/test/java/org/jclouds/aws/sqs/features/AWSPermissionApiLiveTest.java similarity index 100% rename from labs/aws-sqs/src/test/java/org/jclouds/aws/sqs/features/AWSPermissionApiLiveTest.java rename to providers/aws-sqs/src/test/java/org/jclouds/aws/sqs/features/AWSPermissionApiLiveTest.java diff --git a/labs/aws-sqs/src/test/java/org/jclouds/aws/sqs/features/AWSQueueApiLiveTest.java b/providers/aws-sqs/src/test/java/org/jclouds/aws/sqs/features/AWSQueueApiLiveTest.java similarity index 100% rename from labs/aws-sqs/src/test/java/org/jclouds/aws/sqs/features/AWSQueueApiLiveTest.java rename to providers/aws-sqs/src/test/java/org/jclouds/aws/sqs/features/AWSQueueApiLiveTest.java diff --git a/providers/pom.xml b/providers/pom.xml index 53ca4767bf..5b1537c1d0 100644 --- a/providers/pom.xml +++ b/providers/pom.xml @@ -73,5 +73,6 @@ trystack-nova rackspace-cloudservers-us rackspace-cloudservers-uk + aws-sqs