Changeset 10297

Timestamp:

2005-07-25T16:26:54+12:00 (19 years ago)

Author:

kjdon

Message:

gsdl3home now comes from globalProperties, not the web.xml file

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/LibraryServlet.java (modified) (3 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/LibraryServlet.java

@@ -60 +60 @@
     String interface_name = config.getInitParameter(GSConstants.INTERFACE_NAME);
     this.default_lang = config.getInitParameter(GSConstants.DEFAULT_LANG);
-    if (library_name == null || gsdl3_home == null || site_name ==null ||  interface_name ==null) {
+    if (library_name == null || site_name ==null ||  interface_name ==null) {
         // must have this
         System.err.println("initialisation parameters not all set!");
-        System.err.println(" you must have libraryname, gsdl3home, sitename,  interfacename");
+        System.err.println(" you must have libraryname, sitename,  interfacename");
         System.exit(1);
     }
@@ -75 +75 @@
     
     config_params.put(GSConstants.LIBRARY_NAME, library_name);
-    config_params.put(GSConstants.GSDL3_HOME, gsdl3_home);
     config_params.put(GSConstants.SITE_NAME, site_name);
     config_params.put(GSConstants.INTERFACE_NAME, interface_name);
@@ -99 +98 @@
     }
     
-    message_router.setSiteHome(GSFile.siteHome(gsdl3_home, 
-                           site_name));
+    message_router.setSiteName(site_name);
     message_router.configure();