Author: chirino
Date: Tue May  3 17:25:24 2011
New Revision: 1099138

URL: http://svn.apache.org/viewvc?rev=1099138&view=rev
Log:
Source the etc/apollo.profile if it exists.

Modified:
    activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/bin/apollo-broker
    activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/bin/apollo-broker-service

Modified: activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/bin/apollo-broker
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/bin/apollo-broker?rev=1099138&r1=1099137&r2=1099138&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/bin/apollo-broker (original)
+++ activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/bin/apollo-broker Tue May  3 17:25:24 2011
@@ -16,6 +16,18 @@
 # limitations under the License.
 # ------------------------------------------------------------------------
 
+#
+# The following are common variables which control the JVM settings that the
+# broker uses.  Feel free to uncomment and edit as needed or place them
+# in an ${APOLLO_BASE}/etc/apollo.profile file.
+#
+
+#export JVM_FLAGS="-server -Xmx1G"
+#export APOLLO_OPTS="-ea"
+#export APOLLO_DEBUG="true"
+#export APOLLO_PROFILE="true"
+#export JMX_OPTS="-Djava.rmi.server.hostname=127.0.0.1 -Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
+
 if [ -z "$APOLLO_BASE" ] ; then
 
   ## resolve links - $0 may be a link to apollo's home
@@ -50,5 +62,9 @@ if [ -z "$APOLLO_HOME" ] ; then
   APOLLO_HOME=${home}
 fi
 
+if [ -f "${APOLLO_BASE}/etc/apollo.profile" ] ; then
+  . "${APOLLO_BASE}/etc/apollo.profile"
+fi
+
 exec $APOLLO_HOME/bin/apollo $@
 

Modified: activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/bin/apollo-broker-service
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/bin/apollo-broker-service?rev=1099138&r1=1099137&r2=1099138&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/bin/apollo-broker-service (original)
+++ activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/bin/apollo-broker-service Tue May  3 17:25:24 2011
@@ -53,6 +53,10 @@ fi
 
 PID_FILE="${APOLLO_BASE}/data/apollo.pid"
 
+if [ -f "${APOLLO_BASE}/etc/apollo.profile" ] ; then
+  . "${APOLLO_BASE}/etc/apollo.profile"
+fi
+
 status() {
   if [ -f "${PID_FILE}" ] ; then
     pid=`cat "${PID_FILE}"`