You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2017/01/26 20:09:50 UTC

svn commit: r1780466 - /sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java

Author: olli
Date: Thu Jan 26 20:09:49 2017
New Revision: 1780466

URL: http://svn.apache.org/viewvc?rev=1780466&view=rev
Log:
use PathUtils for unpackDirectory

Modified:
    sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java

Modified: sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java?rev=1780466&r1=1780465&r2=1780466&view=diff
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java Thu Jan 26 20:09:49 2017
@@ -28,6 +28,7 @@ import org.apache.karaf.features.BootFin
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
 import org.ops4j.pax.exam.util.Filter;
+import org.ops4j.pax.exam.util.PathUtils;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
@@ -128,12 +129,13 @@ public abstract class KarafTestSupport {
         final int rmiServerPort = findFreePort();
         final int sshPort = findFreePort();
         final int httpPort = findFreePort();
+        final String unpackDirectory = String.format("%s/target/paxexam/%s", PathUtils.getBaseDir(), getClass().getSimpleName());
         return options(
             karafDistributionConfiguration()
                 .frameworkUrl(maven().groupId(karafGroupId()).artifactId(karafArtifactId()).versionAsInProject().type("tar.gz"))
                 .useDeployFolder(false)
                 .name(karafName())
-                .unpackDirectory(new File("target/paxexam/" + getClass().getSimpleName())),
+                .unpackDirectory(new File(unpackDirectory)),
             keepRuntimeFolder(),
             editConfigurationFilePut("etc/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.config", "whitelist.bundles.regexp", "^PAXEXAM.*$"),
             editConfigurationFilePut("etc/org.ops4j.pax.logging.cfg", "log4j2.rootLogger.level", "DEBUG"),