Author: gnodet
Date: Mon Nov 23 16:46:33 2009
New Revision: 883406
URL: http://svn.apache.org/viewvc?rev=883406&view=rev
Log:
FELIX-1887: The stop script can't be used if the user or password has been
changed
Modified:
felix/trunk/karaf/assembly/src/main/distribution/unix-shell/bin/stop
felix/trunk/karaf/assembly/src/main/distribution/windows-text/bin/stop.bat
Modified: felix/trunk/karaf/assembly/src/main/distribution/unix-shell/bin/stop
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/distribution/unix-shell/bin/stop?rev=883406&r1=883405&r2=883406&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/distribution/unix-shell/bin/stop
(original)
+++ felix/trunk/karaf/assembly/src/main/distribution/unix-shell/bin/stop Mon
Nov 23 16:46:33 2009
@@ -270,7 +270,7 @@
KARAF_BASE=`cygpath --path --windows "$KARAF_BASE"`
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
- exec $JAVA $JAVA_OPTS -Dkaraf.home="$KARAF_HOME"
-Dkaraf.base="$KARAF_BASE"
-Djava.util.logging.config.file=$KARAF_BASE/etc/java.util.logging.properties
-jar "$KARAF_HOME/lib/karaf-client.jar" osgi:shutdown
+ exec $JAVA $JAVA_OPTS -Dkaraf.home="$KARAF_HOME"
-Dkaraf.base="$KARAF_BASE"
-Djava.util.logging.config.file=$KARAF_BASE/etc/java.util.logging.properties
-jar "$KARAF_HOME/lib/karaf-client.jar" osgi:shutdown "$@"
}
main() {
Modified:
felix/trunk/karaf/assembly/src/main/distribution/windows-text/bin/stop.bat
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/distribution/windows-text/bin/stop.bat?rev=883406&r1=883405&r2=883406&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/distribution/windows-text/bin/stop.bat
(original)
+++ felix/trunk/karaf/assembly/src/main/distribution/windows-text/bin/stop.bat
Mon Nov 23 16:46:33 2009
@@ -127,32 +127,8 @@
call %KARAF_PROFILER_SCRIPT%
:RUN
- SET OPTS=-Dkaraf.startLocalConsole=true -Dkaraf.startRemoteShell=true
- SET SHIFT=false
- if "%1" == "console" goto :EXECUTE_CONSOLE
- if "%1" == "server" goto :EXECUTE_SERVER
- if "%1" == "client" goto :EXECUTE_CLIENT
- goto :EXECUTE
-
-:EXECUTE_CONSOLE
- SET SHIFT=true
- goto :EXECUTE
-
-:EXECUTE_SERVER
- SET OPTS=-Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=true
- SET SHIFT=true
- goto :EXECUTE
-
-:EXECUTE_CLIENT
- SET OPTS=-Dkaraf.startLocalConsole=true -Dkaraf.startRemoteShell=false
- SET SHIFT=true
- goto :EXECUTE
-
-: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
rem Execute the Java Virtual Machine
- "%JAVA%" %JAVA_OPTS% %OPTS% -classpath "%CLASSPATH%"
-Dkaraf.home="%KARAF_HOME%" -Dkaraf.base="%KARAF_BASE%"
-Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties"
-jar "%KARAF_HOME%\lib\karaf-client.jar" "osgi:shutdown"
+ "%JAVA%" %JAVA_OPTS% %OPTS% -classpath "%CLASSPATH%"
-Dkaraf.home="%KARAF_HOME%" -Dkaraf.base="%KARAF_BASE%"
-Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties"
-jar "%KARAF_HOME%\lib\karaf-client.jar" "osgi:shutdown" %ARGS%
rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
