Changeset 3505

Timestamp:

2002-10-29T16:21:14+13:00 (22 years ago)

Author:

kjdon

Message:

Communicator more general now, Communicators are configured using the <site> element from teh config file of whoever is loading sites - now all types of Communicators should have the same construction method:
comm = new XXXCommunicator();
comm.configure(elem);
comm.setLocalSiteName(name);

Location:

trunk/gsdl3/src/java/org/greenstone/gsdl3

Files:

• comms/Communicator.java (modified) (2 diffs)
• comms/SOAPCommunicator.java (modified) (4 diffs)
• core/MessageRouter.java (modified) (1 diff)

trunk/gsdl3/src/java/org/greenstone/gsdl3/comms/Communicator.java

@@ -33 +33 @@
     implements ModuleInterface {
 
-    /** home directory of local site */
-    protected String site_home_=null;
     /** name of local site */
     protected String local_site_name_ = null;
+
     /** name of site to connect to */
-    protected String connection_name_=null;
-    /** address of site to connect to */
-    protected String connection_address_=null;
+    protected String remote_site_name_=null;
+
     /** converter for String to DOM and vice versa */
     protected XMLConverter converter_= null;
@@ -47 +45 @@
     converter_ = new XMLConverter();
     }
-    public void setSiteHome(String home) {
-    site_home_ = home;
-    }
-    public void setSiteName(String name) {
+
+    public void setLocalSiteName(String name) {
     local_site_name_ = name;
     }
-
-    public void setConnectionName(String name) {
-    connection_name_=name;
+    /** this should be done as part of configure */
+    public void setRemoteSiteName(String name) {
+    remote_site_name_ = name;
     }
-
-    // format of address depends on connection type
-    public void setConnectionAddress(String address){
-    connection_address_ = address;
-    }
- 
-    abstract public boolean configure(); 
+    /** configures the Communicator using the <site> element */
+    abstract public boolean configure(Element site_elem); 
 
     abstract public String process(String xml_in); 

trunk/gsdl3/src/java/org/greenstone/gsdl3/comms/SOAPCommunicator.java

@@ -48 +48 @@
     extends Communicator {
 
+    /** address of site to connect to */
+    protected String remote_site_address_=null;
+
     /** the call object that does the SOAP talking */
     private Call call_ = null;
@@ -60 +63 @@
     call_.setEncodingStyleURI(Constants.NS_URI_LITERAL_XML);
     }
-    
-    public void setConnectionName(String name) {
-    System.out.println("name="+name);
-    connection_name_ = name;
-    // Set Object URI and Method Name
-    call_.setTargetObjectURI (name);
-    call_.setMethodName ("process"); // everything uses process
-    }
-    
-    public boolean configure() {
+        
+    public boolean configure(Element site_elem) {
+
+    String type = site_elem.getAttribute("type");
+    if (!type.equals("soap")) {
+        System.err.println("SOAPCommunicator: wrong type of site");
+        return false;
+    }
+    remote_site_name_ = site_elem.getAttribute("name");
+    remote_site_address_ = site_elem.getAttribute("address");
+    if (remote_site_name_==null || remote_site_name_.equals("")) {
+        System.err.println("SOAPCommunicator: must have name attribute in site element");
+        return false;
+    }
+    if (remote_site_address_==null || remote_site_address_.equals("")) {
+        System.err.println("SOAPCommunicator: must have address attribute in site element");
+        return false;
+    }
+    call_.setTargetObjectURI(remote_site_name_);
+    call_.setMethodName("process");
+
     return true;
     }
@@ -119 +133 @@
         
         //  Set the URL for the Web Service
-        URL url = new URL(connection_address_);
+        URL url = new URL(remote_site_address_);
         
         // Invoke the Service
@@ -138 +152 @@
             Element e = (Element)responses.item(i);
             String from = e.getAttribute("from");
-            from = GSPath.prependLink(from, connection_name_);
+            from = GSPath.prependLink(from, remote_site_name_);
             e.setAttribute("from", from);
         }

trunk/gsdl3/src/java/org/greenstone/gsdl3/core/MessageRouter.java

@@ -365 +365 @@
             String type = s.getAttribute("type");
             String name = s.getAttribute("name");
-            System.out.println("..."+name+", type="+type);
             if (type.equals("soap")) {
                 comm = new SOAPCommunicator();
-                comm.setSiteHome(site_home_);
-                comm.setConnectionName(name);
-                comm.setConnectionAddress(s.getAttribute("address"));
-                comm.setSiteName(site_name_);
+                if (comm.configure(s)) {
+                comm.setLocalSiteName(site_name_);
                 
-                // add to map of modules
-                module_map_.put(name, comm);
-                site_list_.appendChild(doc_.importNode(s, true));
-                // need to get collection list and service list from here
-                // this may introduce a configure problem - leave as 
-                // is for now, but fix up later - kjdon
-                getRemoteCollectionInfo(comm, name);
-                getRemoteServiceInfo(comm, name);
+                // add to map of modules
+                module_map_.put(name, comm);
+                site_list_.appendChild(doc_.importNode(s, true));
+                // need to get collection list and service 
+                // list from here- this may introduce a 
+                // configure problem - leave as  is for now, 
+                // but fix up later - kjdon
+                getRemoteCollectionInfo(comm, name);
+                getRemoteServiceInfo(comm, name);
+                } else {
+                System.err.println("couldn't configure soap site:"+name);
+                }
                 
             } else {