You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2014/10/30 20:29:04 UTC
[15/19] git commit: Remove the keepRuntimeFolder call again
Remove the keepRuntimeFolder call again
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c1c75b03
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c1c75b03
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c1c75b03
Branch: refs/heads/master
Commit: c1c75b039df7bd1ca9f11ff21f16593fed0c8c16
Parents: 035154f
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Oct 30 14:33:14 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Oct 30 14:33:14 2014 -0400
----------------------------------------------------------------------
.../test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/c1c75b03/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
index 6efd826..85f2b7d 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
@@ -67,7 +67,6 @@ import static org.ops4j.pax.exam.CoreOptions.when;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
/**
*
@@ -137,7 +136,8 @@ public class CXFOSGiTestSupport {
.name("Apache Karaf")
.useDeployFolder(false)
.unpackDirectory(new File("target/paxexam/")),
- keepRuntimeFolder(),
+ //DO NOT COMMIT WITH THIS LINE ENABLED!!!
+ //org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder(),
features(cxfUrl, "cxf-core", "cxf-jaxws", "cxf-jaxrs"),
systemProperty("java.awt.headless").value("true"),
when(testUtils).useOptions(mavenBundle()