Changeset 10292 for trunk/gsdl3

Timestamp:

2005-07-25T16:10:42+12:00 (19 years ago)

Author:

kjdon

Message:

changed the site loading/reloading stuff a bit. now get GSDL3Home from GlobalProperties, site_name is set by instantiator, not site_home.

File:

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

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

@@ -34 +34 @@
 // other java classes
 import java.io.File;
-import java.util.HashMap;
-import java.util.Iterator;
 import java.io.Reader;
 import java.io.StringReader;
 import java.net.Authenticator;
 import java.net.PasswordAuthentication;      
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Properties;
 
 /**
@@ -61 +62 @@
 public class MessageRouter implements  ModuleInterface {
 
+    /** the (directory) name of the site */
+    protected String site_name = null;
     /** site home - the home directory for the site */
     protected String site_home=null;
@@ -66 +69 @@
     protected String site_http_address=null;
     
-    /** the global name for this site */
-    protected String global_site_name=null;
-
     /** map of names to Module objects */
     protected HashMap module_map=null;
@@ -86 +86 @@
     /** list of sites that can be reached */
     protected Element site_list = null; 
-
+    
+   
     /** a converter class to parse XML and create Docs */
     protected XMLConverter converter=null;
 
+    
     //***************************************************************
     // public methods
@@ -108 +110 @@
     }
     }
-    /** site_home must be set before configure called */
-    public void setSiteHome(String home) {
-    this.site_home = home;
-    }
-
+
+    /** site_name must be set before configure is called */
+    public void setSiteName(String site_name) {
+    this.site_name = site_name;
+    }
     /**
      * configures the system
      *
      * looks in site_home/collect for collections, reads config file
-     * site_home/sitecfg.xml
+     * site_home/siteConfig.xml
      *
      */
@@ -124 +126 @@
     System.out.println("MessageRouter:configuring site");
 
-    if (this.site_home==null) {
-        System.err.println("MessageRouter: You must set site_home before calling configure");
+    if (this.site_name==null) {
+        System.err.println("MessageRouter: You must set site_name before calling configure");
         return false;
     }
-    
+    this.site_home = GSFile.siteHome(GlobalProperties.getGSDL3Home(), this.site_name);
+    this.site_http_address = GlobalProperties.getGSDL3WebAddress()+"/sites/"+this.site_name;
+    
+    // are we behind a firewall?? - is there a better place to set up the proxy?
+    String host = GlobalProperties.getProperty("proxy.host");
+    String port = GlobalProperties.getProperty("proxy.port");
+    final String user = GlobalProperties.getProperty("proxy.user");
+    final String passwd = GlobalProperties.getProperty("proxy.password");
+      
+    if (host != null && !host.equals("") && port !=null && !port.equals("")) {
+        System.setProperty("http.proxyType", "4");
+        System.setProperty("http.proxyHost", host);
+        System.setProperty("http.proxyPort", port);
+        System.setProperty("http.proxySet", "true");
+        // have we got a user/password?
+        if (user != null && !user.equals("") && passwd != null && !passwd.equals("")) {
+        try {
+            // set up the authenticator
+            Authenticator.setDefault(new Authenticator(){ 
+                protected PasswordAuthentication getPasswordAuthentication(){ 
+                return new PasswordAuthentication(user, new String(passwd).toCharArray()); 
+                } 
+            }); 
+            
+        } catch (Exception e) {
+            System.err.println("MessageRouter Error: couldn't set up an authenticator the proxy");
+            
+        }
+        }
+    }
+
     // read thru own config file - create services and connect to sites
     File configFile = new File(GSFile.siteConfigFile(this.site_home));
@@ -137 +169 @@
     }
     
-    this.module_map = new HashMap();
-
     Document config_doc = this.converter.getDOM(configFile);
     if (config_doc == null) {
@@ -144 +174 @@
         return false;
     }
+    
     Element config_elem = config_doc.getDocumentElement();
     
-    Element local_site_name = (Element)GSXML.getChildByTagName(config_elem, GSXML.SITE_NAME_ELEM);
-    if (local_site_name == null) {
-        System.err.println("MessageRouter configure error:no site name in config file");
-        return false;
-    } else {
-        this.global_site_name = local_site_name.getAttribute(GSXML.VALUE_ATT);
-    }
-    
-    Element http_address = (Element)GSXML.getChildByTagName(config_elem, GSXML.SITE_HTTP_ADDRESS_ELEM);
-    if (http_address == null) {
-        System.err.println("MessageRouter configure error: no http address  in config file");
-        return false;
-    } else {
-        this.site_http_address = http_address.getAttribute(GSXML.VALUE_ATT);
-    }
-
-    Element proxy = (Element)GSXML.getChildByTagName(config_elem, "proxy");
-    if (proxy != null) {
-        String host = proxy.getAttribute("host");
-        String port = proxy.getAttribute("port");
-        final String user = proxy.getAttribute("user");
-        final String passwd = proxy.getAttribute("password");
-        if (host.equals("") || port.equals("") || user.equals("")||passwd.equals("")) {
-        System.err.println("MessageRouter.configure Error: A proxy was specified in the config file, but attributes host, port, user, password were not all present");
-        } else {
-        try {
-            // set up the proxy
-            System.setProperty("http.proxyType", "4");
-            System.setProperty("http.proxyHost", host);
-            System.setProperty("http.proxyPort", port);
-            System.setProperty("http.proxySet", "true");
-            Authenticator.setDefault(new Authenticator(){ 
-                protected PasswordAuthentication getPasswordAuthentication(){ 
-                return new PasswordAuthentication(user, new 
-                    String(passwd).toCharArray()); 
-                } 
-            }); 
-            
-        } catch (Exception e) {
-            System.err.println("MessageRouter Error: couldn't set up the proxy");
-        }
-        }
-    }
-                     
+    this.module_map = new HashMap();
+    
     // load up the services
     Element service_rack_list = (Element)GSXML.getChildByTagName(config_elem, GSXML.SERVICE_CLASS_ELEM+GSXML.LIST_MODIFIER);
@@ -379 +368 @@
     }
     
-    protected boolean configureClusters(Element cluster_list) {
+    protected boolean configureClusters(Element config_cluster_list) {
 
     this.cluster_list = this.doc.createElement(GSXML.CLUSTER_ELEM+GSXML.LIST_MODIFIER);
     // load up the service clusters
     System.out.println("loading service clusters ...");
-    if (cluster_list == null) {
+    if (config_cluster_list == null) {
         System.out.println("... none to be loaded");
         return true;
     } 
-    NodeList service_clusters = cluster_list.getElementsByTagName(GSXML.CLUSTER_ELEM);
+    NodeList service_clusters = config_cluster_list.getElementsByTagName(GSXML.CLUSTER_ELEM);
     if (service_clusters.getLength()==0) {
         System.out.println("... none to be loaded");
@@ -428 +417 @@
             String colName = contents[i].getName();
             if (!colName.startsWith("CVS")) {
-            activateCollection(colName);
+            activateCollectionByName(colName);
             }
         }
@@ -436 +425 @@
     }
 
-    protected boolean configureSites(Element site_list) {
+    protected boolean configureSites(Element config_site_list) {
 
     this.site_list = this.doc.createElement(GSXML.SITE_ELEM+GSXML.LIST_MODIFIER);
     // load up the sites
     System.out.println("loading external sites...");
-    if (site_list ==null ) {
+    if (config_site_list ==null ) {
         System.out.println("...none found");
         return true;
     }
-    NodeList sites = site_list.getElementsByTagName(GSXML.SITE_ELEM);
+
+    NodeList sites = config_site_list.getElementsByTagName(GSXML.SITE_ELEM);
     if (sites.getLength()==0) {
         System.out.println("...none found");
         return true;
     }
+
+    // this is a name to identify the current site in the Communicator 
+    String local_site_name = config_site_list.getAttribute(GSXML.LOCAL_SITE_NAME_ATT);
+    if (local_site_name.equals("")) {
+        local_site_name = site_name;
+    }
+
     for (int i=0; i<sites.getLength(); i++) {
         Element s = (Element)sites.item(i);
-        Communicator comm=null;
-        String type = s.getAttribute(GSXML.TYPE_ATT);
-        String name = s.getAttribute(GSXML.NAME_ATT);
-        if (type.equals(GSXML.COMM_TYPE_SOAP_JAVA)) {
-        comm = new SOAPCommunicator();
-        if (comm.configure(s)) {
-            comm.setLocalSiteName(this.global_site_name);
-            
-            // add to map of modules
-            this.module_map.put(name, comm);
-            this.site_list.appendChild(this.doc.importNode(s, true));
-            // need to get collection list and service 
-            // list from here- if the site isn't up yet, the site will
-            // have to be added later 
-            if (!getRemoteSiteInfo(comm, name)) {
-            System.err.println("MessageRouter: couldn't get info from site "+name);
-            }
-        } else {
-            System.err.println("MessageRouter: couldn't configure soap site:"+name);
-        }
+        activateSite(s, local_site_name);       
+    }
+    return true;
+    }
+    
+    protected boolean activateSite(Element site_elem, String local_site_name) {
+    Communicator comm=null;
+    String type = site_elem.getAttribute(GSXML.TYPE_ATT);
+    String name = site_elem.getAttribute(GSXML.NAME_ATT);
+    if (type.equals(GSXML.COMM_TYPE_SOAP_JAVA)) {
+        comm = new SOAPCommunicator();
+        if (comm.configure(site_elem)) {
+        comm.setLocalSiteName(local_site_name);
         
+        // add to map of modules
+        this.module_map.put(name, comm);
+        this.site_list.appendChild(this.doc.importNode(site_elem, true));
+        // need to get collection list and service 
+        // list from here- if the site isn't up yet, the site will
+        // have to be added later 
+        if (!getRemoteSiteInfo(comm, name)) {
+            System.err.println("MessageRouter: couldn't get info from site "+name);
+        }
         } else {
-        System.err.print("MessageRouter: cant talk to server of type:"+type);
-        System.err.println(", so not making a connection to "+name);
+        System.err.println("MessageRouter: couldn't configure soap site:"+name);
+        return false;
         }
         
+    } else {
+        System.err.print("MessageRouter: cant talk to server of type:"+type + ", so not making a connection to "+name);
+        return false;
     }
     return true;
     }
-    
     
     /** get site info from external site
@@ -668 +669 @@
             } else if (action.equals(GSXML.SYSTEM_TYPE_ACTIVATE)) {
             if (module_type.equals(GSXML.COLLECTION_ELEM)) {
-                success = activateCollection(module_name);
+                success = activateCollectionByName(module_name);
             } else if (module_type.equals(GSXML.SITE_ELEM)) {
-                success = activateSite(module_name);
+                success = activateSiteByName(module_name);
             } else if (module_type.equals(GSXML.CLUSTER_ELEM)) {
-                success = activateServiceCluster(module_name);
+                success = activateServiceClusterByName(module_name);
             }
             if (success) {
@@ -761 +762 @@
      *@return true if collection created ok
      */
-    protected boolean activateCollection(String col_name) {
+    protected boolean activateCollectionByName(String col_name) {
 
     System.out.println("MessageRouter:Activating collection: "+col_name+".");
@@ -809 +810 @@
     }
     
-    protected boolean activateSite(String site_name) {
+    protected boolean activateSiteByName(String site_name) {
     System.out.println("MessageRouter:Activating site: "+site_name+".");
     
@@ -827 +828 @@
     Element config_elem = config_doc.getDocumentElement();
     
-    Element site_list = (Element)GSXML.getChildByTagName(config_elem, GSXML.SITE_ELEM+GSXML.LIST_MODIFIER);
-    if (site_list ==null ) {
+    Element config_site_list = (Element)GSXML.getChildByTagName(config_elem, GSXML.SITE_ELEM+GSXML.LIST_MODIFIER);
+    if (config_site_list ==null ) {
         System.err.println("MessageRouter:activateSite, no sites found");
         return false;
     }
-    Element this_site_elem = GSXML.getNamedElement(site_list, GSXML.SITE_ELEM, GSXML.NAME_ATT, site_name);
+    // this is a name to identify the current site in the Communicator 
+    String local_site_name = config_site_list.getAttribute("localSiteName");
+    if (local_site_name.equals("")) {
+        local_site_name = site_name;
+    }
+
+    Element this_site_elem = GSXML.getNamedElement(config_site_list, GSXML.SITE_ELEM, GSXML.NAME_ATT, site_name);
     if (this_site_elem == null) {
         System.err.println("MessageRouter:activateSite, site "+site_name+" not found");
@@ -838 +845 @@
     }
     
-    Communicator comm=null;
-    String type = this_site_elem.getAttribute(GSXML.TYPE_ATT);
-    if (type.equals(GSXML.COMM_TYPE_SOAP_JAVA)) {
-        comm = new SOAPCommunicator();
-        if (comm.configure(this_site_elem)) {
-        comm.setLocalSiteName(this.global_site_name);
-        
-        // add to map of modules
-        this.module_map.put(site_name, comm);
-        this.site_list.appendChild(this.doc.importNode(this_site_elem, true));
-        // need to get collection list and service 
-        // list from here- if the site isn't up yet, the site will
-        // have to be added later 
-        if (!getRemoteSiteInfo(comm, site_name)) {
-            System.err.println("MessageRouter: couldn't get info from site "+site_name);
-        }
-        } else {
-        System.err.println("MessageRouter: couldn't configure soap site:"+site_name);
-        return false;
-        }
-        
-    } else {
-        System.err.print("MessageRouter: cant talk to server of type:"+type);
-        System.err.println(", so not making a connection to "+site_name);
-        return false;
-    }
-    return true;
-    
-    }
-    
-    protected boolean activateServiceCluster(String cluster_name) {
+    return activateSite(this_site_elem, local_site_name);
+    }
+    
+    protected boolean activateServiceClusterByName(String cluster_name) {
     return false;
 
     }
 
-    protected boolean activateServiceRack(String module_name) {
+    protected boolean activateServiceRackByName(String module_name) {
     return false;
     }
@@ -934 +914 @@
     NodeList modules = module_list.getElementsByTagName(module_name);
     // will this work??
-    for (int i=0; i<modules.getLength(); i++) {
+    for (int i=modules.getLength()-1; i>=0; i--) {
         
         String name = ((Element)modules.item(i)).getAttribute(GSXML.NAME_ATT);
         if (GSPath.getFirstLink(name).equals(site_name)) {
         module_list.removeChild(modules.item(i));
-        i--; // move the pointer back
         }
     }