Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@activemq.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: andytaylor@apache.org
To: commits@activemq.apache.org
Date: Wed, 25 Feb 2015 13:30:50 -0000
Message-Id: <abd8d8051fe54266a008f382136bf567@git.apache.org>
Subject: [1/8] activemq-6 git commit: ACTIVEMQ6-82 activemq.conf file for
 runtime opts

Repository: activemq-6
Updated Branches:
  refs/heads/master 323337148 -> e52622cff


ACTIVEMQ6-82 activemq.conf file for runtime opts

Linux support only.  Allows users to define java args and a number of other
runtime configuration parameters outside of the run scripts.  This will
be followed up with support for cmd.


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

Branch: refs/heads/master
Commit: 2b71aa13e863e92d865aa40bde776cee42ad1bb4
Parents: 57d02ab
Author: Martyn Taylor <mtaylor@redhat.com>
Authored: Tue Feb 24 12:08:08 2015 +0000
Committer: Martyn Taylor <mtaylor@redhat.com>
Committed: Tue Feb 24 15:07:05 2015 +0000

----------------------------------------------------------------------
 .../activemq/src/main/resources/bin/activemq    |  4 +--
 .../src/main/resources/bin/activemq.conf        | 34 ++++++++++++++++++++
 2 files changed, 36 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/2b71aa13/distribution/activemq/src/main/resources/bin/activemq
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/bin/activemq b/distribution/activemq/src/main/resources/bin/activemq
index e4ee3da..141f110 100755
--- a/distribution/activemq/src/main/resources/bin/activemq
+++ b/distribution/activemq/src/main/resources/bin/activemq
@@ -95,8 +95,8 @@ for i in `ls $ACTIVEMQ_HOME/lib/*.jar`; do
 	CLASSPATH=$i:$CLASSPATH
 done
 
+source $ACTIVEMQ_HOME/bin/activemq.conf
 
-JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M -Dactivemq.home=$ACTIVEMQ_HOME -Ddata.dir=$ACTIVEMQ_HOME/data -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Dlogging.configuration=file:$ACTIVEMQ_HOME/config/logging.properties -Djava.library.path=$ACTIVEMQ_HOME/bin/lib/linux-i686:$ACTIVEMQ_HOME/bin/lib/linux-x86_64"
-#JAVA_ARGS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005"
+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"
 
 exec "$JAVACMD" $JAVA_ARGS -classpath $CLASSPATH org.apache.activemq.cli.ActiveMQ $@

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/2b71aa13/distribution/activemq/src/main/resources/bin/activemq.conf
----------------------------------------------------------------------
diff --git a/distribution/activemq/src/main/resources/bin/activemq.conf b/distribution/activemq/src/main/resources/bin/activemq.conf
new file mode 100644
index 0000000..e83bb2b
--- /dev/null
+++ b/distribution/activemq/src/main/resources/bin/activemq.conf
@@ -0,0 +1,34 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Path to logging configuration file
+ACTIVEMQ_LOGGING_CONF="file:$ACTIVEMQ_HOME/config/logging.properties"
+
+# Path to data directory
+ACTIVEMQ_DATA_DIR=$ACTIVEMQ_HOME/data
+
+# Log manager class
+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=5447"
+
+# Java Opts
+JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M"
+
+# Debug args: Uncomment to enable debug
+#DEBUG_ARGS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005"