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 2016/10/04 19:19:40 UTC

[1/2] activemq-artemis git commit: ARTEMIS-750 use JAVA_HOME for Win service

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 6f30076be -> 372fd199d


ARTEMIS-750 use JAVA_HOME for Win service


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/1f3dcf28
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/1f3dcf28
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/1f3dcf28

Branch: refs/heads/master
Commit: 1f3dcf28719ee967e2eabbd9ac146c718ed89dfe
Parents: 6f30076
Author: jbertram <jb...@apache.com>
Authored: Tue Oct 4 12:34:40 2016 -0500
Committer: jbertram <jb...@apache.com>
Committed: Tue Oct 4 12:34:40 2016 -0500

----------------------------------------------------------------------
 .../apache/activemq/artemis/cli/commands/bin/artemis-service.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1f3dcf28/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
index 593a509..6752b11 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
@@ -28,7 +28,7 @@
    <logpath>${artemis.instance}\log</logpath>
    <logmode>roll</logmode>
 
-   <executable>java</executable>
+   <executable>%JAVA_HOME%\bin\java.exe</executable>
    <argument>-Xbootclasspath/a:%ARTEMIS_HOME%\lib\${logmanager}</argument>
    <argument>-XX:+UseParallelGC</argument>
    <argument>-XX:+AggressiveOpts</argument>


[2/2] activemq-artemis git commit: This closes #817

Posted by cl...@apache.org.
This closes #817


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/372fd199
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/372fd199
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/372fd199

Branch: refs/heads/master
Commit: 372fd199ddbea369e607422754d091a010abb1a6
Parents: 6f30076 1f3dcf2
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Oct 4 15:19:31 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Oct 4 15:19:31 2016 -0400

----------------------------------------------------------------------
 .../apache/activemq/artemis/cli/commands/bin/artemis-service.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------