From 73117e366235566847ccc086c9dc27dbe0d7cb7a Mon Sep 17 00:00:00 2001
From: Andrew Phillips <demobox1@yahoo.co.uk>
Date: Thu, 7 Jul 2011 22:35:09 -0400
Subject: [PATCH] Updated KickStart args and integration test setup

---
 demos/googleappengine/pom.xml                 | 83 +++++--------------
 .../functest/GoogleAppEngineLiveTest.java     |  2 +-
 .../functest/GoogleDevServer.java             | 35 +++++---
 3 files changed, 45 insertions(+), 75 deletions(-)

diff --git a/demos/googleappengine/pom.xml b/demos/googleappengine/pom.xml
index beccf05e6b..e9e7453a6e 100644
--- a/demos/googleappengine/pom.xml
+++ b/demos/googleappengine/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.jclouds</groupId>
         <artifactId>jclouds-demos-project</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <artifactId>jclouds-demo-googleappengine</artifactId>
     <packaging>war</packaging>
@@ -34,9 +34,9 @@
 
     <properties>
         <appengine.applicationid>jclouds-aws-demo</appengine.applicationid>
+        <appengine.sdk.version>1.4.2</appengine.sdk.version>
         <devappserver.address>localhost</devappserver.address>
         <devappserver.port>8088</devappserver.port>
-        <jclouds.test.listener></jclouds.test.listener>
     </properties>
 
     <dependencies>
@@ -54,11 +54,13 @@
             <groupId>org.jclouds.provider</groupId>
             <artifactId>aws-s3</artifactId>
             <version>${project.version}</version>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.jclouds.provider</groupId>
             <artifactId>aws-ec2</artifactId>
             <version>${project.version}</version>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.jclouds.driver</groupId>
@@ -74,6 +76,7 @@
             <groupId>displaytag</groupId>
             <artifactId>displaytag</artifactId>
             <version>1.2</version>
+            <scope>runtime</scope>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -85,6 +88,7 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-jdk14</artifactId>
             <version>1.5.6</version>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <artifactId>standard</artifactId>
@@ -96,39 +100,31 @@
             <artifactId>jstl</artifactId>
             <groupId>javax.servlet</groupId>
             <version>1.1.2</version>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-el_1.0_spec</artifactId>
-            <version>1.0.1</version>
-        </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>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>com.google.appengine</groupId>
             <artifactId>appengine-tools-sdk</artifactId>
-            <version>1.4.3</version>
-            <scope>system</scope>
-            <systemPath>${appengine.home}/lib/appengine-tools-api.jar</systemPath>
+            <version>${appengine.sdk.version}</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
     <build>
         <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
+                <version>2.1.1</version>
                 <configuration>
+                    <!-- see http://jira.codehaus.org/browse/MWAR-248 -->
+                    <packagingExcludes>WEB-INF/web.xml</packagingExcludes>
                     <webResources>
                         <resource>
                             <directory>src/main/appengine</directory>
@@ -138,44 +134,6 @@
                     </webResources>
                 </configuration>
             </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>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>${env.APPENGINE_HOME}/lib/appengine-tools-api.jar</additionalClasspathElement>
-                            </additionalClasspathElements>
-                            <environmentVariables>
-                                <DEBUG>true</DEBUG>
-                                <SDK_BIN>${env.APPENGINE_HOME}/bin</SDK_BIN>
-                                <SDK_LIB>${env.APPENGINE_HOME}/lib</SDK_LIB>
-                                <SDK_CONFIG>${env.APPENGINE_HOME}/config/sdk</SDK_CONFIG>
-                            </environmentVariables>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
@@ -185,7 +143,6 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <executions>
                             <execution>
@@ -198,15 +155,17 @@
                                     <systemProperties>
                                         <property>
                                             <name>test.aws.identity</name>
