Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This closes #140 - environment variables being set on script

This commit is contained in:
Clebert Suconic 2015-03-04 10:00:28 -05:00
parent 6d69055243 9e725457d6
commit 53f56a4190
5 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
distribution/activemq/src/main/resources/bin/activemq
View File

@ -102,7 +102,12 @@ ACTIVEMQ_LOG_MANAGER=org.jboss.logmanager.LogManager
JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M"
# Load Runtime Config
. $ACTIVEMQ_HOME/bin/activemq.conf
if [ -z "$ACTIVEMQ_CONF" ] ; then
ACTIVEMQ_CONF=$ACTIVEMQ_HOME/bin/activemq.conf
else
ACTIVEMQ_CONF="$ACTIVEMQ_CONF"
fi
. $ACTIVEMQ_CONF
JAVA_ARGS="$JAVA_ARGS $ACTIVEMQ_CLUSTER_PROPS -Dactivemq.home=$ACTIVEMQ_HOME -Djava.library.path=$ACTIVEMQ_HOME/bin/lib/linux-i686:$ACTIVEMQ_HOME/bin/lib/linux-x86_64 -Ddata.dir=$ACTIVEMQ_DATA_DIR -Djava.util.logging.manager=$ACTIVEMQ_LOG_MANAGER -Dlogging.configuration=$ACTIVEMQ_LOGGING_CONF $DEBUG_ARGS"

2
distribution/activemq/src/main/resources/bin/activemq.cmd
View File

@ -54,7 +54,7 @@ set ACTIVEMQ_DATA_DIR="%ACTIVEMQ_HOME%\data"
set ACTIVEMQ_LOG_MANAGER=org.jboss.logmanager.LogManager
rem "Load Config"
set ACTIVEMQ_CONF="%ACTIVEMQ_HOME%\bin\activemq.conf.bat"
if "%ACTIVEMQ_CONF%" == "" set ACTIVEMQ_DATA="%ACTIVEMQ_HOME%\bin\activemq.conf.bat"
if exist "%ACTIVEMQ_CONF%" (
call "%ACTIVEMQ_CONF%" %*
) else (

2
distribution/activemq/src/main/resources/bin/activemq.conf
View File

@ -25,7 +25,7 @@ ACTIVEMQ_DATA_DIR=$ACTIVEMQ_HOME/data
ACTIVEMQ_LOG_MANAGER=org.jboss.logmanager.LogManager
# Cluster Properties: Used to pass arguments to ActiveMQ which can be referenced in activemq-configuration.xml
#ACTIVEMQ_CLUSTER_PROPS="-Dactivemq.remoting.netty.port=61618"
#ACTIVEMQ_CLUSTER_PROPS="-Dactivemq.remoting.default.port=61617 -Dactivemq.remoting.amqp.port=5673 -Dactivemq.remoting.stomp.port=61614 -Dactivemq.remoting.hornetq.port=5446"
# Java Opts
JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M"

2
distribution/activemq/src/main/resources/bin/activemq.conf.bat
View File

@ -25,7 +25,7 @@ rem Log manager class
set ACTIVEMQ_LOG_MANAGER=org.jboss.logmanager.LogManager
rem Cluster Properties: Used to pass arguments to ActiveMQ. These can be referenced in activemq-configuration.xml
rem set ACTIVEMQ_CLUSTER_PROPS=-Dactivemq.remoting.default.port=61617
rem set ACTIVEMQ_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=-Xmx1024m

12
docs/user-manual/en/using-server.md
View File

@ -37,6 +37,18 @@ used. The configuration can be changed e.g. by running
`./activemq run -- xml:../config/clustered/bootstrap.xml` or another
config of your choosing.
Environment variables are used to provide ease of changing ports, hosts and
data directories used and can be found in `activemq.conf` on linux and
`activemq.conf.bat` on Windows. A different properties file can be used by
setting the property `ACTIVEMQ_CONF`, on linux this would be:
export ACTIVEMQ_CONF=myenv.env
or on Windows
set ACTIVEMQ_CONF=myenv.env
## Server JVM settings
The run scripts set some JVM settings for tuning the garbage collection