You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/05/19 01:01:07 UTC
[1/2] activemq-artemis git commit: Ignores %PATH/java,
use $JAVA_HOME/bin/java instead
Repository: activemq-artemis
Updated Branches:
refs/heads/master 3b7ac292c -> 318595d64
Ignores %PATH/java, use $JAVA_HOME/bin/java instead
Deduce `java` executable from current "java.home" property to spawn
processes for test purposes.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/351b1cba
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/351b1cba
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/351b1cba
Branch: refs/heads/master
Commit: 351b1cba5da69ea4962c1df7be287edfe7c0df2c
Parents: 3b7ac29
Author: Thiago Kronig <ca...@uolinc.com>
Authored: Thu May 14 09:36:26 2015 -0300
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon May 18 19:00:29 2015 -0400
----------------------------------------------------------------------
.../org/apache/activemq/artemis/tests/util/SpawnedVMSupport.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/351b1cba/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/util/SpawnedVMSupport.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/util/SpawnedVMSupport.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/util/SpawnedVMSupport.java
index 418fe5c..7bce57c 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/util/SpawnedVMSupport.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/util/SpawnedVMSupport.java
@@ -20,6 +20,7 @@ import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.nio.file.Paths;
import java.util.List;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
@@ -70,7 +71,8 @@ public final class SpawnedVMSupport
final String... args) throws Exception
{
ProcessBuilder builder = new ProcessBuilder();
- builder.command("java", memoryArg1, memoryArg2, "-cp", System.getProperty("java.class.path"));
+ final String javaPath = Paths.get(System.getProperty("java.home"), "bin", "java").toAbsolutePath().toString();
+ builder.command(javaPath, memoryArg1, memoryArg2, "-cp", System.getProperty("java.class.path"));
List<String> commandList = builder.command();
[2/2] activemq-artemis git commit: This closes #264 on $java.home on
tests
Posted by cl...@apache.org.
This closes #264 on $java.home on tests
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/318595d6
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/318595d6
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/318595d6
Branch: refs/heads/master
Commit: 318595d648e23b7b8f51a4ac7aa441441b9a4736
Parents: 3b7ac29 351b1cb
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon May 18 19:00:42 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon May 18 19:00:42 2015 -0400
----------------------------------------------------------------------
.../org/apache/activemq/artemis/tests/util/SpawnedVMSupport.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------