Issue 116: consolidated azure modules

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

aws/demos/googleappengine/pom.xml

@@ -5,19 +5,20 @@
         <info@globalcloudspecialists.com>
 
         ====================================================================
-		Licensed to the Apache Software Foundation (ASF) under one or more
+        Licensed to the Apache Software Foundation (ASF) under one or
-		contributor license agreements. See the NOTICE file distributed with
+        more contributor license agreements. See the NOTICE file
-		this work for additional information regarding copyright ownership.
+        distributed with this work for additional information regarding
-		The ASF licenses this file to you under the Apache License, Version
+        copyright ownership. The ASF licenses this file to you under the
-		2.0 (the "License"); you may not use this file except in compliance
+        Apache License, Version 2.0 (the "License"); you may not use
-		with the License. You may obtain a copy of the License at
+        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
+        http://www.apache.org/licenses/LICENSE-2.0.html Unless required
-		applicable law or agreed to in writing, software distributed under the
+        by applicable law or agreed to in writing, software distributed
-		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+        under the License is distributed on an "AS IS" BASIS, WITHOUT
-		CONDITIONS OF ANY KIND, either express or implied. See the License for
+        WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-		the specific language governing permissions and limitations under the
+        See the License for the specific language governing permissions
-		License.
+        and limitations under the License.
         ====================================================================
     -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -48,7 +49,7 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-			<artifactId>jclouds-azureblob</artifactId>
+            <artifactId>jclouds-azure</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

azure/pom.xml

@@ -4,7 +4,7 @@
    $Revision$
    $Date$
 
-   Copyright (C) 2009 Adrian Cole <adrian@jclouds.org>
+   Copyright (C) 2009 Cloud Conscious, LLC. <info@cloudconscious.com>
 
    ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one
@@ -27,18 +27,31 @@
  -->
 <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-project</artifactId>
         <groupId>org.jclouds</groupId>
+        <artifactId>jclouds-project</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../project/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>jclouds-azure-project</artifactId>
+    <groupId>org.jclouds</groupId>
-    <packaging>pom</packaging>
+    <artifactId>jclouds-azure</artifactId>
-    <name>jclouds azure project</name>
+    <name>jclouds azure services core</name>
-    <modules>
+    <packaging>jar</packaging>
-        <module>storage</module>
+    <description>jclouds core components to access azure services</description>
-    </modules>
+
+   <properties>
+        <jclouds.test.user>${jclouds.azure.storage.account}</jclouds.test.user>
+        <jclouds.test.key>${jclouds.azure.storage.key}</jclouds.test.key>
+        <jclouds.test.initializer>org.jclouds.azure.storage.blob.blobstore.integration.AzureBlobTestInitializer</jclouds.test.initializer>
+    </properties>
+
+
+    <scm>
+        <connection>scm:svn:http://jclouds.googlecode.com/svn/trunk/azure</connection>
+        <developerConnection>scm:svn:https://jclouds.googlecode.com/svn/trunk/azure</developerConnection>
+        <url>http://jclouds.googlecode.com/svn/trunk/azure</url>
+    </scm>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

azure/src/test/java/org/jclouds/azure/storage/blob/xml/AccountNameEnumerationResultsHandlerTest.java

@@ -59,7 +59,7 @@ public class AccountNameEnumerationResultsHandlerTest extends BaseHandlerTest {
    }
 
    public void testApplyInputStream() {
-      InputStream is = getClass().getResourceAsStream("/test_list_containers.xml");
+      InputStream is = getClass().getResourceAsStream("/blob/test_list_containers.xml");
       SortedSet<ListableContainerProperties> contents = Sets.newTreeSet();
       contents.add(new ListableContainerPropertiesImpl(URI
                .create("http://myaccount.blob.core.windows.net/audio"), dateService
@@ -91,7 +91,7 @@ public class AccountNameEnumerationResultsHandlerTest extends BaseHandlerTest {
       contents.add(new ListableContainerPropertiesImpl(URI
                .create("http://myaccount.blob.core.windows.net/textfiles"), dateService
                .rfc822DateParse("Wed, 15 Aug 2008 20:39:39 GMT"), "0x8CACB9BD7BACAC3"));
-      InputStream is = getClass().getResourceAsStream("/test_list_containers_options.xml");
+      InputStream is = getClass().getResourceAsStream("/blob/test_list_containers_options.xml");
       BoundedSortedSet<ListableContainerProperties> list = new BoundedTreeSet<ListableContainerProperties>(
                contents, URI.create("http://myaccount.blob.core.windows.net"), "prefix", "marker",
                1, "video");

azure/src/test/java/org/jclouds/azure/storage/blob/xml/ContainerNameEnumerationResultsHandlerTest.java

@@ -58,7 +58,7 @@ public class ContainerNameEnumerationResultsHandlerTest extends BaseHandlerTest
    }
 
    public void testApplyInputStream() {
-      InputStream is = getClass().getResourceAsStream("/test_list_blobs.xml");
+      InputStream is = getClass().getResourceAsStream("/blob/test_list_blobs.xml");
       SortedSet<ListableBlobProperties> contents = Sets.newTreeSet();
       contents.add(new ListableBlobPropertiesImpl("blob1.txt", URI
                .create("http://myaccount.blob.core.windows.net/mycontainer/blob1.txt"), dateService