Changeset 29728

Timestamp:

2015-02-10T18:07:10+13:00 (8 years ago)

Author:

ak19

Message:

Adjusting gs3-server code to work with changes made to 29686 where web.xml was split into web.xml and servlets.xml, with the first including the second.

Location:

main/trunk/greenstone3/src/java/org/greenstone

Files:

• gsdl3/util/GSEntityResolver.java (modified) (2 diffs)
• gsdl3/util/XMLConverter.java (modified) (1 diff)
• server/Server3Settings.java (modified) (3 diffs)

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

@@ -33 +33 @@
 
     ClassLoader class_loader = null;
+    File baseFilepath = null;
     
      static Logger logger = Logger.getLogger(org.greenstone.gsdl3.util.GSEntityResolver.class.getName());
+
+    public GSEntityResolver() {}
+
+    public GSEntityResolver(File baseFilepath) {
+    this.baseFilepath = baseFilepath;
+    }
+
+    /* Methods with the ClassLoader parameter are unused at present */
+    public GSEntityResolver(ClassLoader loader) {
+    this.class_loader = loader;
+    }
 
     public void setClassLoader(ClassLoader loader) {
@@ -56 +68 @@
         }
     }
+    
+    // use the baseFilepath, if one was provided
+    if(this.baseFilepath != null) {
+        return new InputSource("file://" + this.baseFilepath + File.separator + temp_id);
+    }
+
     // try using a class loader
     if (this.class_loader==null) {

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/XMLConverter.java

@@ -159 +159 @@
     return null;
     }
+
+  public static Document getDOM(File in, EntityResolver er) {
+    
+    try {      
+      InputSource xml_source = new InputSource(new FileInputStream(in));
+      Document doc = getDOM(xml_source, er);      
+      return doc;      
+    }
+    catch (Exception e)
+      {
+    logger.error(e.getMessage());
+      }
+    return null;
+  }
 
   public static Document getDOM(InputSource source, EntityResolver er) {

main/trunk/greenstone3/src/java/org/greenstone/server/Server3Settings.java

@@ -4 +4 @@
 import java.awt.event.*;
 import java.io.File;
+import java.io.FileInputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -9 +10 @@
 
 import org.w3c.dom.*;
+import org.xml.sax.InputSource;
 
 import org.greenstone.util.ScriptReadWrite;
 
 import org.greenstone.util.GlobalProperties;
+import org.greenstone.gsdl3.util.GSEntityResolver;
 import org.greenstone.gsdl3.util.GSXML;
 import org.greenstone.gsdl3.util.XMLConverter;
@@ -41 +44 @@
     File web_xml = new File(GlobalProperties.getGSDL3Home() + File.separator + "WEB-INF" + File.separator + "web.xml");
     XMLConverter converter = new XMLConverter();
-    Document web_config = converter.getDOM(web_xml);
+    // web.xml now includes the new file servlets.xml which defines entities used therein
+    // So when loading web.xml's DOM, need to resolve entities in web.xml. And for this, 
+    // need to instruct the entity resolver to load included files relative to web.xml's location
+    Document web_config = converter.getDOM(web_xml, new GSEntityResolver(web_xml.getParentFile())); 
     if (web_config == null) {
         logger.error("web.xml is null! "+web_xml.getAbsolutePath());