Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switched to new providers, removed unneeded GAE dev server dependencies and made provider and dependencies runtime

This commit is contained in:
Andrew Phillips 2011-05-29 19:37:42 +01:00
parent d34353e0e7
commit 8e2ea83bc1
2 changed files with 235 additions and 269 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
demos/gae-tweetstore-spring/pom.xml
View File

@ -34,14 +34,14 @@
<properties> <properties>
<!-- <!--
note you must set the property ${appengine.home} to a valid note you must set the property ${appengine.sdk.root} to a valid
extraction of appengine-java-sdk extraction of appengine-java-sdk
--> -->
<appengine.home>YOUR_APPENGINE_HOME</appengine.home>
<appengine.applicationid>jclouds-tweetstore-spring</appengine.applicationid> <appengine.applicationid>jclouds-tweetstore-spring</appengine.applicationid>
<appengine.sdk.version>1.4.2</appengine.sdk.version>
<devappserver.address>localhost</devappserver.address> <devappserver.address>localhost</devappserver.address>
<devappserver.port>8088</devappserver.port> <devappserver.port>8088</devappserver.port>
<jclouds.tweetstore.blobstores>cloudfiles,googlestorage,s3,azureblob</jclouds.tweetstore.blobstores> <jclouds.tweetstore.blobstores>cloudfiles-us,aws-s3,azureblob</jclouds.tweetstore.blobstores>
<jclouds.tweetstore.container>jclouds-tweetstore-spring</jclouds.tweetstore.container> <jclouds.tweetstore.container>jclouds-tweetstore-spring</jclouds.tweetstore.container>
</properties> </properties>
@ -67,21 +67,19 @@
<groupId>org.jclouds.provider</groupId> <groupId>org.jclouds.provider</groupId>
<artifactId>aws-s3</artifactId> <artifactId>aws-s3</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>org.jclouds.provider</groupId>
<artifactId>jclouds-atmos</artifactId> <artifactId>cloudfiles-us</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>org.jclouds.provider</groupId>
<artifactId>jclouds-azure</artifactId> <artifactId>azureblob</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jclouds-rackspace</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jclouds.driver</groupId> <groupId>org.jclouds.driver</groupId>
@ -102,11 +100,13 @@
<groupId>cglib</groupId> <groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId> <artifactId>cglib-nodep</artifactId>
<version>2.2</version> <version>2.2</version>
<scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>displaytag</groupId> <groupId>displaytag</groupId>
<artifactId>displaytag</artifactId> <artifactId>displaytag</artifactId>
<version>1.2</version> <version>1.2</version>
<scope>runtime</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
@ -118,6 +118,7 @@
<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>
<scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<artifactId>standard</artifactId> <artifactId>standard</artifactId>
@ -129,35 +130,26 @@
<artifactId>jstl</artifactId> <artifactId>jstl</artifactId>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<version>1.1.2</version> <version>1.1.2</version>
<scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>javax.servlet</groupId>
<artifactId>geronimo-el_1.0_spec</artifactId> <artifactId>servlet-api</artifactId>
<version>1.0.1</version> <version>2.5</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jsp_2.1_spec</artifactId>
<version>1.0.1</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- Google App Engine API -->
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>com.google.appengine</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId> <artifactId>appengine-api-1.0-sdk</artifactId>
<version>1.2</version> <version>${appengine.sdk.version}</version>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.appengine</groupId> <groupId>com.google.appengine</groupId>
<artifactId>appengine-api-labs</artifactId> <artifactId>appengine-tools-sdk</artifactId>
<version>1.3.5</version> <version>${appengine.sdk.version}</version>
</dependency> <scope>test</scope>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-tools-api</artifactId>
<version>1.3.5</version>
<scope>system</scope>
<systemPath>${appengine.home}/lib/appengine-tools-api.jar</systemPath>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
@ -187,8 +179,8 @@
<configuration> <configuration>
<systemProperties> <systemProperties>
<property> <property>
<name>appengine.home</name> <name>appengine.sdk.root</name>
<value>${appengine.home}</value> <value>${appengine.sdk.root}</value>
</property> </property>
<property> <property>
<name>devappserver.address</name> <name>devappserver.address</name>
@ -203,15 +195,6 @@
<value>${project.build.directory}/${project.artifactId}</value> <value>${project.build.directory}/${project.artifactId}</value>
</property> </property>
</systemProperties> </systemProperties>
<additionalClasspathElements>
<additionalClasspathElement>${appengine.home}/lib/appengine-tools-api.jar</additionalClasspathElement>
</additionalClasspathElements>
<environmentVariables>
<DEBUG>true</DEBUG>
<SDK_BIN>${appengine.home}/bin</SDK_BIN>
<SDK_LIB>${appengine.home}/lib</SDK_LIB>
<SDK_CONFIG>${appengine.home}/config/sdk</SDK_CONFIG>
</environmentVariables>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
@ -252,32 +235,24 @@
<value>${test.azureblob.credential}</value> <value>${test.azureblob.credential}</value>
</property> </property>
<property> <property>
<name>test.cloudfiles.identity</name> <name>test.cloudfiles-us.identity</name>
<value>${test.cloudfiles.identity}</value> <value>${test.cloudfiles-us.identity}</value>
</property> </property>
<property> <property>
<name>test.cloudfiles.credential</name> <name>test.cloudfiles-us.credential</name>
<value>${test.cloudfiles.credential}</value> <value>${test.cloudfiles-us.credential}</value>
</property> </property>
<property> <property>
<name>test.googlestorage.identity</name> <name>test.aws-s3.identity</name>
<value>${test.googlestorage.identity}</value> <value>${test.aws-s3.identity}</value>
</property> </property>
<property> <property>
<name>test.googlestorage.credential</name> <name>test.aws-s3.credential</name>
<value>${test.googlestorage.credential}</value> <value>${test.aws-s3.credential}</value>
</property> </property>
<property> <property>
<name>test.s3.identity</name> <name>appengine.sdk.root</name>
<value>${test.s3.identity}</value> <value>${appengine.sdk.root}</value>
</property>
<property>
<name>test.s3.credential</name>
<value>${test.s3.credential}</value>
</property>
<property>
<name>appengine.home</name>
<value>${appengine.home}</value>
</property> </property>
<property> <property>
<name>devappserver.address</name> <name>devappserver.address</name>

