svn commit: r1030487 - in /karaf/branches/karaf-2.1.x: assembly/src/main/distribution/unix-shell/bin/karaf assembly/src/main/distribution/windows-text/bin/karaf.bat main/src/main/java/org/apache/karaf/main/Main.java

[gnodet]

Author: gnodet
Date: Wed Nov  3 15:01:48 2010
New Revision: 1030487

URL: http://svn.apache.org/viewvc?rev=1030487&view=rev
Log:
[KARAF-239] Equinox framework extensions do not work anymore when dropped in 
the lib folder

Modified:
    
karaf/branches/karaf-2.1.x/assembly/src/main/distribution/unix-shell/bin/karaf
    
karaf/branches/karaf-2.1.x/assembly/src/main/distribution/windows-text/bin/karaf.bat
    
karaf/branches/karaf-2.1.x/main/src/main/java/org/apache/karaf/main/Main.java

Modified: 
karaf/branches/karaf-2.1.x/assembly/src/main/distribution/unix-shell/bin/karaf
URL: 
http://svn.apache.org/viewvc/karaf/branches/karaf-2.1.x/assembly/src/main/distribution/unix-shell/bin/karaf?rev=1030487&r1=1030486&r2=1030487&view=diff
==============================================================================
--- 
karaf/branches/karaf-2.1.x/assembly/src/main/distribution/unix-shell/bin/karaf 
(original)
+++ 
karaf/branches/karaf-2.1.x/assembly/src/main/distribution/unix-shell/bin/karaf 
Wed Nov  3 15:01:48 2010
@@ -256,7 +256,7 @@ setupDefaults() {
     fi
 
     # Add the jars in the lib dir
-    for file in $KARAF_HOME/lib/*.jar
+    for file in $KARAF_HOME/lib/karaf.jar
     do
         if [ -z "$CLASSPATH" ]; then
             CLASSPATH="$file"

Modified: 
karaf/branches/karaf-2.1.x/assembly/src/main/distribution/windows-text/bin/karaf.bat
URL: 
http://svn.apache.org/viewvc/karaf/branches/karaf-2.1.x/assembly/src/main/distribution/windows-text/bin/karaf.bat?rev=1030487&r1=1030486&r2=1030487&view=diff
==============================================================================
--- 
karaf/branches/karaf-2.1.x/assembly/src/main/distribution/windows-text/bin/karaf.bat
 (original)
+++ 
karaf/branches/karaf-2.1.x/assembly/src/main/distribution/windows-text/bin/karaf.bat
 Wed Nov  3 15:01:48 2010
@@ -186,7 +186,7 @@ if "%KARAF_PROFILER%" == "" goto :KARAF_
 
 rem Setup the classpath
 pushd "%KARAF_HOME%\lib"
-for %%G in (*.*) do call:APPEND_TO_CLASSPATH %%G
+for %%G in (karaf.jar) do call:APPEND_TO_CLASSPATH %%G
 popd
 goto CLASSPATH_END
 

Modified: 
karaf/branches/karaf-2.1.x/main/src/main/java/org/apache/karaf/main/Main.java
URL: 
http://svn.apache.org/viewvc/karaf/branches/karaf-2.1.x/main/src/main/java/org/apache/karaf/main/Main.java?rev=1030487&r1=1030486&r2=1030487&view=diff
==============================================================================
--- 
karaf/branches/karaf-2.1.x/main/src/main/java/org/apache/karaf/main/Main.java 
(original)
+++ 
karaf/branches/karaf-2.1.x/main/src/main/java/org/apache/karaf/main/Main.java 
Wed Nov  3 15:01:48 2010
@@ -886,7 +886,15 @@ public class Main {
             throw new FileNotFoundException(bundleFile.getAbsolutePath());
         }
 
-        URLClassLoader classLoader = new URLClassLoader(new URL[] { 
bundleFile.toURI().toURL() }, Main.class.getClassLoader());
+        List<URL> urls = new ArrayList<URL>();
+        urls.add( bundleFile.toURI().toURL() );
+        for (File f : new File(karafHome, "lib").listFiles()) {
+            if (f.isFile() && f.canRead() && f.getName().endsWith(".jar")) {
+                urls.add(f.toURI().toURL());
+            }
+        }
+
+        URLClassLoader classLoader = new URLClassLoader(urls.toArray(new 
URL[urls.size()]), Main.class.getClassLoader());
         return classLoader;
     }