You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jg...@apache.org on 2012/03/15 22:40:15 UTC
svn commit: r1301215 - in
/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution:
unix-shell/bin/karaf windows-text/bin/start.bat
Author: jgoodyear
Date: Thu Mar 15 21:40:14 2012
New Revision: 1301215
URL: http://svn.apache.org/viewvc?rev=1301215&view=rev
Log:
[KARAF-1268] Allow multiple commands in karaf script
Applying patch supplied, with thanks, by Jon Anstey.
Making start script work as described in user manual.
Modified:
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/start.bat
Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf?rev=1301215&r1=1301214&r2=1301215&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf Thu Mar 15 21:40:14 2012
@@ -316,34 +316,39 @@ init() {
run() {
OPTS="-Dkaraf.startLocalConsole=true -Dkaraf.startRemoteShell=true"
MAIN=org.apache.karaf.main.Main
- case "$1" in
- 'stop')
- MAIN=org.apache.karaf.main.Stop
- shift
- ;;
- 'console')
- shift
- ;;
- 'server')
- OPTS="-Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=true"
- shift
- ;;
- 'client')
- OPTS="-Dkaraf.startLocalConsole=true -Dkaraf.startRemoteShell=false"
- shift
- ;;
- 'clean')
- rm -Rf $KARAF_DATA
- shift
- ;;
- 'debug')
- if [ "x$JAVA_DEBUG_OPTS" = "x" ]; then
- JAVA_DEBUG_OPTS="$DEFAULT_JAVA_DEBUG_OPTS"
- fi
- JAVA_OPTS="$JAVA_DEBUG_OPTS $JAVA_OPTS"
- shift
- ;;
- esac
+ while [ "$1" != "" ]; do
+ case $1 in
+ 'clean')
+ rm -Rf $KARAF_DATA
+ shift
+ ;;
+ 'debug')
+ if [ "x$JAVA_DEBUG_OPTS" = "x" ]; then
+ JAVA_DEBUG_OPTS="$DEFAULT_JAVA_DEBUG_OPTS"
+ fi
+ JAVA_OPTS="$JAVA_DEBUG_OPTS $JAVA_OPTS"
+ shift
+ ;;
+ 'stop')
+ MAIN=org.apache.karaf.main.Stop
+ shift
+ ;;
+ 'console')
+ shift
+ ;;
+ 'server')
+ OPTS="-Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=true"
+ shift
+ ;;
+ 'client')
+ OPTS="-Dkaraf.startLocalConsole=true -Dkaraf.startRemoteShell=false"
+ shift
+ ;;
+ *)
+ break
+ ;;
+ esac
+ done
JAVA_ENDORSED_DIRS="${JAVA_HOME}/jre/lib/endorsed:${JAVA_HOME}/lib/endorsed:${KARAF_HOME}/lib/endorsed"
JAVA_EXT_DIRS="${JAVA_HOME}/jre/lib/ext:${JAVA_HOME}/lib/ext:${KARAF_HOME}/lib/ext"
Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/start.bat
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/start.bat?rev=1301215&r1=1301214&r2=1301215&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/start.bat (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/start.bat Thu Mar 15 21:40:14 2012
@@ -67,7 +67,7 @@ if "%KARAF_BASE%" == "" (
)
:EXECUTE
- start "Karaf" /MIN "%KARAF_HOME%\bin\karaf.bat" server
+ start "Karaf" /MIN "%KARAF_HOME%\bin\karaf.bat" server %*
rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #