diff --git a/aws/s3/samples/googleappengine/pom.xml b/aws/s3/samples/googleappengine/pom.xml
index 99bac2367e..ac634469a4 100644
--- a/aws/s3/samples/googleappengine/pom.xml
+++ b/aws/s3/samples/googleappengine/pom.xml
@@ -1,201 +1,218 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-   $HeadURL$
-   $Revision$
-   $Date$
+	<!--
 
-   Copyright (C) 2009 Adrian Cole <adrian@jclouds.org>
+		Copyright (C) 2009 Global Cloud Specialists, Inc.
+		<info@globalcloudspecialists.com>
 
-   ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
+		====================================================================
+		Licensed to the Apache Software Foundation (ASF) under one or more
+		contributor license agreements. See the NOTICE file distributed with
+		this work for additional information regarding copyright ownership.
+		The ASF licenses this file to you under the Apache License, Version
+		2.0 (the "License"); you may not use 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 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.
-   ====================================================================
- -->
+		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.
+		====================================================================
+	-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <parent>
-        <artifactId>jclouds-s3-samples-project</artifactId>
-        <groupId>org.jclouds</groupId>
-        <version>1.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>jclouds-gae-s3-example</artifactId>
-    <packaging>war</packaging>
-    <name>JClouds Sample for Google App Engine</name>
-    <description>JClouds Sample for Google App Engine</description>
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<parent>
+		<artifactId>jclouds-s3-samples-project</artifactId>
+		<groupId>org.jclouds</groupId>
+		<version>1.0-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>jclouds-gae-s3-example</artifactId>
+	<packaging>war</packaging>
+	<name>JClouds Sample for Google App Engine</name>
+	<description>JClouds Sample for Google App Engine</description>
 
-    <properties>
-        <!-- note you must set the property ${appengine.home} to a valid extraction of appengine-java-sdk -->
-        <appengine.home>/Users/adriancole/Desktop/appengine-java-sdk-1.2.1</appengine.home>
-        <devappserver.address>localhost</devappserver.address>
-        <devappserver.port>8088</devappserver.port>
-    </properties>
+	<properties>
+		<!--
+			note you must set the property ${appengine.home} to a valid
+			extraction of appengine-java-sdk
+		-->
+		<appengine.home>/Users/adriancole/Desktop/appengine-java-sdk-1.2.1</appengine.home>
+		<appengine.applicationid>jclouds-s3-example</appengine.applicationid>
+		<devappserver.address>localhost</devappserver.address>
+		<devappserver.port>8088</devappserver.port>
+	</properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>jclouds-gae</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.code.guice</groupId>
-            <artifactId>guice-servlet</artifactId>
-            <version>2.0</version>
-        </dependency>
-        <dependency>
-            <artifactId>standard</artifactId>
-            <groupId>taglibs</groupId>
-            <version>1.1.2</version>
-            <type>jar</type>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <artifactId>jstl</artifactId>
-            <groupId>javax.servlet</groupId>
-            <version>1.1.2</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-el_1.0_spec</artifactId>
-            <version>1.0.1</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jsp_2.1_spec</artifactId>
-            <version>1.0.1</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <version>1.2</version>
-            <scope>provided</scope>
-        </dependency>
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>jclouds-gae</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.google.code.guice</groupId>
+			<artifactId>guice-servlet</artifactId>
+			<version>2.0</version>
+		</dependency>
+		<dependency>
+			<artifactId>standard</artifactId>
+			<groupId>taglibs</groupId>
+			<version>1.1.2</version>
+			<type>jar</type>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<artifactId>jstl</artifactId>
+			<groupId>javax.servlet</groupId>
+			<version>1.1.2</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-el_1.0_spec</artifactId>
+			<version>1.0.1</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jsp_2.1_spec</artifactId>
+			<version>1.0.1</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-servlet_2.5_spec</artifactId>
+			<version>1.2</version>
+			<scope>provided</scope>
+		</dependency>
 
