promoted aws-sts to top-level

2013-01-22 08:56:39 -08:00 · 2013-01-22 08:56:39 -08:00 · 2a1bf88372
parent 7711ca0d60
commit 2a1bf88372
38 changed files with 11 additions and 6 deletions
--- a/all/pom.xml
+++ b/all/pom.xml
@ -60,6 +60,11 @@
            <artifactId>aws-sqs</artifactId>
            <version>${project.version}</version>
        </dependency>
+        <dependency>
+            <groupId>org.jclouds.provider</groupId>
+            <artifactId>aws-sts</artifactId>
+            <version>${project.version}</version>
+        </dependency>
        <dependency>
            <groupId>${project.groupId}</groupId>
            <artifactId>jclouds-allloadbalancer</artifactId>
--- a/apis/pom.xml
+++ b/apis/pom.xml
@ -52,5 +52,6 @@
       <module>cloudservers</module>
       <module>rackspace-cloudidentity</module>
       <module>rackspace-cloudloadbalancers</module>
+       <module>sts</module>
    </modules>
 </project>
--- a/apis/sts/pom.xml
+++ b/apis/sts/pom.xml
@ -27,7 +27,7 @@
    <version>1.6.0-SNAPSHOT</version>
    <relativePath>../../project/pom.xml</relativePath>
  </parent>
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.jclouds.api</groupId>
  <artifactId>sts</artifactId>
  <name>jcloud sts api</name>
  <description>jclouds components to access an implementation of Security Token Service (STS)</description>
--- a/apis/sts/src/main/java/org/jclouds/sts/STSApi.java
+++ b/apis/sts/src/main/java/org/jclouds/sts/STSApi.java
--- a/apis/sts/src/main/java/org/jclouds/sts/STSApiMetadata.java
+++ b/apis/sts/src/main/java/org/jclouds/sts/STSApiMetadata.java
--- a/apis/sts/src/main/java/org/jclouds/sts/STSAsyncApi.java
+++ b/apis/sts/src/main/java/org/jclouds/sts/STSAsyncApi.java
--- a/apis/sts/src/main/java/org/jclouds/sts/config/STSRestClientModule.java
+++ b/apis/sts/src/main/java/org/jclouds/sts/config/STSRestClientModule.java
--- a/apis/sts/src/main/java/org/jclouds/sts/domain/User.java
+++ b/apis/sts/src/main/java/org/jclouds/sts/domain/User.java
--- a/apis/sts/src/main/java/org/jclouds/sts/domain/UserAndTemporaryCredentials.java
+++ b/apis/sts/src/main/java/org/jclouds/sts/domain/UserAndTemporaryCredentials.java
--- a/apis/sts/src/main/java/org/jclouds/sts/options/AssumeRoleOptions.java
+++ b/apis/sts/src/main/java/org/jclouds/sts/options/AssumeRoleOptions.java
--- a/apis/sts/src/main/java/org/jclouds/sts/options/FederatedUserOptions.java
+++ b/apis/sts/src/main/java/org/jclouds/sts/options/FederatedUserOptions.java
--- a/apis/sts/src/main/java/org/jclouds/sts/options/TemporaryCredentialsOptions.java
+++ b/apis/sts/src/main/java/org/jclouds/sts/options/TemporaryCredentialsOptions.java
--- a/apis/sts/src/main/java/org/jclouds/sts/xml/UserAndTemporaryCredentialsHandler.java
+++ b/apis/sts/src/main/java/org/jclouds/sts/xml/UserAndTemporaryCredentialsHandler.java
--- a/apis/sts/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ b/apis/sts/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
--- a/apis/sts/src/test/java/org/jclouds/sts/STSApiExpectTest.java
+++ b/apis/sts/src/test/java/org/jclouds/sts/STSApiExpectTest.java
--- a/apis/sts/src/test/java/org/jclouds/sts/STSApiLiveTest.java
+++ b/apis/sts/src/test/java/org/jclouds/sts/STSApiLiveTest.java
--- a/apis/sts/src/test/java/org/jclouds/sts/STSApiMetadataTest.java
+++ b/apis/sts/src/test/java/org/jclouds/sts/STSApiMetadataTest.java
--- a/apis/sts/src/test/java/org/jclouds/sts/internal/BaseSTSApiExpectTest.java
+++ b/apis/sts/src/test/java/org/jclouds/sts/internal/BaseSTSApiExpectTest.java
--- a/apis/sts/src/test/java/org/jclouds/sts/internal/BaseSTSApiLiveTest.java
+++ b/apis/sts/src/test/java/org/jclouds/sts/internal/BaseSTSApiLiveTest.java
--- a/apis/sts/src/test/java/org/jclouds/sts/internal/BaseSTSAsyncApiExpectTest.java
+++ b/apis/sts/src/test/java/org/jclouds/sts/internal/BaseSTSAsyncApiExpectTest.java
--- a/apis/sts/src/test/java/org/jclouds/sts/internal/BaseSTSExpectTest.java
+++ b/apis/sts/src/test/java/org/jclouds/sts/internal/BaseSTSExpectTest.java
--- a/apis/sts/src/test/java/org/jclouds/sts/options/AssumeRoleOptionsTest.java
+++ b/apis/sts/src/test/java/org/jclouds/sts/options/AssumeRoleOptionsTest.java
--- a/apis/sts/src/test/java/org/jclouds/sts/options/FederatedUserOptionsTest.java
+++ b/apis/sts/src/test/java/org/jclouds/sts/options/FederatedUserOptionsTest.java
--- a/apis/sts/src/test/java/org/jclouds/sts/options/TemporaryCredentialsOptionsTest.java
+++ b/apis/sts/src/test/java/org/jclouds/sts/options/TemporaryCredentialsOptionsTest.java
--- a/apis/sts/src/test/java/org/jclouds/sts/parse/AssumeRoleResponseTest.java
+++ b/apis/sts/src/test/java/org/jclouds/sts/parse/AssumeRoleResponseTest.java
--- a/apis/sts/src/test/java/org/jclouds/sts/parse/GetFederationTokenResponseTest.java
+++ b/apis/sts/src/test/java/org/jclouds/sts/parse/GetFederationTokenResponseTest.java
--- a/apis/sts/src/test/java/org/jclouds/sts/parse/GetSessionTokenResponseTest.java
+++ b/apis/sts/src/test/java/org/jclouds/sts/parse/GetSessionTokenResponseTest.java
--- a/apis/sts/src/test/resources/assume_role.xml
+++ b/apis/sts/src/test/resources/assume_role.xml
--- a/apis/sts/src/test/resources/federation_token.xml
+++ b/apis/sts/src/test/resources/federation_token.xml
--- a/apis/sts/src/test/resources/log4j.xml
+++ b/apis/sts/src/test/resources/log4j.xml
--- a/apis/sts/src/test/resources/session_token.xml
+++ b/apis/sts/src/test/resources/session_token.xml
--- a/labs/pom.xml
+++ b/labs/pom.xml
@ -63,8 +63,6 @@
       <module>oauth</module>
       <module>openstack-quantum</module>
       <module>openstack-glance</module>
