activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbert...@apache.org
Subject [2/2] activemq-artemis git commit: ARTEMIS-1072: moving java-opts to /etc/artemis.profile
Date Tue, 28 Mar 2017 02:59:46 GMT
ARTEMIS-1072: moving java-opts to /etc/artemis.profile


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

Branch: refs/heads/master
Commit: 3c8bf6cd1351a9280a2277b3a4bc731cda90a8ac
Parents: 0db33b7
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Mon Mar 27 14:56:10 2017 -0400
Committer: Justin Bertram <jbertram@apache.org>
Committed: Mon Mar 27 21:59:33 2017 -0500

----------------------------------------------------------------------
 .../resources/org/apache/activemq/artemis/cli/commands/bin/artemis | 2 +-
 .../org/apache/activemq/artemis/cli/commands/etc/artemis.profile   | 2 +-
 .../apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3c8bf6cd/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
index 88713c3..9649744 100755
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
@@ -105,7 +105,7 @@ if [ -z "$LOG_MANAGER" ] ; then
   LOG_MANAGER="$ARTEMIS_HOME/lib/${logmanager}"
 fi
 
-exec "$JAVACMD" ${java-opts} \
+exec "$JAVACMD" \
     $JAVA_ARGS \
     -Xbootclasspath/a:"$LOG_MANAGER" \
     -Djava.security.auth.login.config="$ARTEMIS_INSTANCE/etc/login.config" \

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3c8bf6cd/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 9e90174..5b44b9b 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
@@ -23,7 +23,7 @@ ARTEMIS_INSTANCE='${artemis.instance}'
 
 
 # Java Opts
-JAVA_ARGS="-XX:+PrintClassHistogram -XX:+UseG1GC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods
-Xms512M -Xmx2G"
+JAVA_ARGS="${java-opts} -XX:+PrintClassHistogram -XX:+UseG1GC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods
-Xms512M -Xmx2G"
 
 #
 # There might be options that you only want to enable on specifc commands, like setting a
JMX port

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3c8bf6cd/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 a9c9985..31cb576 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
@@ -23,7 +23,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=-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
${java-opts} -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
-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


Mime
View raw message