Changeset 30834

Timestamp:

2016-09-22T12:00:58+12:00 (8 years ago)

Author:

kjdon

Message:

CollectionClassLoader changed to CustomClassLoader

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/ServiceRack.java (modified) (3 diffs)

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

@@ -27 +27 @@
 import org.greenstone.gsdl3.core.MessageRouter;
 import org.greenstone.gsdl3.core.ModuleInterface;
-import org.greenstone.gsdl3.util.CollectionClassLoader;
+import org.greenstone.gsdl3.util.CustomClassLoader;
 import org.greenstone.gsdl3.util.Dictionary;
+import org.greenstone.gsdl3.util.GSFile;
 import org.greenstone.gsdl3.util.GSPath;
 import org.greenstone.gsdl3.util.GSXML;
@@ -100 +101 @@
      * put properties files, dtds etc in here
      */
-    CollectionClassLoader class_loader = null;
+    CustomClassLoader class_loader = null;
 
     /** sets the cluster name */
@@ -185 +186 @@
     {
         // set up the class loader
-        this.class_loader = new CollectionClassLoader(this.getClass().getClassLoader(), this.site_home, this.cluster_name);
+      // this needs modifying if we ever have serviceracks at siteconfig level that want to use class loader
+      this.class_loader = new CustomClassLoader(this.getClass().getClassLoader(), GSFile.collectionResourceDir(this.site_home, this.cluster_name));
         return true;
     }