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

Timestamp:

2012-07-16T17:47:34+12:00 (12 years ago)

Author:

ak19

Message:

gsdl3.home no longer exists as a property in global.properties. This had broken gs3-server.sh, but now it defaults to the usual GSDL3SRCHOME/web folder if there is no gsdl3.home property.

File:

• main/trunk/greenstone3/src/java/org/greenstone/server/Server3Settings.java (modified) (1 diff)

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

@@ -39 +39 @@
     servlet_combobox.setBackground(bg_color);
 
-    File web_xml = new File(GlobalProperties.getProperty(BaseServer.Property.GSDL_HOME) + File.separator + "WEB-INF" + File.separator + "web.xml");
+    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);