You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2010/12/01 13:28:53 UTC
svn commit: r1040978 - in
/activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin: apollo
apollo.cmd
Author: chirino
Date: Wed Dec 1 12:28:53 2010
New Revision: 1040978
URL: http://svn.apache.org/viewvc?rev=1040978&view=rev
Log:
Simplifying the startup scripts a bit.
Modified:
activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo
activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo.cmd
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=1040978&r1=1040977&r2=1040978&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 Wed Dec 1 12:28:53 2010
@@ -16,22 +16,7 @@
# limitations under the License.
# ------------------------------------------------------------------------
-# load system-wide apollo configuration
-if [ -f "/etc/apollo.conf" ] ; then
- . /etc/apollo.conf
-fi
-
-# provide default values for people who don't use RPMs
-if [ -z "$usejikes" ] ; then
- usejikes=false;
-fi
-
-# load user apollo configuration
-if [ -f "$HOME/.apollorc" ] ; then
- . "$HOME/.apollorc"
-fi
-
-# OS specific support. $var _must_ be set to either true or false.
+# OS specific support.
cygwin=false;
darwin=false;
case "`uname`" in
@@ -44,14 +29,6 @@ case "`uname`" in
esac
if [ -z "$APOLLO_HOME" ] ; then
- # try to find APOLLO
- if [ -d /opt/apollo ] ; then
- APOLLO_HOME=/opt/apollo
- fi
-
- if [ -d "${HOME}/opt/apollo" ] ; then
- APOLLO_HOME="${HOME}/opt/apollo"
- fi
## resolve links - $0 may be a link to apollo's home
PRG="$0"
@@ -73,7 +50,6 @@ if [ -z "$APOLLO_HOME" ] ; then
done
APOLLO_HOME=`dirname "$PRG"`
-
cd "$saveddir"
# make it fully qualified
@@ -138,10 +114,13 @@ if $cygwin; then
JUL_CONFIG_FILE=`cygpath --windows "$JUL_CONFIG_FILE"`
fi
-if [ -z "$APOLLO_OPTS" ] ; then
- APOLLO_OPTS="-server -Xmx1G"
+if [ -z "$JVM_FLAGS" ] ; then
+ JVM_FLAGS="-server -Xmx1G"
+fi
+
+if [ "x$APOLLO_OPTS" != "x" ] ; then
+ JVM_FLAGS="${JVM_FLAGS} ${APOLLO_OPTS}"
fi
-JVM_FLAGS="${APOLLO_OPTS}"
# Optionally enable remote debugging
if [ "x$APOLLO_DEBUG" != "x" ]; then
Modified: activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo.cmd
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo.cmd?rev=1040978&r1=1040977&r2=1040978&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo.cmd (original)
+++ activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo.cmd Wed Dec 1 12:28:53 2010
@@ -53,9 +53,11 @@ rem :NO_LIB_PATCHES
for %%i in ("%APOLLO_HOME%\lib\*.jar") do call :ADD_CLASSPATH %%i
-if "%APOLLO_OPTS%" == "" set APOLLO_OPTS=-server -Xmx1G
+if "%JVM_FLAGS%" == "" set JVM_FLAGS=-server -Xmx1G
-set JVM_FLAGS=%APOLLO_OPTS%
+if "x%APOLLO_OPTS%" == "x" goto noAPOLLO_OPTS
+ set JVM_FLAGS=%JVM_FLAGS% %APOLLO_OPTS%
+:noAPOLLO_OPTS
if "x%APOLLO_DEBUG%" == "x" goto noDEBUG
set JVM_FLAGS=%JVM_FLAGS% -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspEND=n,address=5005