Issue 474:update to google appengine sdk 1.4.0

This commit is contained in:
Adrian Cole 2011-02-15 14:26:41 +01:00
parent 72c641be5d
commit 19981da7c7
4 changed files with 100 additions and 113 deletions

View File

@ -20,15 +20,12 @@
<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">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <groupId>org.jclouds.demos</groupId>
<groupId>org.jclouds</groupId> <artifactId>gae-replicator</artifactId>
<artifactId>jclouds-demos-project</artifactId> <version>1.0-SNAPSHOT</version>
<version>1.0-SNAPSHOT</version>
</parent>
<artifactId>jclouds-demo-gae-tweetstore</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<name>JClouds TweetStore for Google App Engine</name> <name>JClouds example to replicate the contents of a container</name>
<description>JClouds TweetStore for Google App Engine</description> <description>JClouds example to replicate the contents of a container</description>
<properties> <properties>
<!-- <!--
@ -36,22 +33,18 @@
extraction of appengine-java-sdk extraction of appengine-java-sdk
--> -->
<appengine.home>YOUR_APPENGINE_HOME</appengine.home> <appengine.home>YOUR_APPENGINE_HOME</appengine.home>
<appengine.applicationid>jclouds-tweetstore</appengine.applicationid> <appengine.applicationid>jclouds-replicate</appengine.applicationid>
<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.replicate.source>googlestorage</jclouds.replicate.source>
<jclouds.tweetstore.container>jclouds-tweetstore</jclouds.tweetstore.container> <jclouds.replicate.destinations>cloudfiles-us,aws-s3,azureblob</jclouds.replicate.destinations>
<jclouds.replicate.container>jclouds-replicate</jclouds.replicate.container>
</properties> </properties>
<dependencies> <dependencies>
<dependency>
<groupId>org.twitter4j</groupId>
<artifactId>twitter4j-core</artifactId>
<version>[2.1,)</version>
</dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>jclouds-blobstore</artifactId> <artifactId>jclouds-allblobstore</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
@ -81,29 +74,14 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jclouds.provider</groupId> <groupId>org.jclouds.driver</groupId>
<artifactId>aws-s3</artifactId> <artifactId>gae</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jclouds-azure</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jclouds-rackspace</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<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>3.0-snapshot-20101120</version> <version>3.0-RC2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>displaytag</groupId> <groupId>displaytag</groupId>
@ -132,35 +110,62 @@
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<version>1.1.2</version> <version>1.1.2</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId> <!-- Google App Engine API -->
<artifactId>geronimo-el_1.0_spec</artifactId> <dependency>
<version>1.0.1</version> <groupId>com.google.appengine</groupId>
</dependency> <artifactId>appengine-api-1.0-sdk</artifactId>
<dependency> <version>1.4.2</version>
<groupId>org.apache.geronimo.specs</groupId> </dependency>
<artifactId>geronimo-jsp_2.1_spec</artifactId>
<version>1.0.1</version> <!-- Google App Engine Runtime Dependencies -->
<scope>provided</scope> <dependency>
</dependency> <groupId>org.apache.geronimo.specs</groupId>
<dependency> <artifactId>geronimo-jta_1.1_spec</artifactId>
<groupId>org.apache.geronimo.specs</groupId> <version>1.1.1</version>
<artifactId>geronimo-servlet_2.5_spec</artifactId> <scope>runtime</scope>
<version>1.2</version> </dependency>
<scope>provided</scope>
</dependency> <dependency>
<dependency> <groupId>org.apache.geronimo.specs</groupId>
<groupId>com.google.appengine</groupId> <artifactId>geronimo-jpa_3.0_spec</artifactId>
<artifactId>appengine-api-labs</artifactId> <version>1.1.1</version>
<version>1.3.5</version> <scope>runtime</scope>
</dependency> </dependency>
<dependency>
<groupId>com.google.appengine</groupId> <dependency>
<artifactId>appengine-tools-api</artifactId> <groupId>com.google.appengine.orm</groupId>
<version>1.3.5</version> <artifactId>jdo2-api</artifactId>
<scope>system</scope> <version>2.3-eb</version>
<systemPath>${appengine.home}/lib/appengine-tools-api.jar</systemPath> <scope>runtime</scope>
</dependency> </dependency>
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-core</artifactId>
<version>1.1.5</version>
</dependency>
<dependency>
<groupId>com.google.appengine.orm</groupId>
<artifactId>datanucleus-appengine</artifactId>
<version>1.0.8</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-jpa</artifactId>
<version>1.1.5</version>
<scope>runtime</scope>
</dependency>
<!-- App Engine Runtime Dependencies-->
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-tools-sdk</artifactId>
<version>1.4.2</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
<finalName>${project.artifactId}</finalName> <finalName>${project.artifactId}</finalName>
@ -237,14 +242,6 @@
</goals> </goals>
<configuration> <configuration>
<systemProperties> <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> <property>
<name>test.azureblob.identity</name> <name>test.azureblob.identity</name>
<value>${test.azureblob.identity}</value> <value>${test.azureblob.identity}</value>
@ -254,20 +251,20 @@
<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.s3.identity</name> <name>test.aws-s3.identity</name>
<value>${test.s3.identity}</value> <value>${test.aws-s3.identity}</value>
</property> </property>
<property> <property>
<name>test.s3.credential</name> <name>test.aws-s3.credential</name>
<value>${test.s3.credential}</value> <value>${test.aws-s3.credential}</value>
</property> </property>
<property> <property>
<name>test.googlestorage.identity</name> <name>test.googlestorage.identity</name>
@ -290,12 +287,16 @@
<value>${devappserver.port}</value> <value>${devappserver.port}</value>
</property> </property>
<property> <property>
<name>jclouds.tweetstore.blobstores</name> <name>jclouds.replicate.source</name>
<value>${jclouds.tweetstore.blobstores}</value> <value>${jclouds.replicate.source}</value>
</property> </property>
<property> <property>
<name>jclouds.tweetstore.container</name> <name>jclouds.replicate.destinations</name>
<value>${jclouds.tweetstore.container}</value> <value>${jclouds.replicate.destinations}</value>
</property>
<property>
<name>jclouds.replicate.container</name>
<value>${jclouds.replicate.container}</value>
</property> </property>
<property> <property>
<name>warfile</name> <name>warfile</name>