405
demos/gae-tweetstore/pom.xml
View File

@ -31,17 +31,16 @@
<description>JClouds TweetStore for Google App Engine using Guice for Dependency Injection</description> <description>JClouds TweetStore for Google App Engine using Guice for Dependency Injection</description>
<properties> <properties>
<!-- <!--
note you must set the property ${appengine.home} to a valid note you must set the property ${appengine.sdk.root} to a valid
extraction of appengine-java-sdk extraction of appengine-java-sdk
--> -->
<appengine.applicationid>jclouds-replicate</appengine.applicationid> <appengine.applicationid>jclouds-tweetstore</appengine.applicationid>
<appengine.sdk.version>1.4.2</appengine.sdk.version> <appengine.sdk.version>1.4.2</appengine.sdk.version>
<devappserver.address>localhost</devappserver.address> <devappserver.address>localhost</devappserver.address>
<devappserver.port>8088</devappserver.port> <devappserver.port>8088</devappserver.port>
<jclouds.replicate.source>googlestorage</jclouds.replicate.source> <jclouds.tweetstore.blobstores>cloudfiles-us,aws-s3,azureblob</jclouds.tweetstore.blobstores>
<jclouds.replicate.destinations>cloudfiles-us,aws-s3,azureblob</jclouds.replicate.destinations> <jclouds.tweetstore.container>jclouds-tweetstore</jclouds.tweetstore.container>
<jclouds.replicate.container>jclouds-replicate</jclouds.replicate.container>
</properties> </properties>
<dependencies> <dependencies>
@ -66,21 +65,19 @@
<groupId>org.jclouds.provider</groupId> <groupId>org.jclouds.provider</groupId>
<artifactId>aws-s3</artifactId> <artifactId>aws-s3</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>org.jclouds.provider</groupId>
<artifactId>jclouds-atmos</artifactId> <artifactId>cloudfiles-us</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>org.jclouds.provider</groupId>
<artifactId>jclouds-azure</artifactId> <artifactId>azureblob</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jclouds-rackspace</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jclouds.driver</groupId> <groupId>org.jclouds.driver</groupId>
@ -96,6 +93,7 @@
<groupId>displaytag</groupId> <groupId>displaytag</groupId>
<artifactId>displaytag</artifactId> <artifactId>displaytag</artifactId>
<version>1.2</version> <version>1.2</version>
<scope>runtime</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
@ -107,11 +105,13 @@
<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>
<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>
<scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<artifactId>standard</artifactId> <artifactId>standard</artifactId>
@ -126,197 +126,188 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- Google App Engine API --> <!-- Google App Engine API -->
<dependency> <dependency>
<groupId>com.google.appengine</groupId> <groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId> <artifactId>appengine-api-1.0-sdk</artifactId>
<version>${appengine.sdk.version}</version> <version>${appengine.sdk.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.appengine</groupId> <groupId>com.google.appengine</groupId>
<artifactId>appengine-tools-sdk</artifactId> <artifactId>appengine-tools-sdk</artifactId>
<version>${appengine.sdk.version}</version> <version>${appengine.sdk.version}</version>
</dependency> <scope>test</scope>
</dependency>
<!-- Google App Engine Runtime Dependencies --> <!-- Needed..??> -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId> <!-- Google App Engine Runtime Dependencies -->
<artifactId>geronimo-jta_1.1_spec</artifactId> <!--dependency>
<version>1.1.1</version> <groupId>org.apache.geronimo.specs</groupId>
<scope>runtime</scope> <artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency> <version>1.1.1</version>
<dependency> <scope>runtime</scope>
<groupId>org.apache.geronimo.specs</groupId> </dependency>
<artifactId>geronimo-jpa_3.0_spec</artifactId> <dependency>
<version>1.1.1</version> <groupId>org.apache.geronimo.specs</groupId>
<scope>runtime</scope> <artifactId>geronimo-jpa_3.0_spec</artifactId>
</dependency> <version>1.1.1</version>
<dependency> <scope>runtime</scope>
<groupId>com.google.appengine.orm</groupId> </dependency>
<artifactId>jdo2-api</artifactId> <dependency>
<version>2.3-eb</version> <groupId>com.google.appengine.orm</groupId>
<scope>runtime</scope> <artifactId>jdo2-api</artifactId>
</dependency> <version>2.3-eb</version>
<dependency> <scope>runtime</scope>
<groupId>org.datanucleus</groupId> </dependency>
<artifactId>datanucleus-core</artifactId> <dependency>
<version>1.1.5</version> <groupId>org.datanucleus</groupId>
</dependency> <artifactId>datanucleus-core</artifactId>
<dependency> <version>1.1.5</version>
<groupId>com.google.appengine.orm</groupId> <scope>runtime</scope>
<artifactId>datanucleus-appengine</artifactId> </dependency>
<version>1.0.8</version> <dependency>
<scope>runtime</scope> <groupId>com.google.appengine.orm</groupId>
</dependency> <artifactId>datanucleus-appengine</artifactId>
<dependency> <version>1.0.8</version>
<groupId>org.datanucleus</groupId> <scope>runtime</scope>
<artifactId>datanucleus-jpa</artifactId> </dependency>
<version>1.1.5</version> <dependency>
<scope>runtime</scope> <groupId>org.datanucleus</groupId>
</dependency> <artifactId>datanucleus-jpa</artifactId>
</dependencies> <version>1.1.5</version>
<build> <scope>runtime</scope>
<finalName>${project.artifactId}</finalName> </dependency-->
<plugins> </dependencies>
<plugin> <build>
<artifactId>maven-war-plugin</artifactId> <finalName>${project.artifactId}</finalName>
<configuration>
<webResources>
<resource>
<directory>src/main/appengine</directory>
<targetPath>WEB-INF/</targetPath>
<filtering>true</filtering>
</resource>
</webResources>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<executions>
<execution>
<id>integration</id>
<phase>integration-test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
<systemProperties>
<property>
<name>appengine.home</name>
<value>${appengine.home}</value>
</property>
<property>
<name>devappserver.address</name>
<value>${devappserver.address}</value>
</property>
<property>
<name>devappserver.port</name>
<value>${devappserver.port}</value>
</property>
<property>
<name>warfile</name>
<value>${project.build.directory}/${project.artifactId}</value>
</property>
</systemProperties>
<additionalClasspathElements>
<additionalClasspathElement>${appengine.home}/lib/appengine-tools-api.jar</additionalClasspathElement>
</additionalClasspathElements>
<environmentVariables>
<DEBUG>true</DEBUG>
<SDK_BIN>${appengine.home}/bin</SDK_BIN>
<SDK_LIB>${appengine.home}/lib</SDK_LIB>
<SDK_CONFIG>${appengine.home}/config/sdk</SDK_CONFIG>
</environmentVariables>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>live</id>
<build>
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<executions>
<execution>
<id>integration</id>
<phase>integration-test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration> <configuration>
<systemProperties> <webResources>
<property> <resource>
<name>test.azureblob.identity</name> <directory>src/main/appengine</directory>
<value>${test.azureblob.identity}</value> <targetPath>WEB-INF/</targetPath>
</property> <filtering>true</filtering>
<property> </resource>
<name>test.azureblob.credential</name> </webResources>
<value>${test.azureblob.credential}</value>
</property>
<property>
<name>test.cloudfiles-us.identity</name>
<value>${test.cloudfiles-us.identity}</value>
</property>
<property>
<name>test.cloudfiles-us.credential</name>
<value>${test.cloudfiles-us.credential}</value>
</property>
<property>
<name>test.aws-s3.identity</name>
<value>${test.aws-s3.identity}</value>
</property>
<property>
<name>test.aws-s3.credential</name>
<value>${test.aws-s3.credential}</value>
</property>
<property>
<name>test.googlestorage.identity</name>
<value>${test.googlestorage.identity}</value>
</property>
<property>
<name>test.googlestorage.credential</name>
<value>${test.googlestorage.credential}</value>
</property>
<property>
<name>appengine.home</name>
<value>${appengine.home}</value>
</property>
<property>
<name>devappserver.address</name>
<value>${devappserver.address}</value>
</property>
<property>
<name>devappserver.port</name>
<value>${devappserver.port}</value>
</property>
<property>
<name>jclouds.replicate.source</name>
<value>${jclouds.replicate.source}</value>
</property>
<property>
<name>jclouds.replicate.destinations</name>
<value>${jclouds.replicate.destinations}</value>
</property>
<property>
<name>jclouds.replicate.container</name>
<value>${jclouds.replicate.container}</value>
</property>
<property>
<name>warfile</name>
<value>${project.build.directory}/${project.artifactId}</value>
</property>
</systemProperties>
</configuration> </configuration>
</execution> </plugin>
</executions> <plugin>
</plugin> <artifactId>maven-surefire-plugin</artifactId>
<executions>
<execution>
<id>integration</id>
<phase>integration-test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
<systemProperties>
<property>
<name>appengine.sdk.root</name>
<value>${appengine.sdk.root}</value>
</property>
<property>
<name>devappserver.address</name>
<value>${devappserver.address}</value>
</property>
<property>
<name>devappserver.port</name>
<value>${devappserver.port}</value>
</property>
<property>
<name>warfile</name>
<value>${project.build.directory}/${project.artifactId}</value>
</property>
</systemProperties>
</configuration>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
</profile>
<profiles>
<profile>
<id>live</id>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<executions>
<execution>
<id>integration</id>
<phase>integration-test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
<systemProperties>
<property>
<name>test.twitter.identity</name>
<value>${test.twitter.identity}</value>
</property>
<property>
<name>test.twitter.credential</name>
<value>${test.twitter.credential}</value>
</property>
<property>
<name>test.azureblob.identity</name>
<value>${test.azureblob.identity}</value>
</property>
<property>
<name>test.azureblob.credential</name>
<value>${test.azureblob.credential}</value>
</property>
<property>
<name>test.cloudfiles-us.identity</name>
<value>${test.cloudfiles-us.identity}</value>
</property>
<property>
<name>test.cloudfiles-us.credential</name>
<value>${test.cloudfiles-us.credential}</value>
</property>
<property>
<name>test.aws-s3.identity</name>
<value>${test.aws-s3.identity}</value>
</property>
<property>
<name>test.aws-s3.credential</name>
<value>${test.aws-s3.credential}</value>
</property>
<property>
<name>appengine.sdk.root</name>
<value>${appengine.sdk.root}</value>
</property>
<property>
<name>devappserver.address</name>
<value>${devappserver.address}</value>
</property>
<property>
<name>devappserver.port</name>
<value>${devappserver.port}</value>
</property>
<property>
<name>jclouds.tweetstore.blobstores</name>
<value>${jclouds.tweetstore.blobstores}</value>
</property>
<property>
<name>jclouds.tweetstore.container</name>
<value>${jclouds.tweetstore.container}</value>
</property>
<property>
<name>warfile</name>
<value>${project.build.directory}/${project.artifactId}</value>
</property>
</systemProperties>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles> </profiles>
</project> </project>