-                                            <value>${test.aws.identity}</value>
+                                            <!-- same for EC2 -->
+                                            <value>${test.aws-s3.identity}</value>
                                         </property>
                                         <property>
                                             <name>test.aws.credential</name>
-                                            <value>${test.aws.credential}</value>
+                                            <!-- same for EC2 -->
+                                            <value>${test.aws-s3.credential}</value>
                                         </property>
                                         <property>
                                             <name>appengine.sdk.root</name>
-                                            <value>${env.APPENGINE_HOME}</value>
+                                            <value>${appengine.sdk.root}</value>
                                         </property>
                                         <property>
                                             <name>devappserver.address</name>
diff --git a/demos/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleAppEngineLiveTest.java b/demos/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleAppEngineLiveTest.java
index e1007ef4fc..9b9f7e9b85 100644
--- a/demos/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleAppEngineLiveTest.java
+++ b/demos/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleAppEngineLiveTest.java
@@ -36,7 +36,7 @@ import org.testng.annotations.Test;
  * 
  * @author Adrian Cole
  */
-@Test(groups = "live", sequential = true)
+@Test(groups = "live", singleThreaded = true)
 public class GoogleAppEngineLiveTest {
 
    GoogleDevServer server;
diff --git a/demos/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleDevServer.java b/demos/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleDevServer.java
index b74d9d2e49..ad6c9e92c2 100644
--- a/demos/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleDevServer.java
+++ b/demos/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleDevServer.java
@@ -18,16 +18,21 @@
  */
 package org.jclouds.samples.googleappengine.functest;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+import static java.lang.String.format;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Properties;
+import java.util.concurrent.TimeUnit;
 
 import com.google.appengine.tools.KickStart;
+import com.google.appengine.tools.info.SdkInfo;
 
 /**
  * Basic functionality to start a local google app engine instance.
- *
+ * 
  * @author Adrian Cole
  */
 public class GoogleDevServer {
@@ -35,26 +40,27 @@ public class GoogleDevServer {
     Thread server;
 
     public void writePropertiesAndStartServer(final String address,
-                                              final String port, final String warfile, Properties props)
+            final String port, final String warfile, Properties props)
             throws IOException, InterruptedException {
-        String filename = String.format(
-                "%1$s/WEB-INF/jclouds.properties", warfile);
+        String filename = String.format("%1$s/WEB-INF/jclouds.properties", warfile);
         System.err.println("file: " + filename);
         props.store(new FileOutputStream(filename), "test");
         assert new File(filename).exists();
         this.server = new Thread(new Runnable() {
             public void run() {
-                KickStart
-                        .main(new String[]{
-                                "com.google.appengine.tools.development.DevAppServerMain",
-                                "--disable_update_check", "-a", address, "-p",
-                                port, warfile});
-
+                String sdkRoot = checkNotNull(System.getProperty(SdkInfo.SDK_ROOT_PROPERTY), SdkInfo.SDK_ROOT_PROPERTY);
+                KickStart.main(new String[] {
+                        KickStarter.systemProperty("java.util.logging.config.file",
+                                format("%s/WEB-INF/logging.properties", warfile)),
+                        KickStarter.systemProperty(SdkInfo.SDK_ROOT_PROPERTY, sdkRoot),
+                        "com.google.appengine.tools.development.DevAppServerMain",
+                        "--disable_update_check",
+                        format("--sdk_root=%s", sdkRoot), 
+                        "-a", address, "-p", port, warfile });
             }
-
         });
         server.start();
-        Thread.sleep(30 * 1000);
+        TimeUnit.SECONDS.sleep(30);
     }
 
     public void stop() throws Exception {
@@ -62,4 +68,9 @@ public class GoogleDevServer {
         server.interrupt();
     }
 
+    private static class KickStarter {
+        private static String systemProperty(String key, String value) {
+            return format("--jvm_flag=-D%s=%s", key, value);
+        }
+    }
 }
\ No newline at end of file