You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by pi...@apache.org on 2011/01/06 18:53:08 UTC
svn commit: r1055962 - in
/karaf/trunk/assembly/src/main/filtered-resources/bin: shell shell.bat
Author: pieber
Date: Thu Jan 6 17:53:08 2011
New Revision: 1055962
URL: http://svn.apache.org/viewvc?rev=1055962&view=rev
Log:
[KARAF-357] fixed bin/shell scripts for linux and windows
Modified:
karaf/trunk/assembly/src/main/filtered-resources/bin/shell
karaf/trunk/assembly/src/main/filtered-resources/bin/shell.bat
Modified: karaf/trunk/assembly/src/main/filtered-resources/bin/shell
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/bin/shell?rev=1055962&r1=1055961&r2=1055962&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/bin/shell (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/bin/shell Thu Jan 6 17:53:08 2011
@@ -295,7 +295,7 @@ run() {
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
- exec $JAVA $JAVA_OPTS -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Djava.util.logging.config.file=$KARAF_BASE/etc/java.util.logging.properties $KARAF_OPTS $OPTS -classpath "$CLASSPATH" org.apache.karaf.shell.console.Main --classpath=system "$@"
+ exec $JAVA $JAVA_OPTS -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Djava.util.logging.config.file=$KARAF_BASE/etc/java.util.logging.properties $KARAF_OPTS $OPTS -classpath "$CLASSPATH" org.apache.karaf.shell.console.Main --classpath="$KARAF_HOME/system" "$@"
}
main() {
Modified: karaf/trunk/assembly/src/main/filtered-resources/bin/shell.bat
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/bin/shell.bat?rev=1055962&r1=1055961&r2=1055962&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/bin/shell.bat (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/bin/shell.bat Thu Jan 6 17:53:08 2011
@@ -81,14 +81,14 @@ if "%KARAF_DEBUG%" == "" goto :KARAF_DEB
call :warn Enabling Java debug options: %JAVA_DEBUG_OPTS%
:KARAF_DEBUG_END
-set CLASSPATH=%KARAF_HOME%\system\org\apache\karaf\shell\org.apache.karaf.shell.console\${project.version}\org.apache.karaf.shell.console-${project.version}.jar"
-set CLASSPATH=%CLASSPATH#:%KARAF_HOME%\system\org\ops4j\pax\logging\pax-logging-api/${pax.logging.version}/pax-logging-api-${pax.logging.version}.jar"
+set CLASSPATH=%KARAF_HOME%\system\org\apache\karaf\shell\org.apache.karaf.shell.console\${project.version}\org.apache.karaf.shell.console-${project.version}.jar
+set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\ops4j\pax\logging\pax-logging-api\${pax.logging.version}\pax-logging-api-${pax.logging.version}.jar
: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
+ 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.instances="%KARAF_HOME%\instances" -Dkaraf.home="%KARAF_HOME%" -Dkaraf.base="%KARAF_BASE%" -Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties" %KARAF_OPTS% org.apache.karaf.shell.console.Main --classpath=system %ARGS%
+ "%JAVA%" %JAVA_OPTS% %OPTS% -classpath "%CLASSPATH%" -Dkaraf.instances="%KARAF_HOME%\instances" -Dkaraf.home="%KARAF_HOME%" -Dkaraf.base="%KARAF_BASE%" -Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties" %KARAF_OPTS% org.apache.karaf.shell.console.Main --classpath="%KARAF_HOME%\system" %ARGS%
rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #