Changeset 3470 for trunk

Timestamp:

2002-10-16T09:32:25+13:00 (22 years ago)

Author:

kjdon

Message:

now looks for service clusters in its config file, and loads them up too.

File:

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

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

@@ -76 +76 @@
     /** list of collections that can be reached */
     protected Element collection_list_ = null; 
-    /** list of services that can be reached */
+    /** list of service clusters that can be reached */
+    protected Element cluster_list_ = null; 
+    /** list of single services that can be reached
+     * can we have single services? or chould all be part of a cluster */
     protected Element service_list_ = null; 
     /** list of sites that can be reached */
@@ -120 +123 @@
     description_.setAttribute("type", "describe");
     collection_list_ = doc_.createElement("collectionList");
+    cluster_list_ = doc_.createElement("serviceClusterList");
     service_list_ = doc_.createElement("serviceList");
     site_list_ = doc_.createElement("siteList");
@@ -146 +150 @@
             String colName = contents[i].getName();
             if (!colName.startsWith("CVS")) {
-            // need to ignore CVS
             createCollection(colName);
             }
@@ -261 +264 @@
 
     System.out.println("MessageRouter:configuring site");
-    Document config_doc = converter_.getDOM(file);
-
-    NodeList local_site_name = config_doc.getElementsByTagName("localSiteName");
-    if (local_site_name.getLength()==0) {
+    Element config = converter_.getDOM(file).getDocumentElement();
+
+    Element local_site_name = (Element)GSXML.getChildByTagName(config, 
+                               "localSiteName");
+    if (local_site_name == null) {
         System.err.println("MessageRouter configure error:no site name in config file");
         return false;
     } else {
-        Element elem = (Element)local_site_name.item(0);
-        site_name_ = elem.getAttribute("value");
-    }
-
-    // load up the services
-    System.out.println("loading service modules...");
-
-    NodeList service_modules = config_doc.getElementsByTagName("serviceModule");
-    if (service_modules.getLength()==0) {
+        site_name_ = local_site_name.getAttribute("value");
+    }
+    
+    // load up the service clusters
+    System.out.println("loading service clusters ...");
+    Node cluster_list = GSXML.getChildByTagName(config, 
+                            "serviceClusterList");
+    if (cluster_list == null) {
         System.out.println("... none to be loaded");
     } else {
-    
-        Element service_request = doc_.createElement("request");
-        service_request.setAttribute("type", "describe");
-        service_request.setAttribute("info", "serviceList");
+        NodeList service_clusters = cluster_list.getChildNodes();
+        if (service_clusters.getLength()==0) {
+        System.out.println("... none to be loaded");
+        } else {
+        
+        for (int i=0; i<service_clusters.getLength(); i++) {
+            if (service_clusters.item(i).getNodeName().equals("serviceCluster")) {
+            Element cluster = (Element)service_clusters.item(i);
+            String name = cluster.getAttribute("name");
+            System.out.println("..."+name);
+            ServiceCluster sc = new ServiceCluster();
+            sc.setSiteHome(site_name_);
+            sc.setClusterName(name);
+            sc.configure(cluster);
+            module_map_.put(name, sc);
+            //add short info to 
+            Element e = doc_.createElement("serviceCluster");
+            e.setAttribute("name", name);
+            cluster_list_.appendChild(e);
+
+            }
+        }
+        }
         
-        for(int i=0; i<service_modules.getLength(); i++) {
-        Element n = (Element)service_modules.item(i);
-        String service_name = n.getAttribute("name");
-        System.out.println("..."+service_name);
-        try {
-            ServiceModule s = (ServiceModule)Class.forName("org.greenstone.gsdl3.service."+service_name).newInstance();
-            s.setSiteHome(site_home_);
-            s.setMessageRouter(this);
-            
-            // pass the XML node to the service for service configuration
-            s.configure(n);
-            
-            // find out the supported services for this service module
-            Element service_response = (Element) s.process(service_request);
-            NodeList services = service_response.getElementsByTagName("service");
-            if (services.getLength()==0) {
-            System.err.println("MessageRouter configure error: serviceModule "+service_name+" has no services!");
-            } else {
-            for (int j=0; j<services.getLength();j++) {
-                String service = ((Element)services.item(j)).getAttribute("name");
-            module_map_.put(service, s);
-            
-            // add short info to service_list_ XML
-            service_list_.appendChild(doc_.importNode(services.item(j), true));
-            }
-            }
-        } catch (Exception e ) {
-            System.err.println("MessageRouter configure exception:  in ServiceModule class specification:  "+ e.getMessage());
-            
-        } 
+    }
+
+    // load up the individual services
+    System.out.println("loading service modules...");
+    
+    Node module_list = GSXML.getChildByTagName(config, 
+                           "serviceModuleList");
+    if (module_list == null) {
+        System.out.println("... none to be loaded");
+    } else {
+        NodeList service_modules = module_list.getChildNodes();
+        if (service_modules.getLength()==0) {
+        System.out.println("... none to be loaded");
+        } else {
         
-        } // for each service module
+        Element service_request = doc_.createElement("request");
+        service_request.setAttribute("type", "describe");
+        service_request.setAttribute("info", "serviceList");
+        
+        for(int i=0; i<service_modules.getLength(); i++) {
+            if (service_modules.item(i).getNodeName().equals("serviceModule")) {
+            Element n = (Element)service_modules.item(i);
+            String service_name = n.getAttribute("name");
+            System.out.println("..."+service_name);
+            try {
+                ServiceModule s = (ServiceModule)Class.forName("org.greenstone.gsdl3.service."+service_name).newInstance();
+                s.setSiteHome(site_home_);
+                s.setMessageRouter(this);
+                
+                // pass the XML node to the service for service configuration
+                s.configure(n);
+                
+                // find out the supported services for this service module
+                Element service_response = (Element) s.process(service_request);
+                NodeList services = service_response.getElementsByTagName("service");
+                if (services.getLength()==0) {
+                System.err.println("MessageRouter configure error: serviceModule "+service_name+" has no services!");
+                } else {
+                for (int j=0; j<services.getLength();j++) {
+                    String service = ((Element)services.item(j)).getAttribute("name");
+                    module_map_.put(service, s);
+                    
+                // add short info to service_list_ XML
+                    service_list_.appendChild(doc_.importNode(services.item(j), true));
+                }
+                }
+            } catch (Exception e ) {
+                System.err.println("MessageRouter configure exception:  in ServiceModule class specification:  "+ e.getMessage());
+                
+            } 
+            } // if
+        } // for each service module
+        }
     }
     
     // load up the sites
     System.out.println("loading external sites...");
-    NodeList sites = config_doc.getElementsByTagName("site");
-    if (sites.getLength()==0) {
+    Node site_list = GSXML.getChildByTagName(config, "siteList");
+    if (site_list ==null ) {
         System.out.println("...none found");
     } else {
-
-        for (int i=0; i<sites.getLength(); i++) {
-        Element s = (Element)sites.item(i);
-        Communicator comm=null;
-        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_);
-            
-            // 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.print("cant talk to server of type:"+type);
-            System.err.println(", so not making a connection to "+name);
+        NodeList sites = site_list.getChildNodes();
+        if (sites.getLength()==0) {
+        System.out.println("...none found");
+        } else {
+        
+        for (int i=0; i<sites.getLength(); i++) {
+            if (sites.item(i).getNodeName().equals("site")) {
+            Element s = (Element)sites.item(i);
+            Communicator comm=null;
+            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_);
+                
+                // 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.print("cant talk to server of type:"+type);
+                System.err.println(", so not making a connection to "+name);
+            }
+            
+            }
         }
-        
-            
         }
     }
     // add children to description_
+    description_.appendChild(cluster_list_);
     description_.appendChild(service_list_);
     description_.appendChild(site_list_);
@@ -471 +521 @@
         response.appendChild(collection_list_);
         return response;
+        } else if (info.equals("serviceClusterList")) {
+        response.appendChild(cluster_list_);
+        return response;
         } else if (info.equals("serviceList")) {
         response.appendChild(service_list_);