svn commit: r1099139 - /activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo

[ch...@apache.org]

Author: chirino
Date: Tue May  3 17:25:29 2011
New Revision: 1099139

URL: http://svn.apache.org/viewvc?rev=1099139&view=rev
Log:
If the use sets the JVM_FLAGS or JMX_OPTS = "" then, don't use our defaults.

Modified:
    activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo

Modified: activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo?rev=1099139&r1=1099138&r2=1099139&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo (original)
+++ activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo Tue May  3 17:25:29 2011
@@ -128,9 +128,7 @@ if $cygwin; then
   JUL_CONFIG_FILE=`cygpath --windows "$JUL_CONFIG_FILE"`
 fi
 
-if [ -z "$JVM_FLAGS" ] ; then
-  JVM_FLAGS="-server -Xmx1G"
-fi
+JVM_FLAGS="${JVM_FLAGS--server -Xmx1G}"
 
 if [ "x$APOLLO_OPTS" != "x" ] ; then
   JVM_FLAGS="${JVM_FLAGS} ${APOLLO_OPTS}"
@@ -146,11 +144,7 @@ if [ "x$APOLLO_PROFILE" != "x" ]; then
     JVM_FLAGS="-agentlib:yjpagent ${JVM_FLAGS}"
 fi
 
-if [ -z "$JMX_OPTS" ] ; then
-  #JMX_OPTS="-Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
-  JMX_OPTS="-Dcom.sun.management.jmxremote"
-fi
-JVM_FLAGS="${JVM_FLAGS} ${JMX_OPTS}"
+JVM_FLAGS="${JVM_FLAGS} ${JMX_OPTS--Dcom.sun.management.jmxremote}"
 
 SYSTEM_PROPS="-Djava.util.logging.config.file=${JUL_CONFIG_FILE}"
 SYSTEM_PROPS="${SYSTEM_PROPS} -Dapollo.home=${APOLLO_HOME}"