-       <module>sts</module>
-       <module>aws-sts</module>
       <module>route53</module>
       <module>aws-route53</module>
  </modules>
--- a/providers/aws-sts/pom.xml
+++ b/providers/aws-sts/pom.xml
@ -27,7 +27,7 @@
        <version>1.6.0-SNAPSHOT</version>
        <relativePath>../../project/pom.xml</relativePath>
    </parent>
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.jclouds.provider</groupId>
    <artifactId>aws-sts</artifactId>
    <name>jclouds Amazon Identity and Access Management (STS) provider</name>
    <description>Identity and Access Management (STS) to Amazon Web Services</description>
@ -46,13 +46,13 @@

    <dependencies>
        <dependency>
-            <groupId>org.jclouds.labs</groupId>
+            <groupId>org.jclouds.api</groupId>
            <artifactId>sts</artifactId>
            <version>${project.version}</version>
            <type>jar</type>
        </dependency>
        <dependency>
-            <groupId>org.jclouds.labs</groupId>
+            <groupId>org.jclouds.api</groupId>
            <artifactId>sts</artifactId>
            <version>${project.version}</version>
            <type>test-jar</type>
--- a/providers/aws-sts/src/main/java/org/jclouds/aws/sts/AWSSTSProviderMetadata.java
+++ b/providers/aws-sts/src/main/java/org/jclouds/aws/sts/AWSSTSProviderMetadata.java
--- a/providers/aws-sts/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ b/providers/aws-sts/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
--- a/providers/aws-sts/src/test/java/org/jclouds/aws/sts/AWSSTSApiLiveTest.java
+++ b/providers/aws-sts/src/test/java/org/jclouds/aws/sts/AWSSTSApiLiveTest.java
--- a/providers/aws-sts/src/test/java/org/jclouds/aws/sts/AWSSTSProviderTest.java
+++ b/providers/aws-sts/src/test/java/org/jclouds/aws/sts/AWSSTSProviderTest.java
--- a/providers/pom.xml
+++ b/providers/pom.xml
@ -73,5 +73,6 @@
        <module>rackspace-cloudblockstorage-us</module>
        <module>rackspace-cloudblockstorage-uk</module>
        <module>glesys</module>
+        <module>aws-sts</module>
    </modules>
 </project>