Changeset 11023 for trunk/gsdl3

Timestamp:

2005-12-22T13:28:31+13:00 (18 years ago)

Author:

kjdon

Message:

servlet init params - can now have remote_site_name, remote_site_type, remote_site_address instead of site_name, and a communicator will be set up instead of a message router

File:

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

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

@@ -1 +1 @@
 package org.greenstone.gsdl3;
 
+import org.greenstone.gsdl3.comms.*;
 import org.greenstone.gsdl3.core.*;
 import org.greenstone.gsdl3.util.*;
@@ -40 +41 @@
     /** the cgi stuff - the Receptionist can add new args to this
      * its used by the servlet to determine what args to save */
-    //protected GSCGI cgi = null;
     protected GSParams params = null;
 
@@ -57 +57 @@
     String library_name = config.getInitParameter(GSConstants.LIBRARY_NAME);
     String gsdl3_home = config.getInitParameter(GSConstants.GSDL3_HOME);
-    String site_name = config.getInitParameter(GSConstants.SITE_NAME);
     String interface_name = config.getInitParameter(GSConstants.INTERFACE_NAME);
     this.default_lang = config.getInitParameter(GSConstants.DEFAULT_LANG);
-    if (library_name == null || site_name ==null ||  interface_name ==null) {
+    if (library_name == null || interface_name ==null) {
         // must have this
         System.err.println("initialisation parameters not all set!");
-        System.err.println(" you must have libraryname, sitename,  interfacename");
+        System.err.println(" you must have libraryname and interfacename");
         System.exit(1);
     }
 
+    String site_name = config.getInitParameter(GSConstants.SITE_NAME);
+    String remote_site_name = null;
+    String remote_site_type = null;
+    String remote_site_address = null;
+    
+    if (site_name == null) {
+        // no site, try for communicator
+        remote_site_name = config.getInitParameter("remote_site_name");
+        remote_site_type = config.getInitParameter("remote_site_type");
+        remote_site_address = config.getInitParameter("remote_site_address");
+        if (remote_site_name == null || remote_site_type == null || remote_site_address == null) {
+        System.err.println("initialisation paramters not all set!");
+        System.err.println("if site_name is not set, then you must have remote_site_name, remote_site_type and remote_site_address set");
+        System.exit(1); 
+        }
+    }
+    
     if (this.default_lang == null) {
         // choose english
@@ -75 +91 @@
     
     config_params.put(GSConstants.LIBRARY_NAME, library_name);
-    config_params.put(GSConstants.SITE_NAME, site_name);
     config_params.put(GSConstants.INTERFACE_NAME, interface_name);
-    
+    if (site_name != null) {
+        config_params.put(GSConstants.SITE_NAME, site_name);
+    }
     this.converter = new XMLConverter();
     this.doc = this.converter.newDOM();
-    
-    // now try and create MR and recpt
-    // new message router - create it and pass reference to recept.
-    // the servlet wont use this directly
-    String mr_name = (String)config.getInitParameter("messagerouter_class");
-    MessageRouter message_router = null;
-    if (mr_name == null) { // just use the normal MR
-        message_router = new MessageRouter();
-    } else { // try the specified one
-        try {
-        message_router = (MessageRouter)Class.forName("org.greenstone.gsdl3.core."+mr_name).newInstance();
-        } catch (Exception e) { // cant use this new one, so use normal one
-        System.err.println("LibraryServlet configure exception when trying to use a new MessageRouter "+mr_name+": "+e.getMessage());
-        e.printStackTrace();
-        message_router = new MessageRouter();
-        }   
-    }
-    
-    message_router.setSiteName(site_name);
-    message_router.configure();
     
     // the receptionist -the servlet will talk to this
@@ -115 +112 @@
     }
     this.recept.setConfigParams(config_params);
-    this.recept.setMessageRouter(message_router);
+
+    // the receptionist uses a MessageRouter or Communicator to send its requests to. We either create a MessageRouter here for the designated site (if site_name set), or we create a Communicator for a remote site. The is given to teh Receptionist, and the servlet never talks to it again.directly.
+    if (site_name != null) {
+        String mr_name = (String)config.getInitParameter("messagerouter_class");
+        MessageRouter message_router = null;
+        if (mr_name == null) { // just use the normal MR
+        message_router = new MessageRouter();
+        } else { // try the specified one
+        try {
+            message_router = (MessageRouter)Class.forName("org.greenstone.gsdl3.core."+mr_name).newInstance();
+        } catch (Exception e) { // cant use this new one, so use normal one
+            System.err.println("LibraryServlet configure exception when trying to use a new MessageRouter "+mr_name+": "+e.getMessage());
+            e.printStackTrace();
+            message_router = new MessageRouter();
+        }   
+        }
+        
+        message_router.setSiteName(site_name);
+        message_router.configure();
+        this.recept.setMessageRouter(message_router);
+    } else {
+        // talking to a remote site, create a communicator
+        Communicator communicator = null;
+        // we need to create the XML to configure the communicator
+        Element site_elem = this.doc.createElement(GSXML.SITE_ELEM);
+        site_elem.setAttribute(GSXML.TYPE_ATT, remote_site_type);
+        site_elem.setAttribute(GSXML.NAME_ATT, remote_site_name);
+        site_elem.setAttribute(GSXML.ADDRESS_ATT, remote_site_address);
+
+        if (remote_site_type.equals(GSXML.COMM_TYPE_SOAP_JAVA)) {
+        communicator = new SOAPCommunicator();
+        } else {
+        System.err.println("LibraryServlet.init Error: invalid Communicator type: "+remote_site_type);
+        System.exit(1);
+        }
+        
+        if (!communicator.configure(site_elem)) {
+        System.err.println("LibraryServlet.init Error: Couldn't configure communicator");
+        System.exit(1);
+        }
+        this.recept.setMessageRouter(communicator);
+    }
+    
     // the params arg thingy