You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by pi...@apache.org on 2012/02/23 10:18:58 UTC

svn commit: r1292720 - /karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainer.java

Author: pieber
Date: Thu Feb 23 09:18:58 2012
New Revision: 1292720

URL: http://svn.apache.org/viewvc?rev=1292720&view=rev
Log:
[KARAF-1222] Fix problem that console hangs after itests

Signed-off-by: Andreas Pieber <an...@gmail.com>

Modified:
    karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainer.java

Modified: karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainer.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainer.java?rev=1292720&r1=1292719&r2=1292720&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainer.java (original)
+++ karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainer.java Thu Feb 23 09:18:58 2012
@@ -17,6 +17,7 @@
 
 package org.apache.karaf.tooling.exam.container.internal;
 
+import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.editConfigurationFileExtend;
 import static org.ops4j.pax.exam.CoreOptions.options;
 import static org.ops4j.pax.exam.CoreOptions.systemProperty;
 import static org.ops4j.pax.exam.rbc.Constants.RMI_HOST_PROPERTY;
@@ -131,7 +132,8 @@ public class KarafTestContainer implemen
                     systemProperty(RMI_PORT_PROPERTY).value("" + registry.getPort()),
                     systemProperty(RMI_NAME_PROPERTY).value(name),
                     systemProperty(EXAM_INVOKER_PROPERTY).value("junit"),
-                    systemProperty(EXAM_INJECT_PROPERTY).value("true")
+                    systemProperty(EXAM_INJECT_PROPERTY).value("true"),
+                    editConfigurationFileExtend("etc/system.properties", "jline.shutdownhook", "true")
                 ));
             target = new RBCRemoteTarget(name, registry.getPort(), subsystem.getTimeout());