Changeset 5394

Timestamp:

Aug 25, 2010, 2:48:18 PM (13 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1500: JarClassLoader? should define packages

Location:

trunk/src

Files:

• core/net/sf/basedb/util/JarClassLoader.java (modified) (10 diffs)
• test/TestJarClassLoader.java (modified) (5 diffs)
• test/data/JarPluginManifest.txt (modified) (1 diff)

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

@@ -34 +34 @@
 import java.util.jar.Manifest;
 import java.util.jar.Attributes;
+import java.util.jar.Attributes.Name;
 import java.io.File;
 import java.io.InputStream;
@@ -193 +194 @@
     in the manifest file.
   */
-  private final List<JarInfo> jarFiles;
+  private final Map<File, JarInfo> jarFiles;
   
   /**
@@ -226 +227 @@
     this.delegateFirst = false;
     classPath = new HashMap<String, List<File>>();
-    jarFiles = new ArrayList<JarInfo>();
+    jarFiles = new HashMap<File, JarInfo>();
     loadJarFile(mainJarFile, true);
   }
@@ -244 +245 @@
       throw new ClassNotFoundException(name);
     }
-    byte[] b = loadClassData(files.get(0), name);
-    return defineClass(name, b, 0, b.length);
+    File file = files.get(0);
+    byte[] b = loadClassData(file, name);
+    int i = name.lastIndexOf('.');
+    if (i > 0)
+    {
+      String packageName = name.substring(0, i);
+      Package pkg = getPackage(packageName);
+      if (pkg == null)
+      {
+        JarInfo info = jarFiles.get(file);
+        Manifest mf = info != null ? info.manifest : null;
+        pkg = definePackage(packageName, mf);
+      }
+    }
+    Class<?> clazz = defineClass(name, b, 0, b.length);
+    return clazz;
   }
   
@@ -435 +450 @@
     if (checkSecondary)
     {
-      for (JarInfo info : jarFiles)
+      for (JarInfo info : jarFiles.values())
       {
         File jarFile = info.jarFile;
@@ -476 +491 @@
   {
     log.debug("loadJarFile: file=" + file);
-    jarFiles.add(new JarInfo(file));
+    JarInfo info = new JarInfo(file);
+    jarFiles.put(file, info);
     if (!file.exists() || !file.isFile())
     {
@@ -483 +499 @@
     }
     JarFile jarFile = new JarFile(file);
+    Manifest manifest = jarFile.getManifest();
+    info.manifest = manifest;
     Enumeration<JarEntry> entries = jarFile.entries();
     while (entries.hasMoreElements())
@@ -502 +520 @@
       list.add(file);
     }
-    if (followClassPath)
-    {
-      Manifest manifest = jarFile.getManifest();
-      if (manifest != null)
-      {
-        Attributes attr = manifest.getMainAttributes();
-        if (attr != null)
+    if (followClassPath && manifest != null)
+    {
+      Attributes attr = manifest.getMainAttributes();
+      if (attr != null)
+      {
+        String cp = attr.getValue(Attributes.Name.CLASS_PATH);
+        log.debug("Class path of JAR file '" + file + "': " + cp);
+        if (cp != null)
         {
-          String cp = attr.getValue(Attributes.Name.CLASS_PATH);
-          log.debug("Class path of JAR file '" + file + "': " + cp);
-          if (cp != null)
+          String[] cps = cp.split("\\s+");
+          for (int i = 0; i < cps.length; ++i)
           {
-            String[] cps = cp.split("\\s+");
-            for (int i = 0; i < cps.length; ++i)
+            if (cps[i] != null && !cps[i].trim().equals(""))
             {
-              if (cps[i] != null && !cps[i].trim().equals(""))
-              {
-                loadJarFile(new File(file.getParent(), cps[i]), false);
-              }
+              loadJarFile(new File(file.getParent(), cps[i]), false);
             }
           }
-          if (file == mainJarFile)
-          {
-            delegateFirst = Values.getBoolean(attr.getValue("X-Delegate-First"), delegateFirst);
-          }
+        }
+        if (file == mainJarFile)
+        {
+          delegateFirst = Values.getBoolean(attr.getValue("X-Delegate-First"), delegateFirst);
         }
       }
@@ -581 +595 @@
     }
   }
+  /**
+    Define the package with the given name using information from a 
+    manifest for vendor, title and version. The package should not
+    already exist.
+    @param name The name of the package
+    @param mf An optional manifest
+    @return A package
+    @since 2.16
+  */
+  private Package definePackage(String name, Manifest mf)
+  {
+    String specTitle = null;
+    String specVersion = null;
+    String specVendor = null;
+    String implTitle = null;
+    String implVersion = null;
+    String implVendor = null;
+    if (mf != null)
+    {
+      // Check if attributes are defined for the given package path
+      String path = name.replace('.', '/') + "/";
+      Attributes attr = mf.getAttributes(path);
+      if (attr != null) 
+      {
+        specTitle = attr.getValue(Name.SPECIFICATION_TITLE);
+        specVersion = attr.getValue(Name.SPECIFICATION_VERSION);
+        specVendor = attr.getValue(Name.SPECIFICATION_VENDOR);
+        implTitle = attr.getValue(Name.IMPLEMENTATION_TITLE);
+        implVersion = attr.getValue(Name.IMPLEMENTATION_VERSION);
+        implVendor = attr.getValue(Name.IMPLEMENTATION_VENDOR);
+      }
+      // Check global attributes
+      attr = mf.getMainAttributes();
+      if (attr != null) 
+      {
+          if (specTitle == null) specTitle = attr.getValue(Name.SPECIFICATION_TITLE);
+          if (specVersion == null) specVersion = attr.getValue(Name.SPECIFICATION_VERSION);
+          if (specVendor == null) specVendor = attr.getValue(Name.SPECIFICATION_VENDOR);
+          if (implTitle == null) implTitle = attr.getValue(Name.IMPLEMENTATION_TITLE);
+          if (implVersion == null) implVersion = attr.getValue(Name.IMPLEMENTATION_VERSION);
+          if (implVendor == null) implVendor = attr.getValue(Name.IMPLEMENTATION_VENDOR);
+      }
+    }
+    return definePackage(name, specTitle, specVersion, specVendor, implTitle, implVersion, implVendor, null);
+  }
   
   private Class<?> loadClassInternal(ClassLoader loader, String name)
@@ -609 +668 @@
   {
     final File jarFile;
+    Manifest manifest;
     final boolean existed;
     final long lastModified;

trunk/src/test/TestJarClassLoader.java

@@ -46 +46 @@
     
     test_load("JarPlugin.jar", "JarPlugin", false, true);
-    test_resource("JarPlugin.jar", "JarPluginManifest.txt", false, true);
+    test_resource("JarPlugin.jar", "META-INF/MANIFEST.MF", false, true);
     
     // Test parent delegation
-    test_load("JarPlugin.jar", "org.hibernate.util.FastHashMap", false, true);
+    test_load("JarPlugin.jar", "affymetrix.calvin.exception.CalvinException", false, true);
     test_resource("JarPlugin.jar", "org/hibernate/hibernate-configuration-3.0.dtd", false, false);
     test_unload("JarPlugin.jar");
-    test_load("JarPlugin.jar", "org.hibernate.util.FastHashMap", true, false);
+    test_load("JarPlugin.jar", "affymetrix.calvin.exception.CalvinException", true, false);
     test_resource("JarPlugin.jar", "org/hibernate/hibernate-configuration-3.0.dtd", true, false);
     
@@ -80 +80 @@
         throw new BaseException("Class loaded by incorrect class loader: " + loadedBy);
       }
-      write("--Load class OK");
+      write("--Load class OK (" + className + ")");
     }
     catch (Throwable ex)
     {
-      write("--Load class FAILED");
+      write("--Load class FAILED (" + className + ")");
       ex.printStackTrace();
       ok = false;
@@ -104 +104 @@
         while (line != null)
         {
-          content.append(line);
+          content.append(line).append("\n");
           line = in.readLine();
         }
@@ -115 +115 @@
         if (loadContent) write("Resource content: "+content.toString());
       }
-      write("--Load resource OK");
+      write("--Load resource OK (" + name + ")");
     }
     catch (Throwable ex)
     {
-      write("--Load resource FAILED");
+      write("--Load resource FAILED (" + name + ")");
       ex.printStackTrace();
       ok = false;
@@ -154 +154 @@
     if (!TestUtil.getSilent())
     {
-      write("Object '"+o+"' of class '"+o.getClass().getName()+"' loaded with class loader: " + 
-          o.getClass().getClassLoader());
+      Class c = o.getClass();
+      write("Object '"+o+"' of class '"+c.getName()+"' in package '" + c.getPackage() + 
+          "' loaded with class loader: " + c.getClassLoader());
     }
   }

trunk/src/test/data/JarPluginManifest.txt

@@ -1 @@
-Class-Path: JarPluginAbout.jar ../../lib/dist/hibernate3.jar
+Class-Path: JarPluginAbout.jar 
+ ../../lib/dist/AffxFusion.jar 
+ ../../lib/dist/hibernate3.jar