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/05/03 16:32:05 UTC
[1/2] activemq-artemis git commit: ARTEMIS-1836 Bug with broker when
running on Windows, cannot find login.config
Repository: activemq-artemis
Updated Branches:
refs/heads/master 75c92a364 -> 7bcf71a5d
ARTEMIS-1836 Bug with broker when running on Windows,
cannot find login.config
The Windows variable ARTEMIS_ETC_INSTANCE was not set correctly,
as it was used as ARTEMIS_INSTANCE_ETC. So the fix is to make sure
that the two match, and additionally they it was renamed to more
closely match the other variables naming convention. This was done
in two files; so when 'artemis create mybroker' is run on a Windows
machine, the broker is correctly configured with login.config.
Minor fix of changing use of single quotes to correct usage of
double quotes when declaring variable
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/835245b3
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/835245b3
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/835245b3
Branch: refs/heads/master
Commit: 835245b37bcaae1c88e153ca70c25aa36c15eea0
Parents: 75c92a3
Author: acemanace <37...@users.noreply.github.com>
Authored: Fri Apr 27 15:54:02 2018 -0700
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu May 3 12:24:59 2018 -0400
----------------------------------------------------------------------
.../apache/activemq/artemis/cli/commands/etc/artemis.profile | 1 +
.../activemq/artemis/cli/commands/etc/artemis.profile.cmd | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/835245b3/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
index 5f83be8..4c5162d 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
@@ -18,6 +18,7 @@
ARTEMIS_HOME='${artemis.home}'
ARTEMIS_INSTANCE='${artemis.instance}'
ARTEMIS_DATA_DIR='${artemis.instance.data}'
+ARTEMIS_ETC_DIR='${artemis.instance.etc}'
# The logging config will need an URI
# this will be encoded in case you use spaces or special characters
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/835245b3/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 5d579c3..e243348 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
@@ -18,8 +18,8 @@ rem under the License.
set ARTEMIS_HOME="${artemis.home}"
set ARTEMIS_INSTANCE="${artemis.instance}"
-set ARTEMIS_ETC_INSTANCE='${artemis.instance.etc}'
-set ARTEMIS_DATA_DIR='${artemis.instance.data}'
+set ARTEMIS_DATA_DIR="${artemis.instance.data}"
+set ARTEMIS_ETC_DIR="${artemis.instance.etc}"
rem The logging config will need an URI
@@ -32,7 +32,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 -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%
+set JAVA_ARGS=${java-opts} -XX:+PrintClassHistogram -XX:+UseG1GC -XX:+AggressiveOpts -Xms512M -Xmx1024M -Xbootclasspath/a:%ARTEMIS_HOME%\lib\${logmanager} -Djava.security.auth.login.config=%ARTEMIS_ETC_DIR%\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 #2051
Posted by cl...@apache.org.
This closes #2051
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/7bcf71a5
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/7bcf71a5
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/7bcf71a5
Branch: refs/heads/master
Commit: 7bcf71a5d61269ccdf9e3d7a54493821b59e3947
Parents: 75c92a3 835245b
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu May 3 12:25:00 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu May 3 12:25:00 2018 -0400
----------------------------------------------------------------------
.../apache/activemq/artemis/cli/commands/etc/artemis.profile | 1 +
.../activemq/artemis/cli/commands/etc/artemis.profile.cmd | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------