View File

@ -22,11 +22,8 @@
<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">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <groupId>org.jclouds</groupId>
<groupId>org.jclouds</groupId> <version>1.0-SNAPSHOT</version>
<artifactId>demos-project</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<artifactId>googleappengine</artifactId> <artifactId>googleappengine</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<name>JClouds Sample for Google App Engine</name> <name>JClouds Sample for Google App Engine</name>

View File

@ -23,7 +23,7 @@
<%@ taglib uri="http://displaytag.sf.net" prefix="display"%> <%@ taglib uri="http://displaytag.sf.net" prefix="display"%>
<html> <html>
<head> <head>
<title>jclouds: multi-cloud framework</title> <title>jclouds: multi-cloud library</title>
</head> </head>
<body> <body>
<h2>Status List</h2> <h2>Status List</h2>

View File

@ -49,6 +49,13 @@
<artifactId>jclouds-core</artifactId> <artifactId>jclouds-core</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId>
<version>1.4.0</version>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.jclouds</groupId> <groupId>org.jclouds</groupId>
<artifactId>jclouds-core</artifactId> <artifactId>jclouds-core</artifactId>
@ -57,38 +64,20 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.appengine</groupId> <groupId>org.mortbay.jetty</groupId>
<artifactId>appengine-api</artifactId> <artifactId>jetty-ssl</artifactId>
<version>1.3.5</version> <scope>test</scope>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.appengine</groupId> <groupId>com.google.appengine</groupId>
<artifactId>appengine-api-stubs</artifactId> <artifactId>appengine-api-stubs</artifactId>
<version>1.3.5</version> <version>1.4.0</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.appengine</groupId> <groupId>com.google.appengine</groupId>
<artifactId>appengine-testing</artifactId> <artifactId>appengine-testing</artifactId>
<version>1.3.5</version> <version>1.4.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-local-runtime</artifactId>
<version>1.3.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
<version>1.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-ssl</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>