-        <dependency>
-            <groupId>com.google.appengine</groupId>
-            <artifactId>appengine-tools-api</artifactId>
-            <version>1.2.1</version>
-            <scope>system</scope>
-            <systemPath>${appengine.home}/lib/appengine-tools-api.jar</systemPath>
-        </dependency>
+		<dependency>
+			<groupId>com.google.appengine</groupId>
+			<artifactId>appengine-tools-api</artifactId>
+			<version>1.2.1</version>
+			<scope>system</scope>
+			<systemPath>${appengine.home}/lib/appengine-tools-api.jar</systemPath>
+		</dependency>
 
-    </dependencies>
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <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
+	</dependencies>
+	<build>
+		<finalName>${project.artifactId}</finalName>
+		<plugins>
+			<plugin>
+				<groupId>bakersoftware</groupId>
+				<artifactId>maven-replacer-plugin</artifactId>
+				<version>0.0.9</version>
+				<executions>
+					<execution>
+						<phase>compile</phase>
+						<goals>
+							<goal>replace</goal>
+						</goals>
+						<configuration>
+							<file>src/main/webapp/WEB-INF/appengine-web.xml</file>
+							<token>@APPLICATION@</token>
+							<value>${appengine.applicationid}</value>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<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>
+							</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>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>integration</id>
-                                <phase>integration-test</phase>
-                                <goals>
-                                    <goal>test</goal>
-                                </goals>
-                                <configuration>
-                                    <systemProperties>
-                                        <property>
-                                            <name>jclouds.aws.accesskeyid</name>
-                                            <value>${jclouds.aws.accesskeyid}</value>
-                                        </property>
-                                        <property>
-                                            <name>jclouds.aws.secretaccesskey</name>
-                                            <value>${jclouds.aws.secretaccesskey}</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>warfile</name>
-                                    <value>${project.build.directory}/${project.artifactId}</value>
-                                </property>
-                                    </systemProperties>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+	<profiles>
+		<profile>
+			<id>live</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-surefire-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>integration</id>
+								<phase>integration-test</phase>
+								<goals>
+									<goal>test</goal>
+								</goals>
+								<configuration>
+									<systemProperties>
+										<property>
+											<name>jclouds.aws.accesskeyid</name>
+											<value>${jclouds.aws.accesskeyid}</value>
+										</property>
+										<property>
+											<name>jclouds.aws.secretaccesskey</name>
+											<value>${jclouds.aws.secretaccesskey}</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>warfile</name>
+											<value>${project.build.directory}/${project.artifactId}</value>
+										</property>
+									</systemProperties>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>
diff --git a/aws/s3/samples/googleappengine/src/main/java/org/jclouds/samples/googleappengine/JCloudsServlet.java b/aws/s3/samples/googleappengine/src/main/java/org/jclouds/samples/googleappengine/JCloudsServlet.java
index 46159897d0..beb5fb4cc0 100644
--- a/aws/s3/samples/googleappengine/src/main/java/org/jclouds/samples/googleappengine/JCloudsServlet.java
+++ b/aws/s3/samples/googleappengine/src/main/java/org/jclouds/samples/googleappengine/JCloudsServlet.java
@@ -34,8 +34,8 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.jclouds.aws.AWSResponseException;
 import org.jclouds.aws.s3.S3Context;
-import org.jclouds.aws.s3.AWSResponseException;
 import org.jclouds.aws.s3.domain.S3Bucket;
 import org.jclouds.logging.Logger;
 
diff --git a/project/pom.xml b/project/pom.xml
index abd0506ba6..47b186318d 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -114,6 +114,10 @@
                 <enabled>false</enabled>
             </snapshots>
         </pluginRepository>
+        <pluginRepository>
+            <id>jclouds-googlecode</id>
+            <url>http://jclouds.googlecode.com/svn/repo</url>
+        </pluginRepository>
     </pluginRepositories>
 
     <developers>