From 42989a83fff7f3e3212febb83a15feb37c6b13ac Mon Sep 17 00:00:00 2001
From: ejona <ejona@google.com>
Date: Tue, 9 Dec 2014 18:03:24 -0800
Subject: [PATCH] Allow killing test server/client

mvn exec:exec doesn't kill the child process when Maven is killed. Now
we just run ourselves, but have Maven do as much heavy lifting as able.
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=81736090
---
 integration-testing/pom.xml | 55 +++++++++++++++++++++++++++++--------
 pom.xml                     | 12 +++++++-
 run-test-client.sh          |  6 ++--
 run-test-server.sh          |  6 ++--
 4 files changed, 62 insertions(+), 17 deletions(-)

diff --git a/integration-testing/pom.xml b/integration-testing/pom.xml
index f377a3e6bb..45e0776142 100644
--- a/integration-testing/pom.xml
+++ b/integration-testing/pom.xml
@@ -88,21 +88,52 @@
         </executions>
       </plugin>
 
-      <!-- run-test-xxx.sh invoke this plugin to launch a test client/server. -->
       <plugin>
-        <groupId>kr.motd.maven</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>assemble-all</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
         <configuration>
-          <executable>${java.home}/bin/java</executable>
-          <commandlineArgs>
-            ${argLine.bootcp}
-            -classpath
-            %classpath
-            ${exampleClass}
-            ${argLine.example}
-          </commandlineArgs>
+          <descriptorRefs>
+            <descriptorRef>jar-with-dependencies</descriptorRef>
+          </descriptorRefs>
         </configuration>
       </plugin>
+
+      <plugin>
+        <groupId>com.internetitem</groupId>
+        <artifactId>write-properties-file-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>bootclasspath</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>write-properties-file</goal>
+            </goals>
+            <configuration>
+              <filename>bootclasspath.properties</filename>
+              <outputDirectory>${project.build.directory}</outputDirectory>
+              <properties>
+                <property>
+                  <name>bootclasspath</name>
+                  <value>${argLine.bootcp}</value>
+                </property>
+                <property>
+                  <name>jar</name>
+                  <value>${project.build.directory}/${project.artifactId}-${project.version}-jar-with-dependencies.jar</value>
+                </property>
+              </properties>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index 730e478f7b..10e4de955a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -290,6 +290,16 @@
           <artifactId>maven-protoc-plugin</artifactId>
           <version>0.3.2</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>2.5.2</version>
+        </plugin>
+        <plugin>
+          <groupId>com.internetitem</groupId>
+          <artifactId>write-properties-file-maven-plugin</artifactId>
+          <version>1.0.1</version>
+        </plugin>
       </plugins>
     </pluginManagement>
 
@@ -362,4 +372,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/run-test-client.sh b/run-test-client.sh
index 75808fc84a..b126dcad20 100755
--- a/run-test-client.sh
+++ b/run-test-client.sh
@@ -3,6 +3,8 @@ TARGET='Test Service Client'
 TARGET_CLASS='com.google.net.stubby.testing.integration.TestServiceClient'
 TARGET_ARGS="$@"
 
-cd "`dirname "$0"`"/integration-testing
+cd "$(dirname "$0")"
+mvn -q -nsu -pl integration-testing -am package -Dcheckstyle.skip=true -DskipTests
+. integration-testing/target/bootclasspath.properties
 echo "[INFO] Running: $TARGET ($TARGET_CLASS $TARGET_ARGS)"
-exec mvn -q -nsu compile exec:exec -Dcheckstyle.skip=true -DexampleClass="$TARGET_CLASS" -DargLine.example="$TARGET_ARGS"
\ No newline at end of file
+exec java "$bootclasspath" -cp "$jar" "$TARGET_CLASS" $TARGET_ARGS
diff --git a/run-test-server.sh b/run-test-server.sh
index da14129eba..325c1d5771 100755
--- a/run-test-server.sh
+++ b/run-test-server.sh
@@ -3,6 +3,8 @@ TARGET='Test Service Server'
 TARGET_CLASS='com.google.net.stubby.testing.integration.TestServiceServer'
 TARGET_ARGS="$@"
 
-cd "`dirname "$0"`"/integration-testing
+cd "$(dirname "$0")"
+mvn -q -nsu -pl integration-testing -am package -Dcheckstyle.skip=true -DskipTests
+. integration-testing/target/bootclasspath.properties
 echo "[INFO] Running: $TARGET ($TARGET_CLASS $TARGET_ARGS)"
-exec mvn -q -nsu compile exec:exec -Dcheckstyle.skip=true -DexampleClass="$TARGET_CLASS" -DargLine.example="$TARGET_ARGS"
\ No newline at end of file
+exec java "$bootclasspath" -cp "$jar" "$TARGET_CLASS" $TARGET_ARGS