Changeset 10088

Timestamp:

2005-06-14T11:10:40+12:00 (19 years ago)

Author:

kjdon

Message:

now keep a reference to the class loader

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/ServiceRack.java (modified) (5 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/ServiceRack.java

@@ -87 +87 @@
     protected HashMap format_info_map = null;
 
+    /** A class loader that knows about the collection resources directory 
+     *  can put properties files, dtds etc  in here */
+    CollectionClassLoader class_loader = null;
+    
     /** sets the cluster name */
     public void setClusterName(String cluster_name) {
@@ -131 +135 @@
      */
     public boolean configure(Element info) {
+    // set up the class loader
+    this.class_loader = new CollectionClassLoader(this.getClass().getClassLoader(), this.site_home, this.cluster_name);
+    
     return configure(info, null);
     }
@@ -349 +356 @@
 
     // we want to use the collection class loader in case there are coll specific files
-    CollectionClassLoader class_loader = new CollectionClassLoader(this.site_home, this.cluster_name);
-    
     if (dictionary != null) {
         // just try the one specified dictionary
-        Dictionary dict = new Dictionary(dictionary, lang, class_loader);
+        Dictionary dict = new Dictionary(dictionary, lang, this.class_loader);
         String result = dict.get(key, args);
         if (result == null) { // not found
@@ -364 +369 @@
     String class_name = this.getClass().getName();
     class_name = class_name.substring(class_name.lastIndexOf('.')+1);
-    Dictionary dict = new Dictionary(class_name, lang, class_loader);
+    Dictionary dict = new Dictionary(class_name, lang, this.class_loader);
     String result = dict.get(key, args);
     if (result != null) {
@@ -379 +384 @@
         break;
         }
-        dict = new Dictionary(class_name, lang, class_loader);
+        dict = new Dictionary(class_name, lang, this.class_loader);
         result = dict.get(key, args);
         c = c.getSuperclass();