Author: gnodet
Date: Thu Aug 26 16:09:41 2010
New Revision: 989802
URL: http://svn.apache.org/viewvc?rev=989802&view=rev
Log:
Fix bin/shell scripts
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=989802&r1=989801&r2=989802&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/bin/shell (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/bin/shell Thu Aug 26
16:09:41 2010
@@ -244,15 +244,10 @@ setupDefaults() {
fi
fi
- # Add the jars in the lib dir
- for file in $KARAF_HOME/lib/*.jar
- do
- if [ -z "$CLASSPATH" ]; then
- CLASSPATH="$file"
- else
- CLASSPATH="$CLASSPATH:$file"
- fi
- done
+ # Setup classpath
+
CLASSPATH="$KARAF_HOME/system/org/apache/karaf/shell/org.apache.karaf.shell.console/${project.version}/org.apache.karaf.shell.console-${project.version}.jar"
+
CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/ops4j/pax/logging/pax-logging-api/${pax.logging.version}/pax-logging-api-${pax.logging.version}.jar"
+
DEFAULT_JAVA_DEBUG_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005"
##
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=989802&r1=989801&r2=989802&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/bin/shell.bat (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/bin/shell.bat Thu Aug 26
16:09:41 2010
@@ -81,7 +81,8 @@ 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;%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
