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 2018/03/28 15:52:05 UTC

[1/2] activemq-artemis git commit: ARTEMIS-1775: Replace wrong env variable ARTEMIS_ETC_INSTANCE with ARTEMIS_INSTANCE_ETC

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 586739ff4 -> ab808106f


ARTEMIS-1775: Replace wrong env variable ARTEMIS_ETC_INSTANCE with ARTEMIS_INSTANCE_ETC


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

Branch: refs/heads/master
Commit: c5ef696dad7f7ee5d20fd45b5e2f80130aa4292b
Parents: 586739f
Author: Benjamin Graf <be...@gmx.net>
Authored: Wed Mar 28 17:40:58 2018 +0200
Committer: Benjamin Graf <be...@gmx.net>
Committed: Wed Mar 28 17:40:58 2018 +0200

----------------------------------------------------------------------
 .../apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c5ef696d/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
index 92747f7..067a795 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
@@ -31,7 +31,7 @@ rem Cluster Properties: Used to pass arguments to ActiveMQ Artemis which can be
 rem set ARTEMIS_CLUSTER_PROPS=-Dactivemq.remoting.default.port=61617 -Dactivemq.remoting.amqp.port=5673 -Dactivemq.remoting.stomp.port=61614 -Dactivemq.remoting.hornetq.port=5446
 
 rem Java Opts
-set JAVA_ARGS=${java-opts} -XX:+PrintClassHistogram -XX:+UseG1GC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M -Xbootclasspath/a:%ARTEMIS_HOME%\lib\${logmanager} -Djava.security.auth.login.config=%ARTEMIS_ETC_INSTANCE%\login.config -Dhawtio.offline="true" -Dhawtio.realm=activemq -Dhawtio.role=${role} -Dhawtio.rolePrincipalClasses=org.apache.activemq.artemis.spi.core.security.jaas.RolePrincipal -Djolokia.policyLocation=%ARTEMIS_INSTANCE_ETC_URI%\jolokia-access.xml -Dartemis.instance=%ARTEMIS_INSTANCE%
+set JAVA_ARGS=${java-opts} -XX:+PrintClassHistogram -XX:+UseG1GC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M -Xbootclasspath/a:%ARTEMIS_HOME%\lib\${logmanager} -Djava.security.auth.login.config=%ARTEMIS_INSTANCE_ETC%\login.config -Dhawtio.offline="true" -Dhawtio.realm=activemq -Dhawtio.role=${role} -Dhawtio.rolePrincipalClasses=org.apache.activemq.artemis.spi.core.security.jaas.RolePrincipal -Djolokia.policyLocation=%ARTEMIS_INSTANCE_ETC_URI%\jolokia-access.xml -Dartemis.instance=%ARTEMIS_INSTANCE%
 
 rem There might be options that you only want to enable on specifc commands, like setting a JMX port
 rem See https://issues.apache.org/jira/browse/ARTEMIS-318


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

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


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

Branch: refs/heads/master
Commit: ab808106fcc257f56cdc1479dc03e516860178e2
Parents: 586739f c5ef696
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Mar 28 11:51:59 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Mar 28 11:51:59 2018 -0400

----------------------------------------------------------------------
 .../apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------