Author: gnodet
Date: Wed Sep 1 16:05:27 2010
New Revision: 991583
URL: http://svn.apache.org/viewvc?rev=991583&view=rev
Log:
KARAF-185: Have a 'clean' parameter on the main shell script to clean the
working folder
Modified:
karaf/trunk/assembly/src/main/distribution/unix-shell/bin/karaf
karaf/trunk/assembly/src/main/distribution/windows-text/bin/karaf.bat
Modified: karaf/trunk/assembly/src/main/distribution/unix-shell/bin/karaf
URL:
http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/distribution/unix-shell/bin/karaf?rev=991583&r1=991582&r2=991583&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/distribution/unix-shell/bin/karaf (original)
+++ karaf/trunk/assembly/src/main/distribution/unix-shell/bin/karaf Wed Sep 1
16:05:27 2010
@@ -325,6 +325,10 @@ run() {
OPTS="-Dkaraf.startLocalConsole=true
-Dkaraf.startRemoteShell=false"
shift
;;
+ 'clean')
+ rm -Rf $KARAF_DATA
+ shift
+ ;;
esac
if $cygwin; then
Modified: karaf/trunk/assembly/src/main/distribution/windows-text/bin/karaf.bat
URL:
http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/distribution/windows-text/bin/karaf.bat?rev=991583&r1=991582&r2=991583&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/distribution/windows-text/bin/karaf.bat
(original)
+++ karaf/trunk/assembly/src/main/distribution/windows-text/bin/karaf.bat Wed
Sep 1 16:05:27 2010
@@ -208,34 +208,42 @@ if "%KARAF_PROFILER%" == "" goto :RUN
SET OPTS=-Dkaraf.startLocalConsole=true -Dkaraf.startRemoteShell=true
SET MAIN=org.apache.karaf.main.Main
SET SHIFT=false
+
+:RUN_LOOP
if "%1" == "stop" goto :EXECUTE_STOP
if "%1" == "console" goto :EXECUTE_CONSOLE
if "%1" == "server" goto :EXECUTE_SERVER
if "%1" == "client" goto :EXECUTE_CLIENT
+ if "%1" == "clean" goto :EXECUTE_CLEAN
goto :EXECUTE
:EXECUTE_STOP
SET MAIN=org.apache.karaf.main.Stop
- SET SHIFT=true
- goto :EXECUTE
+ shift
+ goto :RUN_LOOP
:EXECUTE_CONSOLE
- SET SHIFT=true
- goto :EXECUTE
+ shift
+ goto :RUN_LOOP
:EXECUTE_SERVER
SET OPTS=-Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=true
- SET SHIFT=true
- goto :EXECUTE
+ shift
+ goto :RUN_LOOP
:EXECUTE_CLIENT
SET OPTS=-Dkaraf.startLocalConsole=true -Dkaraf.startRemoteShell=false
- SET SHIFT=true
- goto :EXECUTE
+ shift
+ goto :RUN_LOOP
+
+:EXECUTE_CLEAN
+ rmdir /S /Q %KARAF_DATA%
+ shift
+ goto :RUN_LOOP
+
:EXECUTE
- if "%SHIFT%" == "true" SET ARGS=%2 %3 %4 %5 %6 %7 %8
- if not "%SHIFT%" == "true" SET ARGS=%1 %2 %3 %4 %5 %6 %7 %8
+ SET ARGS=%1 %2 %3 %4 %5 %6 %7 %8
rem Execute the Java Virtual Machine
cd %KARAF_BASE%
"%JAVA%" %JAVA_OPTS% %OPTS% -classpath "%CLASSPATH%"
-Djava.endorsed.dirs="%JAVA_HOME%\jre\lib\endorsed;%JAVA_HOME%\lib\endorsed;%KARAF_HOME%\lib\endorsed"
-Djava.ext.dirs="%JAVA_HOME%\jre\lib\ext;%JAVA_HOME%\lib\ext;%KARAF_HOME%\lib\ext"
-Dkaraf.instances="%KARAF_HOME%\instances" -Dkaraf.home="%KARAF_HOME%"
-Dkaraf.base="%KARAF_BASE%" -Dkaraf.data="%KARAF_DATA%"
-Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties"
%MAIN% %ARGS%
