Changeset 10122

Timestamp:

2005-06-16T13:47:24+12:00 (19 years ago)

Author:

kjdon

Message:

changed some erroneous localsite to @sitename@, use teh web app classloader to find the SOAPServer.cfg file

File:

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

trunk/gsdl3/src/java/org/greenstone/gsdl3/SOAPServer.java.in

@@ -35 +35 @@
  */
 
-public class SOAPServerlocalsite
+public class SOAPServer@sitename@
 {
     private String config_file_name = "SOAPServer.cfg";
@@ -44 +44 @@
   /** The no-args constructor */
     public SOAPServer@sitename@() {
-    // find out gsdl3home
-    URL url = ClassLoader.getSystemResource(config_file_name);
+    // find out gsdl3home - need to use the web app class loader
+    ClassLoader class_loader = this.getClass().getClassLoader();
+    URL url = class_loader.getResource(config_file_name);
     if (url == null) {
         System.err.println("Couldn't find the config file "+config_file_name+". Can't initialise the SOAP server");
@@ -54 +55 @@
         return;
     }
-    String site_home=gsdl3_home+File.separator+"web"+File.separator+"sites"+File.separator+"localsite";
+    String site_home = GSFile.siteHome(gsdl3_home, "@sitename@");
     
     File site_file = new File(site_home);