merged STS and aws-common, so that all aws apis can test support of temporary credentials

apis/cloudwatch/pom.xml

@@ -46,8 +46,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds.common</groupId>
+      <groupId>org.jclouds.api</groupId>
-      <artifactId>aws-common</artifactId>
+      <artifactId>sts</artifactId>
       <version>${project.version}</version>
       <type>jar</type>
     </dependency>

apis/ec2/pom.xml

@@ -54,8 +54,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds.common</groupId>
+      <groupId>org.jclouds.api</groupId>
-      <artifactId>aws-common</artifactId>
+      <artifactId>sts</artifactId>
       <version>${project.version}</version>
       <type>jar</type>
     </dependency>

apis/s3/pom.xml

@@ -51,8 +51,8 @@
       <version>0.4</version>
     </dependency>
     <dependency>
-      <groupId>org.jclouds.common</groupId>
+      <groupId>org.jclouds.api</groupId>
-      <artifactId>aws-common</artifactId>
+      <artifactId>sts</artifactId>
       <version>${project.version}</version>
       <type>jar</type>
     </dependency>

apis/sqs/pom.xml

@@ -46,8 +46,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds.common</groupId>
+            <groupId>org.jclouds.api</groupId>
-            <artifactId>aws-common</artifactId>
+            <artifactId>sts</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

apis/sts/pom.xml

@@ -40,14 +40,14 @@
     <test.sts.identity>${test.aws.identity}</test.sts.identity>
     <test.sts.credential>${test.aws.credential}</test.sts.credential>
 
-    <jclouds.osgi.export>org.jclouds.sts*;version="${project.version}"</jclouds.osgi.export>
+    <jclouds.osgi.export>org.jclouds.aws*;version="${project.version},org.jclouds.sts*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
   </properties>
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds.common</groupId>
+      <groupId>org.jclouds</groupId>
-      <artifactId>aws-common</artifactId>
+      <artifactId>jclouds-core</artifactId>
       <version>${project.version}</version>
       <type>jar</type>
     </dependency>

common/aws/README.txt

@@ -1,25 +0,0 @@
-====
-    Licensed to jclouds, Inc. (jclouds) under one or more
-    contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  jclouds licenses this file
-    to you 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.
-====
-
-#
-# The jclouds provider for Amazon Web Services (http://aws.amazon.com/).
-#
-# TODO: Implementation status.
-# TODO: Supported features.
-# TODO: Usage example.

common/aws/pom.xml

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to jclouds, Inc. (jclouds) under one or more
-    contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  jclouds licenses this file
-    to you 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.jclouds</groupId>
-        <artifactId>jclouds-project</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
-        <relativePath>../../project/pom.xml</relativePath>
-    </parent>
-    <groupId>org.jclouds.common</groupId>
-    <artifactId>aws-common</artifactId>
-    <name>jclouds Amazon AWS Components Core</name>
-    <description>jclouds Core components to access Amazon AWS</description>
-    <packaging>bundle</packaging>
-
-    <properties>
-        <jclouds.osgi.export>org.jclouds.aws*;version="${project.version}"</jclouds.osgi.export>
-        <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.jclouds</groupId>
-            <artifactId>jclouds-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jclouds</groupId>
-            <artifactId>jclouds-core</artifactId>
-            <version>${project.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>

common/aws/src/test/resources/log4j.xml

@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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>

common/pom.xml

@@ -33,7 +33,6 @@
     <name>jclouds commons project</name>
     <modules>
        <module>azure</module>
-       <module>aws</module>
        <module>openstack</module>
        <module>trmk</module>
     </modules>

labs/elb/pom.xml

@@ -53,8 +53,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds.common</groupId>
+            <groupId>org.jclouds.api</groupId>
-            <artifactId>aws-common</artifactId>
+            <artifactId>sts</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

labs/iam/pom.xml

@@ -46,8 +46,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds.common</groupId>
+      <groupId>org.jclouds.api</groupId>
-      <artifactId>aws-common</artifactId>
+      <artifactId>sts</artifactId>
       <version>${project.version}</version>
       <type>jar</type>
     </dependency>

labs/rds/pom.xml

@@ -46,8 +46,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds.common</groupId>
+            <groupId>org.jclouds.api</groupId>
-            <artifactId>aws-common</artifactId>
+            <artifactId>sts</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

labs/route53/pom.xml

@@ -46,8 +46,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jclouds.common</groupId>
+      <groupId>org.jclouds.api</groupId>
-      <artifactId>aws-common</artifactId>
+      <artifactId>sts</artifactId>
       <version>${project.version}</version>
       <type>jar</type>
     </dependency>

providers/aws-ec2/pom.xml

@@ -56,11 +56,6 @@
   </properties>
 
   <dependencies>
-    <dependency>
-      <groupId>org.jclouds.common</groupId>
-      <artifactId>aws-common</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.jclouds.api</groupId>
       <artifactId>ec2</artifactId>