Changeset 3760

Timestamp:

Sep 20, 2007, 1:35:57 PM (16 years ago)

Author:

Martin Svensson

Message:

Fixes #364, Uses the existing JarClassLoader?, when reading/loading jar-files instead of an internal class

Location:

trunk/src/core/net/sf/basedb/util

Files:

• JarClassLoader.java (modified) (1 diff)
• PluginInfo.java (modified) (3 diffs)

trunk/src/core/net/sf/basedb/util/JarClassLoader.java

@@ -121 +121 @@
     }
     return cl;
+  }
+  
+  
+  /**
+    Get a new class loader for the specified jar file.  
+      @param jarPath The path to the jar file
+      @return A class loader object
+      @throws IOException If the jar file can't be loaded
+  */
+  public static final ClassLoader newInstance(String jarPath)
+    throws IOException
+  {
+    return new JarClassLoader(jarPath);
   }
   

trunk/src/core/net/sf/basedb/util/PluginInfo.java

@@ -139 +139 @@
       Element rootElement = XMLUtil.getValidatedXML(is , installDtdURL, null).getRootElement();
       String jarname = rootElement.getAttributeValue("jarname");
-      JarReader jarReader = JarReader.getNewInstance(jar);
+      ClassLoader jarLoader = JarClassLoader.newInstance(jarFile.getPath());
       if (!jarname.equalsIgnoreCase(jarFile.getName()))
       {
@@ -156 +156 @@
         boolean hasConfigs = (configElement != null) && configElement.equals(hasConfigsValue);
                 
-        Class c = jarReader.loadClass(classname);       
+        Class c = jarLoader.loadClass(classname);       
         if (versionCompatible(baseVersion) && Plugin.class.isAssignableFrom(c))
         {     
@@ -272 +272 @@
     return majorCompatible && minorCompatible;
   }
-    
-  /**
-    A private class to get information about plugin classes 
-    inside a jar file.
-      @author Martin
-      @version 2.5
-   */
-  private static class JarReader 
-    extends ClassLoader
-  {
-    /**
-      The jar file for this reader.
-     */
-    private JarFile jar;
-      
-    /**
-        @param jar The jar file that should be read
-     */
-    private JarReader(JarFile jar)
-    {
-      super(Thread.currentThread().getContextClassLoader());
-      this.jar = jar;     
-    }
-    
-    private static JarReader getNewInstance (JarFile jarFile)
-    {
-      return new JarReader(jarFile);
-    }
-    
-    /*
-      (non-Javadoc)
-        @see java.lang.ClassLoader#findClass(java.lang.String)
-    */
-    protected Class<?> findClass(String name) 
-      throws ClassNotFoundException
-    {
-      byte[] b;
-      try
-      {
-        InputStream in = null;
-        JarEntry jarEntry = jar.getJarEntry(classNameToPath(name));
-        if (jarEntry == null)
-        {
-          throw new ClassNotFoundException(name+" in file "+jar.getName());
-        }
-        in = jar.getInputStream(jarEntry);
-        b = new byte[(int)jarEntry.getSize()];
-        in.read(b, 0, b.length);        
-      }     
-      catch(IOException ex)
-      {
-        throw new ClassNotFoundException(name, ex);
-      }     
-      return defineClass(name, b, 0, b.length);
-    }
-    
-    /**
-      Convert a class name to a file path. Ie. replace dots with slahses and add .class
-      to the end: net.sf.basedb.util.JarClassLoader -> net/sf/basedb/util/JarClassLoader.class
-    */
-    private String classNameToPath(String className)
-    {
-      return className.replaceAll("\\.", "/")+".class";
-    }
-  }
 }