Issue 116: rolled up atmos

git-svn-id: http://jclouds.googlecode.com/svn/trunk@2253 3d8758e0-26b5-11de-8745-db77d3ebf521

atmos/pom.xml

@@ -33,12 +33,14 @@
         <relativePath>../project/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>jclouds-atmosonline-project</artifactId>
+    <artifactId>jclouds-atmos</artifactId>
-    <packaging>pom</packaging>
+    <packaging>jar</packaging>
-    <name>jclouds atmosonline project</name>
+    <name>jclouds atmosonline components</name>
-    <modules>
+    <properties>
-        <module>saas</module>
+        <jclouds.test.initializer>org.jclouds.atmosonline.saas.blobstore.integration.AtmosStorageTestInitializer</jclouds.test.initializer>
-    </modules>
+        <jclouds.test.user>${jclouds.emcsaas.uid}</jclouds.test.user>
+        <jclouds.test.key>${jclouds.emcsaas.key}</jclouds.test.key>
+    </properties>
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

atmosonline/saas/core/pom.xml

@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   $HeadURL$
-   $Revision$
-   $Date$
-
-   Copyright (C) 2009 Adrian Cole <adrian@jclouds.org>
-
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF 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.html 
-
-   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">
-    <parent>
-        <groupId>org.jclouds</groupId>
-        <artifactId>jclouds-emcsaas-project</artifactId>
-        <version>1.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.jclouds</groupId>
-    <artifactId>jclouds-emcsaas</artifactId>
-    <name>jclouds atmosonline storage service core</name>
-    <packaging>jar</packaging>
-    <description>jclouds Core components to access atmosonline saas</description>
-
-    <scm>
-        <connection>scm:svn:http://jclouds.googlecode.com/svn/trunk/mezo/saas/core</connection>
-        <developerConnection>scm:svn:https://jclouds.googlecode.com/svn/trunk/mezo/saas/core</developerConnection>
-        <url>http://jclouds.googlecode.com/svn/trunk/mezo/saas/core</url>
-    </scm>
-        <build>
-                <plugins>
-                        <plugin>
-                                <groupId>org.apache.maven.plugins</groupId>
-                                <artifactId>maven-surefire-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>integration</id>
-            <phase>integration-test</phase>
-            <goals>
-              <goal>test</goal>
-            </goals>
-            <configuration>
-              <threadCount>1</threadCount>
-            </configuration>
-          </execution>
-        </executions>
-                        </plugin>
-                </plugins>
-        </build>
-
-</project>

atmosonline/saas/pom.xml

@@ -1,60 +0,0 @@
-<!--
-   $HeadURL$
-   $Revision$
-   $Date$
-
-   Copyright (C) 2009 Adrian Cole <adrian@jclouds.org>
-
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF 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.html 
-
-   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">
-    <parent>
-        <artifactId>jclouds-atmosonline-project</artifactId>
-        <groupId>org.jclouds</groupId>
-        <version>1.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>jclouds-emcsaas-project</artifactId>
-    <packaging>pom</packaging>
-    <name>jclouds atmosonline storage service project</name>
-    <modules>
-        <module>core</module>
-    </modules>
-    <properties>
-        <jclouds.test.initializer>org.jclouds.atmosonline.saas.blobstore.integration.AtmosStorageTestInitializer</jclouds.test.initializer>
-        <jclouds.test.user>${jclouds.emcsaas.uid}</jclouds.test.user>
-        <jclouds.test.key>${jclouds.emcsaas.key}</jclouds.test.key>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>jclouds-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>jclouds-core</artifactId>
-            <version>${project.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-   </dependencies>
-</project>

aws/demos/googleappengine/pom.xml

@@ -54,7 +54,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jclouds-cloudfiles</artifactId>
+            <artifactId>jclouds-rackspace</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

demos/gae-tweetstore/pom.xml

@@ -67,7 +67,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jclouds-emcsaas</artifactId>
+            <artifactId>jclouds-atmos</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -82,7 +82,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jclouds-cloudfiles</artifactId>
+            <artifactId>jclouds-rackspace</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

pom.xml

@@ -47,7 +47,7 @@
         <module>mezeo</module>
         <module>nirvanix</module>
         <module>vcloud</module>
-        <module>atmosonline</module>
+        <module>atmos</module>
         <module>twitter</module>
     </modules>
     <build>