From 37c3344253f831b16925b0ff19061f2f98a4b06e Mon Sep 17 00:00:00 2001
From: Sean Flanigan <sflaniga@redhat.com>
Date: Wed, 18 Feb 2015 18:07:20 +1000
Subject: [PATCH] Avoid debug config when stopping cargo

This should prevent the following error at the end of test run:

[INFO] [talledLocalContainer] FATAL ERROR in native method: JDWP No transports initialized, jvmtiError=AGENT_ERROR_TRANSPORT_INIT(197)
[WARNING] [talledLocalContainer] ERROR: transport error 202: bind failed: Address already in use
[WARNING] [talledLocalContainer] ERROR: JDWP Transport dt_socket failed to initialize, TRANSPORT_INIT(510)
[WARNING] [talledLocalContainer] JDWP exit error AGENT_ERROR_TRANSPORT_INIT(197): No transports initialized [../../../src/share/back/debugInit.c:741]
---
 functional-test/pom.xml | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/functional-test/pom.xml b/functional-test/pom.xml
index 9d5f13bc81..1334cd29c6 100644
--- a/functional-test/pom.xml
+++ b/functional-test/pom.xml
@@ -587,6 +587,33 @@
                 <goals>
                   <goal>start</goal>
                 </goals>
+                <configuration>
+                  <configuration>
+                    <properties>
+                      <cargo.jvmargs>
+                        <!-- NB: JDom parser doesn't like comments starting with '-' -->
+                        -XX:PermSize=512m -XX:MaxPermSize=1024
+                        -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled
+                        ${cargo.debug.jvm.args}
+                      </cargo.jvmargs>
+                    </properties>
+                  </configuration>
+                </configuration>
+              </execution>
+              <execution>
+                <id>default-cli</id>
+                <configuration>
+                  <configuration>
+                    <properties>
+                      <cargo.jvmargs>
+                        <!-- NB: JDom parser doesn't like comments starting with '-' -->
+                        -XX:PermSize=512m -XX:MaxPermSize=1024
+                        -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled
+                        ${cargo.debug.jvm.args}
+                      </cargo.jvmargs>
+                    </properties>
+                  </configuration>
+                </configuration>
               </execution>
               <execution>
                 <id>cargo-stop</id>
@@ -912,12 +939,6 @@
 
             <properties>
               <cargo.jboss.configuration>standalone</cargo.jboss.configuration>
-              <cargo.jvmargs>
-                <!-- NB: JDom parser doesn't like comments starting with '-' -->
-                -XX:PermSize=512m -XX:MaxPermSize=1024
-                -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled
-                ${cargo.debug.jvm.args}
-              </cargo.jvmargs>
               <cargo.port.offset>${cargo.port.offset}</cargo.port.offset>
               <cargo.jboss.ajp.port>8109</cargo.jboss.ajp.port>
             </properties>