Changeset 18357 for gli/branches/rtl-gli/src/org/greenstone/gatherer/greenstone3/ServletConfiguration.java

Timestamp:

2009-01-12T11:18:13+13:00 (15 years ago)

Author:

kjdon

Message:

updated the rtl-gli branch with files from trunk. Result of a merge 14807:18318

File:

• gli/branches/rtl-gli/src/org/greenstone/gatherer/greenstone3/ServletConfiguration.java (modified) (2 diffs)

gli/branches/rtl-gli/src/org/greenstone/gatherer/greenstone3/ServletConfiguration.java

@@ -70 +70 @@
 
     if (Gatherer.isGsdlRemote){
-        if (RemoteGreenstoneServer.downloadWebXMLFile().equals("")) {
+        if (Gatherer.remoteGreenstoneServer.downloadWebXMLFile().equals("")) {
         System.err.println("Error: Could not download web.xml.");
         System.exit(0);
@@ -89 +89 @@
     this.sites = new ArrayList();
     if (Gatherer.isGsdlRemote){
-        String sites_on_server = RemoteGreenstoneServer.getSiteNames();
+        String sites_on_server = Gatherer.remoteGreenstoneServer.getSiteNames();
         if (sites_on_server.equals("")) {
         // !! Something went wrong : could not get names of the sites