Changeset 29728 for main/trunk/greenstone3/src/java/org/greenstone/server/Server3Settings.java

Timestamp:

2015-02-10T18:07:10+13:00 (9 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.

File:

• main/trunk/greenstone3/src/java/org/greenstone/server/Server3Settings.java (modified) (3 diffs)

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());