Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fix bin/shell scripts

git-svn-id: https://svn.apache.org/repos/asf/karaf/trunk@989802 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
commit 82a007cdd506acbd9cb1f871fd520316c2c30136 1 parent 4340b7d
Guillaume Nodet authored August 26, 2010
13  assembly/src/main/filtered-resources/bin/shell
@@ -244,15 +244,10 @@ setupDefaults() {
244 244
         fi
245 245
     fi
246 246
 
247  
-    # Add the jars in the lib dir
248  
-    for file in $KARAF_HOME/lib/*.jar
249  
-    do
250  
-        if [ -z "$CLASSPATH" ]; then
251  
-            CLASSPATH="$file"
252  
-        else
253  
-            CLASSPATH="$CLASSPATH:$file"
254  
-        fi
255  
-    done
  247
+    # Setup classpath
  248
+    CLASSPATH="$KARAF_HOME/system/org/apache/karaf/shell/org.apache.karaf.shell.console/${project.version}/org.apache.karaf.shell.console-${project.version}.jar"
  249
+    CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/ops4j/pax/logging/pax-logging-api/${pax.logging.version}/pax-logging-api-${pax.logging.version}.jar"
  250
+
256 251
     DEFAULT_JAVA_DEBUG_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005"
257 252
 
258 253
     ##
3  assembly/src/main/filtered-resources/bin/shell.bat
@@ -81,7 +81,8 @@ if "%KARAF_DEBUG%" == "" goto :KARAF_DEBUG_END
81 81
     call :warn Enabling Java debug options: %JAVA_DEBUG_OPTS%
82 82
 :KARAF_DEBUG_END
83 83
 
84  
-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
  84
+set CLASSPATH=%KARAF_HOME%\system\org\apache\karaf\shell\org.apache.karaf.shell.console\${project.version}\org.apache.karaf.shell.console-${project.version}.jar"
  85
+set CLASSPATH=%CLASSPATH#:%KARAF_HOME%\system\org\ops4j\pax\logging\pax-logging-api/${pax.logging.version}/pax-logging-api-${pax.logging.version}.jar"
85 86
 
86 87
 :EXECUTE
87 88
     if "%SHIFT%" == "true" SET ARGS=%2 %3 %4 %5 %6 %7 %8

0 notes on commit 82a007c

Please sign in to comment.
Something went wrong with that request. Please try again.