Changeset 10086

Timestamp:

2005-06-14T11:08:36+12:00 (19 years ago)

Author:

kjdon

Message:

class loader now takes a parent class loader as a constructor arg - the webapp classes are loaded by a different class loader than the system class loader.

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/util/CollectionClassLoader.java (modified) (3 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/util/CollectionClassLoader.java

@@ -23 +23 @@
 
 /** Looks for classes/resources in the collection resources directory 
-    The base class will be the class returned by getSystemClassLoader()
  */
 public class CollectionClassLoader
@@ -29 +28 @@
 
     String base_dir = null;
-    public CollectionClassLoader(String site_home, String collection_name) {
+    public CollectionClassLoader(ClassLoader parent, String site_home, String collection_name) {
+    super(parent);
     this.base_dir = GSFile.collectionResourceDir(site_home, collection_name);
     } 
-    public URL getResource(String name) {
+
+    public URL findResource(String name) {
     File resource_path = new File(this.base_dir, name);
     try {
@@ -39 +40 @@
         }
     } catch (Exception e) {};
-    
-    return super.getResource(name);
+
+    return super.findResource(name);
     }
 }