Changeset 30838
- Timestamp:
- 2016-09-22T12:05:14+12:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/Collection.java
r30670 r30838 33 33 import org.apache.log4j.Logger; 34 34 import org.greenstone.gsdl3.core.ModuleInterface; 35 import org.greenstone.gsdl3.util.C ollectionClassLoader;35 import org.greenstone.gsdl3.util.CustomClassLoader; 36 36 import org.greenstone.gsdl3.util.Dictionary; 37 37 import org.greenstone.gsdl3.util.GSFile; … … 89 89 * put properties files, dtds etc in here 90 90 */ 91 CollectionClassLoader class_loader = null;91 //CustomClassLoader class_loader = null; 92 92 93 93 /** same as setClusterName */ … … 121 121 } 122 122 // set up the class loader 123 this.class_loader = new C ollectionClassLoader(this.getClass().getClassLoader(), this.site_home, this.cluster_name);123 this.class_loader = new CustomClassLoader(this.getClass().getClassLoader(), GSFile.collectionResourceDir(this.site_home, this.cluster_name)); 124 124 125 125 macro_resolver.addMacro("_httpcollection_", this.site_http_address + "/collect/" + this.cluster_name); … … 919 919 } 920 920 921 // override this to use collection class loader922 protected String getTextString(String key, String lang, String dictionary, String[] args)923 {924 Dictionary dict = new Dictionary(dictionary, lang, this.class_loader);925 String result = dict.get(key, args);926 if (result == null)927 { // not found928 //return "_" + key + "_";929 return null;930 }931 return result;932 }933 921 934 922 }
Note:
See TracChangeset
for help on using the changeset viewer.