diff --git a/aws/demos/googleappengine/pom.xml b/aws/demos/googleappengine/pom.xml index 1a993e584c..46742be757 100644 --- a/aws/demos/googleappengine/pom.xml +++ b/aws/demos/googleappengine/pom.xml @@ -1,255 +1,256 @@ - + 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. + ==================================================================== + --> - - jclouds-aws-demos-project - org.jclouds - 1.0-SNAPSHOT - ../pom.xml - - 4.0.0 - jclouds-gae-s3-example - war - JClouds Sample for Google App Engine - JClouds Sample for Google App Engine + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + jclouds-aws-demos-project + org.jclouds + 1.0-SNAPSHOT + ../pom.xml + + 4.0.0 + jclouds-gae-s3-example + war + JClouds Sample for Google App Engine + JClouds Sample for Google App Engine - - - /Users/adriancole/Desktop/appengine-java-sdk-1.2.5 - jclouds-s3-example - localhost - 8088 - + + + /Users/adriancole/Desktop/appengine-java-sdk-1.2.5 + jclouds-s3-example + localhost + 8088 + - - - ${project.groupId} - jclouds-azureblob - ${project.version} - - - ${project.groupId} - jclouds-cloudfiles - ${project.version} - - - ${project.groupId} - jclouds-gae - ${project.version} - - - com.google.code.guice - guice-servlet - 2.1-r1089 - - - displaytag - displaytag - 1.2 - - - org.slf4j - slf4j-log4j12 - - - - - org.slf4j - slf4j-jdk14 - 1.5.6 - - - standard - taglibs - 1.1.2 - jar - runtime - - - jstl - javax.servlet - 1.1.2 - jar - compile - - - org.apache.geronimo.specs - geronimo-el_1.0_spec - 1.0.1 - compile - - - org.apache.geronimo.specs - geronimo-jsp_2.1_spec - 1.0.1 - provided - - - org.apache.geronimo.specs - geronimo-servlet_2.5_spec - 1.2 - provided - + + + ${project.groupId} + jclouds-azure + ${project.version} + + + ${project.groupId} + jclouds-cloudfiles + ${project.version} + + + ${project.groupId} + jclouds-gae + ${project.version} + + + com.google.code.guice + guice-servlet + 2.1-r1089 + + + displaytag + displaytag + 1.2 + + + org.slf4j + slf4j-log4j12 + + + + + org.slf4j + slf4j-jdk14 + 1.5.6 + + + standard + taglibs + 1.1.2 + jar + runtime + + + jstl + javax.servlet + 1.1.2 + jar + compile + + + org.apache.geronimo.specs + geronimo-el_1.0_spec + 1.0.1 + compile + + + org.apache.geronimo.specs + geronimo-jsp_2.1_spec + 1.0.1 + provided + + + org.apache.geronimo.specs + geronimo-servlet_2.5_spec + 1.2 + provided + - - com.google.appengine - appengine-tools-api - 1.2.5 - system - ${appengine.home}/lib/appengine-tools-api.jar - + + com.google.appengine + appengine-tools-api + 1.2.5 + system + ${appengine.home}/lib/appengine-tools-api.jar + - - - ${project.artifactId} - - - org.apache.maven.plugins - maven-war-plugin - - - - src/main/appengine - WEB-INF/ - true - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration - integration-test - - test - - - - - appengine.home - ${appengine.home} - - - devappserver.address - ${devappserver.address} - - - devappserver.port - ${devappserver.port} - - - warfile - ${project.build.directory}/${project.artifactId} - - - - ${appengine.home}/lib/appengine-tools-api.jar + + + ${project.artifactId} + + + org.apache.maven.plugins + maven-war-plugin + + + + src/main/appengine + WEB-INF/ + true + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + integration + integration-test + + test + + + + + appengine.home + ${appengine.home} + + + devappserver.address + ${devappserver.address} + + + devappserver.port + ${devappserver.port} + + + warfile + ${project.build.directory}/${project.artifactId} + + + + ${appengine.home}/lib/appengine-tools-api.jar - - - true - ${appengine.home}/bin - ${appengine.home}/lib - ${appengine.home}/config/sdk - - - - - - - + + + true + ${appengine.home}/bin + ${appengine.home}/lib + ${appengine.home}/config/sdk + + + + + + + - - - live - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration - integration-test - - test - - - - - jclouds.azure.storage.account - ${jclouds.azure.storage.account} - - - jclouds.azure.storage.key - ${jclouds.azure.storage.key} - - - jclouds.rackspace.user - ${jclouds.rackspace.user} - - - jclouds.rackspace.key - ${jclouds.rackspace.key} - - - jclouds.aws.accesskeyid - ${jclouds.aws.accesskeyid} - - - jclouds.aws.secretaccesskey - ${jclouds.aws.secretaccesskey} - - - appengine.home - ${appengine.home} - - - devappserver.address - ${devappserver.address} - - - devappserver.port - ${devappserver.port} - - - warfile - ${project.build.directory}/${project.artifactId} - - - - - - - - - - + + + live + + + + org.apache.maven.plugins + maven-surefire-plugin + + + integration + integration-test + + test + + + + + jclouds.azure.storage.account + ${jclouds.azure.storage.account} + + + jclouds.azure.storage.key + ${jclouds.azure.storage.key} + + + jclouds.rackspace.user + ${jclouds.rackspace.user} + + + jclouds.rackspace.key + ${jclouds.rackspace.key} + + + jclouds.aws.accesskeyid + ${jclouds.aws.accesskeyid} + + + jclouds.aws.secretaccesskey + ${jclouds.aws.secretaccesskey} + + + appengine.home + ${appengine.home} + + + devappserver.address + ${devappserver.address} + + + devappserver.port + ${devappserver.port} + + + warfile + ${project.build.directory}/${project.artifactId} + + + + + + + + + + diff --git a/azure/pom.xml b/azure/pom.xml index baf2f65307..9c92660778 100644 --- a/azure/pom.xml +++ b/azure/pom.xml @@ -4,7 +4,7 @@ $Revision$ $Date$ - Copyright (C) 2009 Adrian Cole + Copyright (C) 2009 Cloud Conscious, LLC. ==================================================================== Licensed to the Apache Software Foundation (ASF) under one @@ -27,18 +27,31 @@ --> - jclouds-project org.jclouds + jclouds-project 1.0-SNAPSHOT ../project/pom.xml 4.0.0 - jclouds-azure-project - pom - jclouds azure project - - storage - + org.jclouds + jclouds-azure + jclouds azure services core + jar + jclouds core components to access azure services + + + ${jclouds.azure.storage.account} + ${jclouds.azure.storage.key} + org.jclouds.azure.storage.blob.blobstore.integration.AzureBlobTestInitializer + + + + + scm:svn:http://jclouds.googlecode.com/svn/trunk/azure + scm:svn:https://jclouds.googlecode.com/svn/trunk/azure + http://jclouds.googlecode.com/svn/trunk/azure + + ${project.groupId} @@ -53,10 +66,10 @@ test - log4j - log4j - 1.2.14 - test + log4j + log4j + 1.2.14 + test ${project.groupId} diff --git a/azure/storage/core/src/main/java/org/jclouds/azure/storage/AzureBlob.java b/azure/src/main/java/org/jclouds/azure/storage/AzureBlob.java similarity index 100% rename from azure/storage/core/src/main/java/org/jclouds/azure/storage/AzureBlob.java rename to azure/src/main/java/org/jclouds/azure/storage/AzureBlob.java diff --git a/azure/storage/core/src/main/java/org/jclouds/azure/storage/AzureQueue.java b/azure/src/main/java/org/jclouds/azure/storage/AzureQueue.java similarity index 100% rename from azure/storage/core/src/main/java/org/jclouds/azure/storage/AzureQueue.java rename to azure/src/main/java/org/jclouds/azure/storage/AzureQueue.java diff --git a/azure/storage/core/src/main/java/org/jclouds/azure/storage/AzureStorageResponseException.java b/azure/src/main/java/org/jclouds/azure/storage/AzureStorageResponseException.java similarity index 100% rename from azure/storage/core/src/main/java/org/jclouds/azure/storage/AzureStorageResponseException.java rename to azure/src/main/java/org/jclouds/azure/storage/AzureStorageResponseException.java diff --git a/azure/storage/core/src/main/java/org/jclouds/azure/storage/AzureTable.java b/azure/src/main/java/org/jclouds/azure/storage/AzureTable.java similarity index 100% rename from azure/storage/core/src/main/java/org/jclouds/azure/storage/AzureTable.java rename to azure/src/main/java/org/jclouds/azure/storage/AzureTable.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/AzureBlobClient.java b/azure/src/main/java/org/jclouds/azure/storage/blob/AzureBlobClient.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/AzureBlobClient.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/AzureBlobClient.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/AzureBlobContextBuilder.java b/azure/src/main/java/org/jclouds/azure/storage/blob/AzureBlobContextBuilder.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/AzureBlobContextBuilder.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/AzureBlobContextBuilder.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/AzureBlobContextFactory.java b/azure/src/main/java/org/jclouds/azure/storage/blob/AzureBlobContextFactory.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/AzureBlobContextFactory.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/AzureBlobContextFactory.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/AzureBlobPropertiesBuilder.java b/azure/src/main/java/org/jclouds/azure/storage/blob/AzureBlobPropertiesBuilder.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/AzureBlobPropertiesBuilder.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/AzureBlobPropertiesBuilder.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/AzureBlobUtil.java b/azure/src/main/java/org/jclouds/azure/storage/blob/AzureBlobUtil.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/AzureBlobUtil.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/AzureBlobUtil.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/binders/BindAzureBlobToEntity.java b/azure/src/main/java/org/jclouds/azure/storage/blob/binders/BindAzureBlobToEntity.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/binders/BindAzureBlobToEntity.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/binders/BindAzureBlobToEntity.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/blobstore/AzureBlobStore.java b/azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/AzureBlobStore.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/blobstore/AzureBlobStore.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/AzureBlobStore.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/blobstore/AzureBlobStoreContextBuilder.java b/azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/AzureBlobStoreContextBuilder.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/blobstore/AzureBlobStoreContextBuilder.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/AzureBlobStoreContextBuilder.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/blobstore/AzureBlobStoreContextFactory.java b/azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/AzureBlobStoreContextFactory.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/blobstore/AzureBlobStoreContextFactory.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/AzureBlobStoreContextFactory.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/blobstore/config/AzureBlobStoreContextModule.java b/azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/config/AzureBlobStoreContextModule.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/blobstore/config/AzureBlobStoreContextModule.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/config/AzureBlobStoreContextModule.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/AzureBlobToBlob.java b/azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/AzureBlobToBlob.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/AzureBlobToBlob.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/AzureBlobToBlob.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/BlobMetadataToBlobProperties.java b/azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/BlobMetadataToBlobProperties.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/BlobMetadataToBlobProperties.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/BlobMetadataToBlobProperties.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/BlobPropertiesToBlobMetadata.java b/azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/BlobPropertiesToBlobMetadata.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/BlobPropertiesToBlobMetadata.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/BlobPropertiesToBlobMetadata.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/BlobToAzureBlob.java b/azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/BlobToAzureBlob.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/BlobToAzureBlob.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/BlobToAzureBlob.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/CommonPrefixesToResourceMetadata.java b/azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/CommonPrefixesToResourceMetadata.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/CommonPrefixesToResourceMetadata.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/CommonPrefixesToResourceMetadata.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/ContainerToResourceMetadata.java b/azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/ContainerToResourceMetadata.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/ContainerToResourceMetadata.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/ContainerToResourceMetadata.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/ListBlobsOptionsToListOptions.java b/azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/ListBlobsOptionsToListOptions.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/ListBlobsOptionsToListOptions.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/ListBlobsOptionsToListOptions.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/ListBlobsResponseToResourceList.java b/azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/ListBlobsResponseToResourceList.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/ListBlobsResponseToResourceList.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/ListBlobsResponseToResourceList.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/ListOptionsToListBlobsOptions.java b/azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/ListOptionsToListBlobsOptions.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/ListOptionsToListBlobsOptions.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/ListOptionsToListBlobsOptions.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/ListableBlobPropertiesToBlobMetadata.java b/azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/ListableBlobPropertiesToBlobMetadata.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/ListableBlobPropertiesToBlobMetadata.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/ListableBlobPropertiesToBlobMetadata.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/ResourceToListBlobsResponse.java b/azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/ResourceToListBlobsResponse.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/ResourceToListBlobsResponse.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/functions/ResourceToListBlobsResponse.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/blobstore/strategy/FindMD5InBlobProperties.java b/azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/strategy/FindMD5InBlobProperties.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/blobstore/strategy/FindMD5InBlobProperties.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/blobstore/strategy/FindMD5InBlobProperties.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/config/AzureBlobContextModule.java b/azure/src/main/java/org/jclouds/azure/storage/blob/config/AzureBlobContextModule.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/config/AzureBlobContextModule.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/config/AzureBlobContextModule.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/config/AzureBlobModule.java b/azure/src/main/java/org/jclouds/azure/storage/blob/config/AzureBlobModule.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/config/AzureBlobModule.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/config/AzureBlobModule.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/config/AzureBlobRestClientModule.java b/azure/src/main/java/org/jclouds/azure/storage/blob/config/AzureBlobRestClientModule.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/config/AzureBlobRestClientModule.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/config/AzureBlobRestClientModule.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/AzureBlob.java b/azure/src/main/java/org/jclouds/azure/storage/blob/domain/AzureBlob.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/AzureBlob.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/domain/AzureBlob.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/BlobProperties.java b/azure/src/main/java/org/jclouds/azure/storage/blob/domain/BlobProperties.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/BlobProperties.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/domain/BlobProperties.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/ContainerProperties.java b/azure/src/main/java/org/jclouds/azure/storage/blob/domain/ContainerProperties.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/ContainerProperties.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/domain/ContainerProperties.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/ListBlobsResponse.java b/azure/src/main/java/org/jclouds/azure/storage/blob/domain/ListBlobsResponse.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/ListBlobsResponse.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/domain/ListBlobsResponse.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/ListableBlobProperties.java b/azure/src/main/java/org/jclouds/azure/storage/blob/domain/ListableBlobProperties.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/ListableBlobProperties.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/domain/ListableBlobProperties.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/ListableContainerProperties.java b/azure/src/main/java/org/jclouds/azure/storage/blob/domain/ListableContainerProperties.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/ListableContainerProperties.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/domain/ListableContainerProperties.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/MutableBlobProperties.java b/azure/src/main/java/org/jclouds/azure/storage/blob/domain/MutableBlobProperties.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/MutableBlobProperties.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/domain/MutableBlobProperties.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/MutableContainerPropertiesWithMetadata.java b/azure/src/main/java/org/jclouds/azure/storage/blob/domain/MutableContainerPropertiesWithMetadata.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/MutableContainerPropertiesWithMetadata.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/domain/MutableContainerPropertiesWithMetadata.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/internal/AzureBlobImpl.java b/azure/src/main/java/org/jclouds/azure/storage/blob/domain/internal/AzureBlobImpl.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/internal/AzureBlobImpl.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/domain/internal/AzureBlobImpl.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/internal/ListableBlobPropertiesImpl.java b/azure/src/main/java/org/jclouds/azure/storage/blob/domain/internal/ListableBlobPropertiesImpl.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/internal/ListableBlobPropertiesImpl.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/domain/internal/ListableBlobPropertiesImpl.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/internal/ListableContainerPropertiesImpl.java b/azure/src/main/java/org/jclouds/azure/storage/blob/domain/internal/ListableContainerPropertiesImpl.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/internal/ListableContainerPropertiesImpl.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/domain/internal/ListableContainerPropertiesImpl.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/internal/MutableBlobPropertiesImpl.java b/azure/src/main/java/org/jclouds/azure/storage/blob/domain/internal/MutableBlobPropertiesImpl.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/internal/MutableBlobPropertiesImpl.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/domain/internal/MutableBlobPropertiesImpl.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/internal/MutableContainerPropertiesWithMetadataImpl.java b/azure/src/main/java/org/jclouds/azure/storage/blob/domain/internal/MutableContainerPropertiesWithMetadataImpl.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/internal/MutableContainerPropertiesWithMetadataImpl.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/domain/internal/MutableContainerPropertiesWithMetadataImpl.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/internal/TreeSetListBlobsResponse.java b/azure/src/main/java/org/jclouds/azure/storage/blob/domain/internal/TreeSetListBlobsResponse.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/domain/internal/TreeSetListBlobsResponse.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/domain/internal/TreeSetListBlobsResponse.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/functions/BlobName.java b/azure/src/main/java/org/jclouds/azure/storage/blob/functions/BlobName.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/functions/BlobName.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/functions/BlobName.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/functions/ParseBlobFromHeadersAndHttpContent.java b/azure/src/main/java/org/jclouds/azure/storage/blob/functions/ParseBlobFromHeadersAndHttpContent.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/functions/ParseBlobFromHeadersAndHttpContent.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/functions/ParseBlobFromHeadersAndHttpContent.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/functions/ParseBlobPropertiesFromHeaders.java b/azure/src/main/java/org/jclouds/azure/storage/blob/functions/ParseBlobPropertiesFromHeaders.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/functions/ParseBlobPropertiesFromHeaders.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/functions/ParseBlobPropertiesFromHeaders.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/functions/ParseContainerPropertiesFromHeaders.java b/azure/src/main/java/org/jclouds/azure/storage/blob/functions/ParseContainerPropertiesFromHeaders.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/functions/ParseContainerPropertiesFromHeaders.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/functions/ParseContainerPropertiesFromHeaders.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/functions/ReturnTrueIfContainerAlreadyExists.java b/azure/src/main/java/org/jclouds/azure/storage/blob/functions/ReturnTrueIfContainerAlreadyExists.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/functions/ReturnTrueIfContainerAlreadyExists.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/functions/ReturnTrueIfContainerAlreadyExists.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/handlers/AzureBlobClientErrorRetryHandler.java b/azure/src/main/java/org/jclouds/azure/storage/blob/handlers/AzureBlobClientErrorRetryHandler.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/handlers/AzureBlobClientErrorRetryHandler.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/handlers/AzureBlobClientErrorRetryHandler.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/options/CreateContainerOptions.java b/azure/src/main/java/org/jclouds/azure/storage/blob/options/CreateContainerOptions.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/options/CreateContainerOptions.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/options/CreateContainerOptions.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/options/ListBlobsOptions.java b/azure/src/main/java/org/jclouds/azure/storage/blob/options/ListBlobsOptions.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/options/ListBlobsOptions.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/options/ListBlobsOptions.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/reference/AzureBlobConstants.java b/azure/src/main/java/org/jclouds/azure/storage/blob/reference/AzureBlobConstants.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/reference/AzureBlobConstants.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/reference/AzureBlobConstants.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/xml/AccountNameEnumerationResultsHandler.java b/azure/src/main/java/org/jclouds/azure/storage/blob/xml/AccountNameEnumerationResultsHandler.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/xml/AccountNameEnumerationResultsHandler.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/xml/AccountNameEnumerationResultsHandler.java diff --git a/azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/xml/ContainerNameEnumerationResultsHandler.java b/azure/src/main/java/org/jclouds/azure/storage/blob/xml/ContainerNameEnumerationResultsHandler.java similarity index 100% rename from azure/storage/blob/core/src/main/java/org/jclouds/azure/storage/blob/xml/ContainerNameEnumerationResultsHandler.java rename to azure/src/main/java/org/jclouds/azure/storage/blob/xml/ContainerNameEnumerationResultsHandler.java diff --git a/azure/storage/core/src/main/java/org/jclouds/azure/storage/config/AzureStorageRestClientModule.java b/azure/src/main/java/org/jclouds/azure/storage/config/AzureStorageRestClientModule.java similarity index 100% rename from azure/storage/core/src/main/java/org/jclouds/azure/storage/config/AzureStorageRestClientModule.java rename to azure/src/main/java/org/jclouds/azure/storage/config/AzureStorageRestClientModule.java diff --git a/azure/storage/core/src/main/java/org/jclouds/azure/storage/domain/AzureStorageError.java b/azure/src/main/java/org/jclouds/azure/storage/domain/AzureStorageError.java similarity index 100% rename from azure/storage/core/src/main/java/org/jclouds/azure/storage/domain/AzureStorageError.java rename to azure/src/main/java/org/jclouds/azure/storage/domain/AzureStorageError.java diff --git a/azure/storage/core/src/main/java/org/jclouds/azure/storage/domain/BoundedSortedSet.java b/azure/src/main/java/org/jclouds/azure/storage/domain/BoundedSortedSet.java similarity index 100% rename from azure/storage/core/src/main/java/org/jclouds/azure/storage/domain/BoundedSortedSet.java rename to azure/src/main/java/org/jclouds/azure/storage/domain/BoundedSortedSet.java diff --git a/azure/storage/core/src/main/java/org/jclouds/azure/storage/domain/internal/BoundedTreeSet.java b/azure/src/main/java/org/jclouds/azure/storage/domain/internal/BoundedTreeSet.java similarity index 100% rename from azure/storage/core/src/main/java/org/jclouds/azure/storage/domain/internal/BoundedTreeSet.java rename to azure/src/main/java/org/jclouds/azure/storage/domain/internal/BoundedTreeSet.java diff --git a/azure/storage/core/src/main/java/org/jclouds/azure/storage/filters/SharedKeyAuthentication.java b/azure/src/main/java/org/jclouds/azure/storage/filters/SharedKeyAuthentication.java similarity index 100% rename from azure/storage/core/src/main/java/org/jclouds/azure/storage/filters/SharedKeyAuthentication.java rename to azure/src/main/java/org/jclouds/azure/storage/filters/SharedKeyAuthentication.java diff --git a/azure/storage/core/src/main/java/org/jclouds/azure/storage/handlers/ParseAzureStorageErrorFromXmlContent.java b/azure/src/main/java/org/jclouds/azure/storage/handlers/ParseAzureStorageErrorFromXmlContent.java similarity index 100% rename from azure/storage/core/src/main/java/org/jclouds/azure/storage/handlers/ParseAzureStorageErrorFromXmlContent.java rename to azure/src/main/java/org/jclouds/azure/storage/handlers/ParseAzureStorageErrorFromXmlContent.java diff --git a/azure/storage/core/src/main/java/org/jclouds/azure/storage/options/CreateOptions.java b/azure/src/main/java/org/jclouds/azure/storage/options/CreateOptions.java similarity index 100% rename from azure/storage/core/src/main/java/org/jclouds/azure/storage/options/CreateOptions.java rename to azure/src/main/java/org/jclouds/azure/storage/options/CreateOptions.java diff --git a/azure/storage/core/src/main/java/org/jclouds/azure/storage/options/ListOptions.java b/azure/src/main/java/org/jclouds/azure/storage/options/ListOptions.java similarity index 100% rename from azure/storage/core/src/main/java/org/jclouds/azure/storage/options/ListOptions.java rename to azure/src/main/java/org/jclouds/azure/storage/options/ListOptions.java diff --git a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/AzureQueueClient.java b/azure/src/main/java/org/jclouds/azure/storage/queue/AzureQueueClient.java similarity index 100% rename from azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/AzureQueueClient.java rename to azure/src/main/java/org/jclouds/azure/storage/queue/AzureQueueClient.java diff --git a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/AzureQueueContextBuilder.java b/azure/src/main/java/org/jclouds/azure/storage/queue/AzureQueueContextBuilder.java similarity index 100% rename from azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/AzureQueueContextBuilder.java rename to azure/src/main/java/org/jclouds/azure/storage/queue/AzureQueueContextBuilder.java diff --git a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/AzureQueueContextFactory.java b/azure/src/main/java/org/jclouds/azure/storage/queue/AzureQueueContextFactory.java similarity index 100% rename from azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/AzureQueueContextFactory.java rename to azure/src/main/java/org/jclouds/azure/storage/queue/AzureQueueContextFactory.java diff --git a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/AzureQueuePropertiesBuilder.java b/azure/src/main/java/org/jclouds/azure/storage/queue/AzureQueuePropertiesBuilder.java similarity index 100% rename from azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/AzureQueuePropertiesBuilder.java rename to azure/src/main/java/org/jclouds/azure/storage/queue/AzureQueuePropertiesBuilder.java diff --git a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/config/AzureQueueContextModule.java b/azure/src/main/java/org/jclouds/azure/storage/queue/config/AzureQueueContextModule.java similarity index 100% rename from azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/config/AzureQueueContextModule.java rename to azure/src/main/java/org/jclouds/azure/storage/queue/config/AzureQueueContextModule.java diff --git a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/config/AzureQueueRestClientModule.java b/azure/src/main/java/org/jclouds/azure/storage/queue/config/AzureQueueRestClientModule.java similarity index 100% rename from azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/config/AzureQueueRestClientModule.java rename to azure/src/main/java/org/jclouds/azure/storage/queue/config/AzureQueueRestClientModule.java diff --git a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/domain/QueueMetadata.java b/azure/src/main/java/org/jclouds/azure/storage/queue/domain/QueueMetadata.java similarity index 100% rename from azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/domain/QueueMetadata.java rename to azure/src/main/java/org/jclouds/azure/storage/queue/domain/QueueMetadata.java diff --git a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/reference/AzureQueueConstants.java b/azure/src/main/java/org/jclouds/azure/storage/queue/reference/AzureQueueConstants.java similarity index 100% rename from azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/reference/AzureQueueConstants.java rename to azure/src/main/java/org/jclouds/azure/storage/queue/reference/AzureQueueConstants.java diff --git a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/xml/AccountNameEnumerationResultsHandler.java b/azure/src/main/java/org/jclouds/azure/storage/queue/xml/AccountNameEnumerationResultsHandler.java similarity index 100% rename from azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/xml/AccountNameEnumerationResultsHandler.java rename to azure/src/main/java/org/jclouds/azure/storage/queue/xml/AccountNameEnumerationResultsHandler.java diff --git a/azure/storage/core/src/main/java/org/jclouds/azure/storage/reference/AzureStorageConstants.java b/azure/src/main/java/org/jclouds/azure/storage/reference/AzureStorageConstants.java similarity index 100% rename from azure/storage/core/src/main/java/org/jclouds/azure/storage/reference/AzureStorageConstants.java rename to azure/src/main/java/org/jclouds/azure/storage/reference/AzureStorageConstants.java diff --git a/azure/storage/core/src/main/java/org/jclouds/azure/storage/reference/AzureStorageHeaders.java b/azure/src/main/java/org/jclouds/azure/storage/reference/AzureStorageHeaders.java similarity index 100% rename from azure/storage/core/src/main/java/org/jclouds/azure/storage/reference/AzureStorageHeaders.java rename to azure/src/main/java/org/jclouds/azure/storage/reference/AzureStorageHeaders.java diff --git a/azure/storage/core/src/main/java/org/jclouds/azure/storage/util/AzureStorageUtils.java b/azure/src/main/java/org/jclouds/azure/storage/util/AzureStorageUtils.java similarity index 100% rename from azure/storage/core/src/main/java/org/jclouds/azure/storage/util/AzureStorageUtils.java rename to azure/src/main/java/org/jclouds/azure/storage/util/AzureStorageUtils.java diff --git a/azure/storage/core/src/main/java/org/jclouds/azure/storage/xml/ErrorHandler.java b/azure/src/main/java/org/jclouds/azure/storage/xml/ErrorHandler.java similarity index 100% rename from azure/storage/core/src/main/java/org/jclouds/azure/storage/xml/ErrorHandler.java rename to azure/src/main/java/org/jclouds/azure/storage/xml/ErrorHandler.java diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/AzureBlobClientLiveTest.java b/azure/src/test/java/org/jclouds/azure/storage/blob/AzureBlobClientLiveTest.java similarity index 100% rename from azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/AzureBlobClientLiveTest.java rename to azure/src/test/java/org/jclouds/azure/storage/blob/AzureBlobClientLiveTest.java diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/AzureBlobClientTest.java b/azure/src/test/java/org/jclouds/azure/storage/blob/AzureBlobClientTest.java similarity index 100% rename from azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/AzureBlobClientTest.java rename to azure/src/test/java/org/jclouds/azure/storage/blob/AzureBlobClientTest.java diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/AzureBlobContextBuilderTest.java b/azure/src/test/java/org/jclouds/azure/storage/blob/AzureBlobContextBuilderTest.java similarity index 100% rename from azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/AzureBlobContextBuilderTest.java rename to azure/src/test/java/org/jclouds/azure/storage/blob/AzureBlobContextBuilderTest.java diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/blobstore/AzureBlobStoreContextBuilderTest.java b/azure/src/test/java/org/jclouds/azure/storage/blob/blobstore/AzureBlobStoreContextBuilderTest.java similarity index 100% rename from azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/blobstore/AzureBlobStoreContextBuilderTest.java rename to azure/src/test/java/org/jclouds/azure/storage/blob/blobstore/AzureBlobStoreContextBuilderTest.java diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/blobstore/config/AzureBlobStoreModuleTest.java b/azure/src/test/java/org/jclouds/azure/storage/blob/blobstore/config/AzureBlobStoreModuleTest.java similarity index 100% rename from azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/blobstore/config/AzureBlobStoreModuleTest.java rename to azure/src/test/java/org/jclouds/azure/storage/blob/blobstore/config/AzureBlobStoreModuleTest.java diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobContainerIntegrationTest.java b/azure/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobContainerIntegrationTest.java similarity index 100% rename from azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobContainerIntegrationTest.java rename to azure/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobContainerIntegrationTest.java diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobContainerLiveTest.java b/azure/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobContainerLiveTest.java similarity index 100% rename from azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobContainerLiveTest.java rename to azure/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobContainerLiveTest.java diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobInputStreamMapIntegrationTest.java b/azure/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobInputStreamMapIntegrationTest.java similarity index 100% rename from azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobInputStreamMapIntegrationTest.java rename to azure/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobInputStreamMapIntegrationTest.java diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobIntegrationTest.java b/azure/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobIntegrationTest.java similarity index 100% rename from azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobIntegrationTest.java rename to azure/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobIntegrationTest.java diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobLiveTest.java b/azure/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobLiveTest.java similarity index 100% rename from azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobLiveTest.java rename to azure/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobLiveTest.java diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobMapIntegrationTest.java b/azure/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobMapIntegrationTest.java similarity index 100% rename from azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobMapIntegrationTest.java rename to azure/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobMapIntegrationTest.java diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobServiceIntegrationTest.java b/azure/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobServiceIntegrationTest.java similarity index 100% rename from azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobServiceIntegrationTest.java rename to azure/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobServiceIntegrationTest.java diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobTestInitializer.java b/azure/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobTestInitializer.java similarity index 100% rename from azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobTestInitializer.java rename to azure/src/test/java/org/jclouds/azure/storage/blob/blobstore/integration/AzureBlobTestInitializer.java diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/config/AzureBlobContextModuleTest.java b/azure/src/test/java/org/jclouds/azure/storage/blob/config/AzureBlobContextModuleTest.java similarity index 100% rename from azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/config/AzureBlobContextModuleTest.java rename to azure/src/test/java/org/jclouds/azure/storage/blob/config/AzureBlobContextModuleTest.java diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/config/AzureBlobStubClientModule.java b/azure/src/test/java/org/jclouds/azure/storage/blob/config/AzureBlobStubClientModule.java similarity index 100% rename from azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/config/AzureBlobStubClientModule.java rename to azure/src/test/java/org/jclouds/azure/storage/blob/config/AzureBlobStubClientModule.java diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/config/RestAzureBlobClientModuleTest.java b/azure/src/test/java/org/jclouds/azure/storage/blob/config/RestAzureBlobClientModuleTest.java similarity index 100% rename from azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/config/RestAzureBlobClientModuleTest.java rename to azure/src/test/java/org/jclouds/azure/storage/blob/config/RestAzureBlobClientModuleTest.java diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/internal/StubAzureBlobClient.java b/azure/src/test/java/org/jclouds/azure/storage/blob/internal/StubAzureBlobClient.java similarity index 100% rename from azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/internal/StubAzureBlobClient.java rename to azure/src/test/java/org/jclouds/azure/storage/blob/internal/StubAzureBlobClient.java diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/options/CreateContainerOptionsTest.java b/azure/src/test/java/org/jclouds/azure/storage/blob/options/CreateContainerOptionsTest.java similarity index 100% rename from azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/options/CreateContainerOptionsTest.java rename to azure/src/test/java/org/jclouds/azure/storage/blob/options/CreateContainerOptionsTest.java diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/options/ListBlobsOptionsTest.java b/azure/src/test/java/org/jclouds/azure/storage/blob/options/ListBlobsOptionsTest.java similarity index 100% rename from azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/options/ListBlobsOptionsTest.java rename to azure/src/test/java/org/jclouds/azure/storage/blob/options/ListBlobsOptionsTest.java diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/xml/AccountNameEnumerationResultsHandlerTest.java b/azure/src/test/java/org/jclouds/azure/storage/blob/xml/AccountNameEnumerationResultsHandlerTest.java similarity index 96% rename from azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/xml/AccountNameEnumerationResultsHandlerTest.java rename to azure/src/test/java/org/jclouds/azure/storage/blob/xml/AccountNameEnumerationResultsHandlerTest.java index 08cb38af34..f4f98c358a 100644 --- a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/xml/AccountNameEnumerationResultsHandlerTest.java +++ b/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 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 list = new BoundedTreeSet( contents, URI.create("http://myaccount.blob.core.windows.net"), "prefix", "marker", 1, "video"); diff --git a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/xml/ContainerNameEnumerationResultsHandlerTest.java b/azure/src/test/java/org/jclouds/azure/storage/blob/xml/ContainerNameEnumerationResultsHandlerTest.java similarity index 97% rename from azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/xml/ContainerNameEnumerationResultsHandlerTest.java rename to azure/src/test/java/org/jclouds/azure/storage/blob/xml/ContainerNameEnumerationResultsHandlerTest.java index 46a4ce6c5c..ff4136d248 100644 --- a/azure/storage/blob/core/src/test/java/org/jclouds/azure/storage/blob/xml/ContainerNameEnumerationResultsHandlerTest.java +++ b/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 contents = Sets.newTreeSet(); contents.add(new ListableBlobPropertiesImpl("blob1.txt", URI .create("http://myaccount.blob.core.windows.net/mycontainer/blob1.txt"), dateService diff --git a/azure/storage/core/src/test/java/org/jclouds/azure/storage/config/AzureStorageRestClientModuleTest.java b/azure/src/test/java/org/jclouds/azure/storage/config/AzureStorageRestClientModuleTest.java similarity index 100% rename from azure/storage/core/src/test/java/org/jclouds/azure/storage/config/AzureStorageRestClientModuleTest.java rename to azure/src/test/java/org/jclouds/azure/storage/config/AzureStorageRestClientModuleTest.java diff --git a/azure/storage/core/src/test/java/org/jclouds/azure/storage/filters/SharedKeyAuthenticationLiveTest.java b/azure/src/test/java/org/jclouds/azure/storage/filters/SharedKeyAuthenticationLiveTest.java similarity index 100% rename from azure/storage/core/src/test/java/org/jclouds/azure/storage/filters/SharedKeyAuthenticationLiveTest.java rename to azure/src/test/java/org/jclouds/azure/storage/filters/SharedKeyAuthenticationLiveTest.java diff --git a/azure/storage/core/src/test/java/org/jclouds/azure/storage/filters/SharedKeyAuthenticationTest.java b/azure/src/test/java/org/jclouds/azure/storage/filters/SharedKeyAuthenticationTest.java similarity index 100% rename from azure/storage/core/src/test/java/org/jclouds/azure/storage/filters/SharedKeyAuthenticationTest.java rename to azure/src/test/java/org/jclouds/azure/storage/filters/SharedKeyAuthenticationTest.java diff --git a/azure/storage/core/src/test/java/org/jclouds/azure/storage/options/CreateOptionsTest.java b/azure/src/test/java/org/jclouds/azure/storage/options/CreateOptionsTest.java similarity index 100% rename from azure/storage/core/src/test/java/org/jclouds/azure/storage/options/CreateOptionsTest.java rename to azure/src/test/java/org/jclouds/azure/storage/options/CreateOptionsTest.java diff --git a/azure/storage/core/src/test/java/org/jclouds/azure/storage/options/ListOptionsTest.java b/azure/src/test/java/org/jclouds/azure/storage/options/ListOptionsTest.java similarity index 100% rename from azure/storage/core/src/test/java/org/jclouds/azure/storage/options/ListOptionsTest.java rename to azure/src/test/java/org/jclouds/azure/storage/options/ListOptionsTest.java diff --git a/azure/storage/queue/core/src/test/java/org/jclouds/azure/storage/queue/AzureQueueClientLiveTest.java b/azure/src/test/java/org/jclouds/azure/storage/queue/AzureQueueClientLiveTest.java similarity index 100% rename from azure/storage/queue/core/src/test/java/org/jclouds/azure/storage/queue/AzureQueueClientLiveTest.java rename to azure/src/test/java/org/jclouds/azure/storage/queue/AzureQueueClientLiveTest.java diff --git a/azure/storage/queue/core/src/test/java/org/jclouds/azure/storage/queue/AzureQueueClientTest.java b/azure/src/test/java/org/jclouds/azure/storage/queue/AzureQueueClientTest.java similarity index 100% rename from azure/storage/queue/core/src/test/java/org/jclouds/azure/storage/queue/AzureQueueClientTest.java rename to azure/src/test/java/org/jclouds/azure/storage/queue/AzureQueueClientTest.java diff --git a/azure/storage/queue/core/src/test/java/org/jclouds/azure/storage/queue/xml/AccountNameEnumerationResultsHandlerTest.java b/azure/src/test/java/org/jclouds/azure/storage/queue/xml/AccountNameEnumerationResultsHandlerTest.java similarity index 94% rename from azure/storage/queue/core/src/test/java/org/jclouds/azure/storage/queue/xml/AccountNameEnumerationResultsHandlerTest.java rename to azure/src/test/java/org/jclouds/azure/storage/queue/xml/AccountNameEnumerationResultsHandlerTest.java index 4d6bd56b6e..eaf8fc330e 100644 --- a/azure/storage/queue/core/src/test/java/org/jclouds/azure/storage/queue/xml/AccountNameEnumerationResultsHandlerTest.java +++ b/azure/src/test/java/org/jclouds/azure/storage/queue/xml/AccountNameEnumerationResultsHandlerTest.java @@ -45,7 +45,7 @@ import com.google.common.collect.ImmutableSortedSet; public class AccountNameEnumerationResultsHandlerTest extends BaseHandlerTest { public void testApplyInputStream() { - InputStream is = getClass().getResourceAsStream("/test_list_queues.xml"); + InputStream is = getClass().getResourceAsStream("/queue/test_list_queues.xml"); BoundedSortedSet list = new BoundedTreeSet(ImmutableSortedSet.of( new QueueMetadata("q1", URI.create("http://myaccount.queue.core.windows.net/q1")), new QueueMetadata("q2", URI.create("http://myaccount.queue.core.windows.net/q2")), @@ -57,7 +57,7 @@ public class AccountNameEnumerationResultsHandlerTest extends BaseHandlerTest { } public void testApplyInputStreamWithOptions() { - InputStream is = getClass().getResourceAsStream("/test_list_queues_options.xml"); + InputStream is = getClass().getResourceAsStream("/queue/test_list_queues_options.xml"); BoundedSortedSet list = new BoundedTreeSet(ImmutableSortedSet.of( new QueueMetadata("q4", URI.create("http://myaccount.queue.core.windows.net/q4")), new QueueMetadata("q5", URI.create("http://myaccount.queue.core.windows.net/q5"))), diff --git a/azure/storage/core/src/test/java/org/jclouds/azure/storage/xml/ErrorHandlerTest.java b/azure/src/test/java/org/jclouds/azure/storage/xml/ErrorHandlerTest.java similarity index 100% rename from azure/storage/core/src/test/java/org/jclouds/azure/storage/xml/ErrorHandlerTest.java rename to azure/src/test/java/org/jclouds/azure/storage/xml/ErrorHandlerTest.java diff --git a/azure/storage/blob/core/src/test/resources/test_list_blobs.xml b/azure/src/test/resources/blob/test_list_blobs.xml similarity index 100% rename from azure/storage/blob/core/src/test/resources/test_list_blobs.xml rename to azure/src/test/resources/blob/test_list_blobs.xml diff --git a/azure/storage/blob/core/src/test/resources/test_list_containers.xml b/azure/src/test/resources/blob/test_list_containers.xml similarity index 100% rename from azure/storage/blob/core/src/test/resources/test_list_containers.xml rename to azure/src/test/resources/blob/test_list_containers.xml diff --git a/azure/storage/blob/core/src/test/resources/test_list_containers_options.xml b/azure/src/test/resources/blob/test_list_containers_options.xml similarity index 100% rename from azure/storage/blob/core/src/test/resources/test_list_containers_options.xml rename to azure/src/test/resources/blob/test_list_containers_options.xml diff --git a/azure/storage/core/src/test/resources/log4j.xml b/azure/src/test/resources/log4j.xml similarity index 100% rename from azure/storage/core/src/test/resources/log4j.xml rename to azure/src/test/resources/log4j.xml diff --git a/azure/storage/queue/core/src/test/resources/test_list_queues.xml b/azure/src/test/resources/queue/test_list_queues.xml similarity index 100% rename from azure/storage/queue/core/src/test/resources/test_list_queues.xml rename to azure/src/test/resources/queue/test_list_queues.xml diff --git a/azure/storage/queue/core/src/test/resources/test_list_queues_options.xml b/azure/src/test/resources/queue/test_list_queues_options.xml similarity index 100% rename from azure/storage/queue/core/src/test/resources/test_list_queues_options.xml rename to azure/src/test/resources/queue/test_list_queues_options.xml diff --git a/azure/storage/core/src/test/resources/test_error.xml b/azure/src/test/resources/test_error.xml similarity index 100% rename from azure/storage/core/src/test/resources/test_error.xml rename to azure/src/test/resources/test_error.xml diff --git a/azure/storage/blob/core/pom.xml b/azure/storage/blob/core/pom.xml deleted file mode 100644 index 9a0a5b706e..0000000000 --- a/azure/storage/blob/core/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - org.jclouds - jclouds-azureblob-project - 1.0-SNAPSHOT - ../pom.xml - - 4.0.0 - org.jclouds - jclouds-azureblob - jclouds azure blob Components Core - jar - jclouds Core components to access azure blob - - - scm:svn:http://jclouds.googlecode.com/svn/trunk/azure/storage/blob/core - scm:svn:https://jclouds.googlecode.com/svn/trunk/azure/storage/blob/core - http://jclouds.googlecode.com/svn/trunk/azure/storage/blob/core - - - diff --git a/azure/storage/blob/pom.xml b/azure/storage/blob/pom.xml deleted file mode 100644 index f538b5e0d6..0000000000 --- a/azure/storage/blob/pom.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - jclouds-azure-storage-project - org.jclouds - 1.0-SNAPSHOT - ../pom.xml - - 4.0.0 - jclouds-azureblob-project - pom - jclouds azure blob project - - core - - - org.jclouds.azure.storage.blob.blobstore.integration.AzureBlobTestInitializer - - - - ${project.groupId} - jclouds-core - ${project.version} - - - ${project.groupId} - jclouds-core - ${project.version} - test-jar - test - - - ${project.groupId} - jclouds-azure-storage-core - ${project.version} - - - ${project.groupId} - jclouds-azure-storage-core - ${project.version} - test-jar - test - - - diff --git a/azure/storage/core/pom.xml b/azure/storage/core/pom.xml deleted file mode 100644 index 878cd53cda..0000000000 --- a/azure/storage/core/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - org.jclouds - jclouds-azure-storage-project - 1.0-SNAPSHOT - ../pom.xml - - 4.0.0 - org.jclouds - jclouds-azure-storage-core - jclouds azure storage components Core - jar - jclouds Core components to access azure storage - - - scm:svn:http://jclouds.googlecode.com/svn/trunk/azure/storage/core - scm:svn:https://jclouds.googlecode.com/svn/trunk/azure/storage/core - http://jclouds.googlecode.com/svn/trunk/azure/storage/core - - - diff --git a/azure/storage/pom.xml b/azure/storage/pom.xml deleted file mode 100644 index a9b49dc340..0000000000 --- a/azure/storage/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - jclouds-azure-project - org.jclouds - 1.0-SNAPSHOT - ../project/pom.xml - - 4.0.0 - jclouds-azure-storage-project - pom - jclouds azure storage project - - core - blob - queue - table - - - ${jclouds.azure.storage.account} - ${jclouds.azure.storage.key} - - diff --git a/azure/storage/queue/core/pom.xml b/azure/storage/queue/core/pom.xml deleted file mode 100644 index fc6ebb1ac2..0000000000 --- a/azure/storage/queue/core/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - org.jclouds - jclouds-azurequeue-project - 1.0-SNAPSHOT - ../pom.xml - - 4.0.0 - org.jclouds - jclouds-azurequeue - jclouds azure queue Components Core - jar - jclouds Core components to access azure queue - - - scm:svn:http://jclouds.googlecode.com/svn/trunk/azure/storage/queue/core - scm:svn:https://jclouds.googlecode.com/svn/trunk/azure/storage/queue/core - http://jclouds.googlecode.com/svn/trunk/azure/storage/queue/core - - - diff --git a/azure/storage/queue/pom.xml b/azure/storage/queue/pom.xml deleted file mode 100644 index c1770a13ba..0000000000 --- a/azure/storage/queue/pom.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - jclouds-azure-storage-project - org.jclouds - 1.0-SNAPSHOT - ../pom.xml - - 4.0.0 - jclouds-azurequeue-project - pom - jclouds azure queue project - - core - - - - ${project.groupId} - jclouds-azure-storage-core - ${project.version} - - - ${project.groupId} - jclouds-azure-storage-core - ${project.version} - test-jar - test - - - diff --git a/azure/storage/table/core/pom.xml b/azure/storage/table/core/pom.xml deleted file mode 100644 index 0bf15e8664..0000000000 --- a/azure/storage/table/core/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - org.jclouds - jclouds-azuretable-project - 1.0-SNAPSHOT - ../pom.xml - - 4.0.0 - org.jclouds - jclouds-azuretable - jclouds azure table Components Core - jar - jclouds Core components to access azure table - - - scm:svn:http://jclouds.googlecode.com/svn/trunk/azure/storage/table/core - scm:svn:https://jclouds.googlecode.com/svn/trunk/azure/storage/table/core - http://jclouds.googlecode.com/svn/trunk/azure/storage/table/core - - - diff --git a/azure/storage/table/pom.xml b/azure/storage/table/pom.xml deleted file mode 100644 index 574751f314..0000000000 --- a/azure/storage/table/pom.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - jclouds-azure-storage-project - org.jclouds - 1.0-SNAPSHOT - ../pom.xml - - 4.0.0 - jclouds-azuretable-project - pom - jclouds azure table project - - core - - - - ${project.groupId} - jclouds-azure-storage-core - ${project.version} - - - ${project.groupId} - jclouds-azure-storage-core - ${project.version} - test-jar - test - - - diff --git a/demos/gae-tweetstore/pom.xml b/demos/gae-tweetstore/pom.xml index 465706ee9b..7c420a3626 100755 --- a/demos/gae-tweetstore/pom.xml +++ b/demos/gae-tweetstore/pom.xml @@ -1,309 +1,310 @@ - + 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. + ==================================================================== + --> - - jclouds-demos-project - org.jclouds - 1.0-SNAPSHOT - ../pom.xml - - 4.0.0 - jclouds-gae-tweetstore - war - JClouds TweetStore for Google App Engine - JClouds TweetStore for Google App Engine + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + jclouds-demos-project + org.jclouds + 1.0-SNAPSHOT + ../pom.xml + + 4.0.0 + jclouds-gae-tweetstore + war + JClouds TweetStore for Google App Engine + JClouds TweetStore for Google App Engine - - - /Users/adriancole/Desktop/appengine-java-sdk-1.2.5 - jclouds-tweetstore - localhost - 8088 - jclouds-tweetstore - + + + /Users/adriancole/Desktop/appengine-java-sdk-1.2.5 + jclouds-tweetstore + localhost + 8088 + jclouds-tweetstore + - - - ${project.groupId} - jclouds-core - ${project.version} - - - ${project.groupId} - jclouds-core - ${project.version} - test-jar - test - - - ${project.groupId} - jclouds-twitter - ${project.version} - - - ${project.groupId} - jclouds-emcsaas - ${project.version} - - - ${project.groupId} - jclouds-aws - ${project.version} - - - ${project.groupId} - jclouds-azureblob - ${project.version} - - - ${project.groupId} - jclouds-cloudfiles - ${project.version} - - - ${project.groupId} - jclouds-gae - ${project.version} - - - com.google.code.guice - guice-servlet - 2.1-r1089 - - - displaytag - displaytag - 1.2 - - - org.slf4j - slf4j-log4j12 - - - - - org.slf4j - slf4j-jdk14 - 1.5.6 - - - standard - taglibs - 1.1.2 - jar - runtime - - - jstl - javax.servlet - 1.1.2 - jar - compile - - - org.apache.geronimo.specs - geronimo-el_1.0_spec - 1.0.1 - compile - - - org.apache.geronimo.specs - geronimo-jsp_2.1_spec - 1.0.1 - provided - - - org.apache.geronimo.specs - geronimo-servlet_2.5_spec - 1.2 - provided - + + + ${project.groupId} + jclouds-core + ${project.version} + + + ${project.groupId} + jclouds-core + ${project.version} + test-jar + test + + + ${project.groupId} + jclouds-twitter + ${project.version} + + + ${project.groupId} + jclouds-emcsaas + ${project.version} + + + ${project.groupId} + jclouds-aws + ${project.version} + + + ${project.groupId} + jclouds-azure + ${project.version} + + + ${project.groupId} + jclouds-cloudfiles + ${project.version} + + + ${project.groupId} + jclouds-gae + ${project.version} + + + com.google.code.guice + guice-servlet + 2.1-r1089 + + + displaytag + displaytag + 1.2 + + + org.slf4j + slf4j-log4j12 + + + + + org.slf4j + slf4j-jdk14 + 1.5.6 + + + standard + taglibs + 1.1.2 + jar + runtime + + + jstl + javax.servlet + 1.1.2 + jar + compile + + + org.apache.geronimo.specs + geronimo-el_1.0_spec + 1.0.1 + compile + + + org.apache.geronimo.specs + geronimo-jsp_2.1_spec + 1.0.1 + provided + + + org.apache.geronimo.specs + geronimo-servlet_2.5_spec + 1.2 + provided + - - com.google.appengine - appengine-api-labs - 1.2.5 - + + com.google.appengine + appengine-api-labs + 1.2.5 + - - com.google.appengine - appengine-tools-api - 1.2.5 - system - ${appengine.home}/lib/appengine-tools-api.jar - + + com.google.appengine + appengine-tools-api + 1.2.5 + system + ${appengine.home}/lib/appengine-tools-api.jar + - - - ${project.artifactId} - - - org.apache.maven.plugins - maven-war-plugin - - - - src/main/appengine - WEB-INF/ - true - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration - integration-test - - test - - - - - appengine.home - ${appengine.home} - - - devappserver.address - ${devappserver.address} - - - devappserver.port - ${devappserver.port} - - - warfile - ${project.build.directory}/${project.artifactId} - - - - ${appengine.home}/lib/appengine-tools-api.jar + + + ${project.artifactId} + + + org.apache.maven.plugins + maven-war-plugin + + + + src/main/appengine + WEB-INF/ + true + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + integration + integration-test + + test + + + + + appengine.home + ${appengine.home} + + + devappserver.address + ${devappserver.address} + + + devappserver.port + ${devappserver.port} + + + warfile + ${project.build.directory}/${project.artifactId} + + + + ${appengine.home}/lib/appengine-tools-api.jar - - - true - ${appengine.home}/bin - ${appengine.home}/lib - ${appengine.home}/config/sdk - - - - - - - + + + true + ${appengine.home}/bin + ${appengine.home}/lib + ${appengine.home}/config/sdk + + + + + + + - - - live - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration - integration-test - - test - - - - - jclouds.twitter.user - ${jclouds.twitter.user} - - - jclouds.twitter.password - ${jclouds.twitter.password} - - - jclouds.azure.storage.account - ${jclouds.azure.storage.account} - - - jclouds.azure.storage.key - ${jclouds.azure.storage.key} - - - jclouds.rackspace.user - ${jclouds.rackspace.user} - - - jclouds.rackspace.key - ${jclouds.rackspace.key} - - - jclouds.emcsaas.uid - ${jclouds.emcsaas.uid} - - - jclouds.emcsaas.key - ${jclouds.emcsaas.key} - - - jclouds.aws.accesskeyid - ${jclouds.aws.accesskeyid} - - - jclouds.aws.secretaccesskey - ${jclouds.aws.secretaccesskey} - - - appengine.home - ${appengine.home} - - - devappserver.address - ${devappserver.address} - - - devappserver.port - ${devappserver.port} - - - jclouds.tweetstore.container - ${jclouds.tweetstore.container} - - - warfile - ${project.build.directory}/${project.artifactId} - - - - - - - - - - + + + live + + + + org.apache.maven.plugins + maven-surefire-plugin + + + integration + integration-test + + test + + + + + jclouds.twitter.user + ${jclouds.twitter.user} + + + jclouds.twitter.password + ${jclouds.twitter.password} + + + jclouds.azure.storage.account + ${jclouds.azure.storage.account} + + + jclouds.azure.storage.key + ${jclouds.azure.storage.key} + + + jclouds.rackspace.user + ${jclouds.rackspace.user} + + + jclouds.rackspace.key + ${jclouds.rackspace.key} + + + jclouds.emcsaas.uid + ${jclouds.emcsaas.uid} + + + jclouds.emcsaas.key + ${jclouds.emcsaas.key} + + + jclouds.aws.accesskeyid + ${jclouds.aws.accesskeyid} + + + jclouds.aws.secretaccesskey + ${jclouds.aws.secretaccesskey} + + + appengine.home + ${appengine.home} + + + devappserver.address + ${devappserver.address} + + + devappserver.port + ${devappserver.port} + + + jclouds.tweetstore.container + ${jclouds.tweetstore.container} + + + warfile + ${project.build.directory}/${project.artifactId} + + + + + + + + + +