Changeset 10087

Timestamp:

2005-06-14T11:09:41+12:00 (19 years ago)

Author:

kjdon

Message:

can now specify a class loader to use instead of the default - which is the class loader that loaded this class

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/util/GSEntityResolver.java (modified) (2 diffs)

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

@@ -8 +8 @@
 
 // uses a class loader to find entities
+// The class loader to use can be set by setClassLoader(), otherwise it will use the class loader that loaded itself. For the Tomcat webapp, this will be the webapp class loader, not the system class loader. the webapp classloader knows about the classes in the WEB-INF/classes dir, the system classloader knows about the ones on the classpath. The system class loader is a parent to web app classloader, so this will be used as well.
+
 public class GSEntityResolver implements EntityResolver {
 
+    ClassLoader class_loader = null;
+    
+    public void setClassLoader(ClassLoader loader) {
+    this.class_loader = loader;
+    }
+    
     public InputSource resolveEntity (String public_id, String system_id) {
     
@@ -26 +34 @@
         }
     }
-    
-    //System.out.println("using class loader for "+temp_id);
-    URL url = ClassLoader.getSystemResource(temp_id);
+    // try using a class loader
+    if (this.class_loader==null) {
+        this.class_loader = this.getClass().getClassLoader();
+    }
+    URL url = class_loader.getResource(temp_id);
     if (url == null) {
-        //System.out.println("class loader didn't find it");
         return null;
     }
     return new InputSource("file://"+url.getFile());
     }
-
 }