Issue 116: consolidated azure modules

git-svn-id: http://jclouds.googlecode.com/svn/trunk@2251 3d8758e0-26b5-11de-8745-db77d3ebf521
This commit is contained in:
adrian.f.cole 2009-11-11 07:38:47 +00:00
parent 13be94e72b
commit 474936d711
123 changed files with 571 additions and 980 deletions

View File

@ -1,255 +1,256 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Copyright (C) 2009 Global Cloud Specialists, Inc. Copyright (C) 2009 Global Cloud Specialists, Inc.
<info@globalcloudspecialists.com> <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" <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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <parent>
<artifactId>jclouds-aws-demos-project</artifactId> <artifactId>jclouds-aws-demos-project</artifactId>
<groupId>org.jclouds</groupId> <groupId>org.jclouds</groupId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>jclouds-gae-s3-example</artifactId> <artifactId>jclouds-gae-s3-example</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<name>JClouds Sample for Google App Engine</name> <name>JClouds Sample for Google App Engine</name>
<description>JClouds Sample for Google App Engine</description> <description>JClouds Sample for Google App Engine</description>
<properties> <properties>
<!-- <!--
note you must set the property ${appengine.home} to a valid note you must set the property ${appengine.home} to a valid
extraction of appengine-java-sdk extraction of appengine-java-sdk
--> -->
<appengine.home>/Users/adriancole/Desktop/appengine-java-sdk-1.2.5</appengine.home> <appengine.home>/Users/adriancole/Desktop/appengine-java-sdk-1.2.5</appengine.home>
<appengine.applicationid>jclouds-s3-example</appengine.applicationid> <appengine.applicationid>jclouds-s3-example</appengine.applicationid>
<devappserver.address>localhost</devappserver.address> <devappserver.address>localhost</devappserver.address>
<devappserver.port>8088</devappserver.port> <devappserver.port>8088</devappserver.port>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>jclouds-azureblob</artifactId> <artifactId>jclouds-azure</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>jclouds-cloudfiles</artifactId> <artifactId>jclouds-cloudfiles</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>jclouds-gae</artifactId> <artifactId>jclouds-gae</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.code.guice</groupId> <groupId>com.google.code.guice</groupId>
<artifactId>guice-servlet</artifactId> <artifactId>guice-servlet</artifactId>
<version>2.1-r1089</version> <version>2.1-r1089</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>displaytag</groupId> <groupId>displaytag</groupId>
<artifactId>displaytag</artifactId> <artifactId>displaytag</artifactId>
<version>1.2</version> <version>1.2</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId> <artifactId>slf4j-jdk14</artifactId>
<version>1.5.6</version> <version>1.5.6</version>
</dependency> </dependency>
<dependency> <dependency>
<artifactId>standard</artifactId> <artifactId>standard</artifactId>
<groupId>taglibs</groupId> <groupId>taglibs</groupId>
<version>1.1.2</version> <version>1.1.2</version>
<type>jar</type> <type>jar</type>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<artifactId>jstl</artifactId> <artifactId>jstl</artifactId>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<version>1.1.2</version> <version>1.1.2</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-el_1.0_spec</artifactId> <artifactId>geronimo-el_1.0_spec</artifactId>
<version>1.0.1</version> <version>1.0.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jsp_2.1_spec</artifactId> <artifactId>geronimo-jsp_2.1_spec</artifactId>
<version>1.0.1</version> <version>1.0.1</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId> <artifactId>geronimo-servlet_2.5_spec</artifactId>
<version>1.2</version> <version>1.2</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.appengine</groupId> <groupId>com.google.appengine</groupId>
<artifactId>appengine-tools-api</artifactId> <artifactId>appengine-tools-api</artifactId>
<version>1.2.5</version> <version>1.2.5</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${appengine.home}/lib/appengine-tools-api.jar</systemPath> <systemPath>${appengine.home}/lib/appengine-tools-api.jar</systemPath>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<finalName>${project.artifactId}</finalName> <finalName>${project.artifactId}</finalName>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<configuration> <configuration>
<webResources> <webResources>
<resource> <resource>
<directory>src/main/appengine</directory> <directory>src/main/appengine</directory>
<targetPath>WEB-INF/</targetPath> <targetPath>WEB-INF/</targetPath>
<filtering>true</filtering> <filtering>true</filtering>
</resource> </resource>
</webResources> </webResources>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<id>integration</id> <id>integration</id>
<phase>integration-test</phase> <phase>integration-test</phase>
<goals> <goals>
<goal>test</goal> <goal>test</goal>
</goals> </goals>
<configuration> <configuration>
<systemProperties> <systemProperties>
<property> <property>
<name>appengine.home</name> <name>appengine.home</name>
<value>${appengine.home}</value> <value>${appengine.home}</value>
</property> </property>
<property> <property>
<name>devappserver.address</name> <name>devappserver.address</name>
<value>${devappserver.address}</value> <value>${devappserver.address}</value>
</property> </property>
<property> <property>
<name>devappserver.port</name> <name>devappserver.port</name>
<value>${devappserver.port}</value> <value>${devappserver.port}</value>
</property> </property>
<property> <property>
<name>warfile</name> <name>warfile</name>
<value>${project.build.directory}/${project.artifactId}</value> <value>${project.build.directory}/${project.artifactId}</value>
</property> </property>
</systemProperties> </systemProperties>
<additionalClasspathElements> <additionalClasspathElements>
<additionalClasspathElement>${appengine.home}/lib/appengine-tools-api.jar <additionalClasspathElement>${appengine.home}/lib/appengine-tools-api.jar
</additionalClasspathElement> </additionalClasspathElement>
</additionalClasspathElements> </additionalClasspathElements>
<environmentVariables> <environmentVariables>
<DEBUG>true</DEBUG> <DEBUG>true</DEBUG>
<SDK_BIN>${appengine.home}/bin</SDK_BIN> <SDK_BIN>${appengine.home}/bin</SDK_BIN>
<SDK_LIB>${appengine.home}/lib</SDK_LIB> <SDK_LIB>${appengine.home}/lib</SDK_LIB>
<SDK_CONFIG>${appengine.home}/config/sdk</SDK_CONFIG> <SDK_CONFIG>${appengine.home}/config/sdk</SDK_CONFIG>
</environmentVariables> </environmentVariables>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<profiles> <profiles>
<profile> <profile>
<id>live</id> <id>live</id>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<id>integration</id> <id>integration</id>
<phase>integration-test</phase> <phase>integration-test</phase>
<goals> <goals>
<goal>test</goal> <goal>test</goal>
</goals> </goals>
<configuration> <configuration>
<systemProperties> <systemProperties>
<property> <property>
<name>jclouds.azure.storage.account</name> <name>jclouds.azure.storage.account</name>
<value>${jclouds.azure.storage.account}</value> <value>${jclouds.azure.storage.account}</value>
</property> </property>
<property> <property>
<name>jclouds.azure.storage.key</name> <name>jclouds.azure.storage.key</name>
<value>${jclouds.azure.storage.key}</value> <value>${jclouds.azure.storage.key}</value>
</property> </property>
<property> <property>
<name>jclouds.rackspace.user</name> <name>jclouds.rackspace.user</name>
<value>${jclouds.rackspace.user}</value> <value>${jclouds.rackspace.user}</value>
</property> </property>
<property> <property>
<name>jclouds.rackspace.key</name> <name>jclouds.rackspace.key</name>
<value>${jclouds.rackspace.key}</value> <value>${jclouds.rackspace.key}</value>
</property> </property>
<property> <property>
<name>jclouds.aws.accesskeyid</name> <name>jclouds.aws.accesskeyid</name>
<value>${jclouds.aws.accesskeyid}</value> <value>${jclouds.aws.accesskeyid}</value>
</property> </property>
<property> <property>
<name>jclouds.aws.secretaccesskey</name> <name>jclouds.aws.secretaccesskey</name>
<value>${jclouds.aws.secretaccesskey}</value> <value>${jclouds.aws.secretaccesskey}</value>
</property> </property>
<property> <property>
<name>appengine.home</name> <name>appengine.home</name>
<value>${appengine.home}</value> <value>${appengine.home}</value>
</property> </property>
<property> <property>
<name>devappserver.address</name> <name>devappserver.address</name>
<value>${devappserver.address}</value> <value>${devappserver.address}</value>
</property> </property>
<property> <property>
<name>devappserver.port</name> <name>devappserver.port</name>
<value>${devappserver.port}</value> <value>${devappserver.port}</value>
</property> </property>
<property> <property>
<name>warfile</name> <name>warfile</name>
<value>${project.build.directory}/${project.artifactId}</value> <value>${project.build.directory}/${project.artifactId}</value>
</property> </property>
</systemProperties> </systemProperties>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</profile> </profile>
</profiles> </profiles>
</project> </project>

View File

@ -4,7 +4,7 @@
$Revision$ $Revision$
$Date$ $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 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"> <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> <parent>
<artifactId>jclouds-project</artifactId>
<groupId>org.jclouds</groupId> <groupId>org.jclouds</groupId>
<artifactId>jclouds-project</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<relativePath>../project/pom.xml</relativePath> <relativePath>../project/pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <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> <dependencies>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
@ -53,10 +66,10 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>
<artifactId>log4j</artifactId> <artifactId>log4j</artifactId>
<version>1.2.14</version> <version>1.2.14</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>

View File

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

View File

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

Some files were not shown because too many files have changed in this diff Show More