Changeset 4096

Timestamp:

2003-04-07T16:51:23+12:00 (21 years ago)

Author:

kjdon

Message:

rearranging stuff so that you can reconfigure all teh bits individually without having to restart tomcat - am part of teh way through

File:

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

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

@@ -60 +60 @@
 
     /** site home - the home directory for the site */
-    protected String site_home_=null;
+    protected String site_home=null;
     /** the http address for this site */
-    protected String site_http_address_=null;
+    protected String site_http_address=null;
     
     /** the global name for this site */
-    protected String global_site_name_=null;
+    protected String global_site_name=null;
 
     /** map of names to Module objects */
-    protected HashMap module_map_=null;
+    protected HashMap module_map=null;
 
     /** container Document to create XML Nodes */
-    protected Document doc_=null; 
+    protected Document doc=null; 
     /** the full description of this site */
-    protected Element description_ = null;
+    //protected Element description = null;
 
     // should these things be separated into local and remote??
 
     /** list of collections that can be reached */
-    protected Element collection_list_ = null; 
+    protected Element collection_list = null; 
     /** 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; 
-
+    protected Element cluster_list = null; 
+    /** list of single services that can be reached */
+    protected Element service_list = null; 
     /** list of sites that can be reached */
-    protected Element site_list_ = null; 
+    protected Element site_list = null; 
 
     /** a converter class to parse XML and create Docs */
-    protected XMLConverter converter_=null;
+    protected XMLConverter converter=null;
 
     //***************************************************************
@@ -97 +95 @@
     /** constructor */
     public MessageRouter() {
-    module_map_ = new HashMap();
-    converter_ = new XMLConverter();
-    doc_ = converter_.newDOM();
-    
-    
-    }
-
-    /** site_home_ must be set before configure called */
+    this.converter = new XMLConverter();
+    this.doc = this.converter.newDOM();
+    
+    
+    }
+
+    /** site_home must be set before configure called */
     public void setSiteHome(String home) {
-    site_home_ = home;
+    this.site_home = home;
     }
 
@@ -112 +109 @@
      * configures the system
      *
-     * looks in site_home_/collect for collections, reads config file
-     * site_home_/sitecfg.xml
+     * looks in site_home/collect for collections, reads config file
+     * site_home/sitecfg.xml
      *
      */
     public boolean configure() { 
 
-    if (site_home_==null) {
-        System.err.println("You must set site_home_ before calling configure");
+    System.out.println("MessageRouter:configuring site");
+
+    if (this.site_home==null) {
+        System.err.println("You must set site_home before calling configure");
         return false;
     }
-
-        // start the description_ XML tree
-    description_ = doc_.createElement(GSXML.RESPONSE_ELEM);
-    description_.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_DESCRIBE);
-    description_.setAttribute(GSXML.FROM_ATT, "");
-    collection_list_ = doc_.createElement(GSXML.COLLECTION_ELEM+GSXML.LIST_MODIFIER);
-    cluster_list_ = doc_.createElement(GSXML.CLUSTER_ELEM+GSXML.LIST_MODIFIER);
-    service_list_ = doc_.createElement(GSXML.SERVICE_ELEM+GSXML.LIST_MODIFIER);
-    site_list_ = doc_.createElement(GSXML.SITE_ELEM+GSXML.LIST_MODIFIER);
-
-
+    
     // read thru own config file - create services and connect to sites
-    File configFile = new File(GSFile.siteConfigFile(site_home_));
-
-    if (configFile.exists() ) {
-        configureSystem(configFile);
-    }
-    else {
+    File configFile = new File(GSFile.siteConfigFile(this.site_home));
+
+    if (!configFile.exists() ) {
         System.err.println("MessageRouter: site config file: "+configFile.getPath()+" not found!");
         return false;
-        
-    }
-
-    // read thru the collect directory and activate all the valid collections
-    File collectDir = new File(GSFile.collectDir(site_home_));
-    if (collectDir.exists()) {
-        System.out.println("Reading thru directory "+collectDir.getPath()+" to find collections.");
-        File[] contents = collectDir.listFiles();
-        for (int i=0; i<contents.length;i++) {
-        if(contents[i].isDirectory()) {
-            
-            String colName = contents[i].getName();
-            if (!colName.startsWith("CVS")) {
-            activateCollection(colName);
-            }
-        }
-        }
-    } // collectDir
-    
-    description_.appendChild(collection_list_);
-
+    }
+    
+    this.module_map = new HashMap();
+
+    Element config = this.converter.getDOM(configFile).getDocumentElement();
+    
+    Element local_site_name = (Element)GSXML.getChildByTagName(config, 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, 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);
+    }
+    
+    // load up the services
+    Element service_rack_list = (Element)GSXML.getChildByTagName(config, GSXML.SERVICE_CLASS_ELEM+GSXML.LIST_MODIFIER);
+    configureServices(service_rack_list);
+    
+    // load up the service clusters
+    Element cluster_list = (Element)GSXML.getChildByTagName(config, GSXML.CLUSTER_ELEM+GSXML.LIST_MODIFIER);    
+    configureClusters(cluster_list);
+
+    // load up the collections
+    configureCollections();
+
+    // load up the external sites - this also adds their services/clusters/collections to the other lists - so must be done last
+    Element site_list = (Element)GSXML.getChildByTagName(config, GSXML.SITE_ELEM+GSXML.LIST_MODIFIER);
+    configureSites(site_list);
+    
+        
     return true;
     
     }
-
+    
+   
     /**
      * Process an XML request - as a String
@@ -176 +180 @@
     public String process(String xml_in) {
     
-    Document doc = converter_.getDOM(xml_in);
+    Document doc = this.converter.getDOM(xml_in);
     
     Element result = process(doc.getDocumentElement());
-    return converter_.getString(result);
+    return this.converter.getString(result);
     }
     
@@ -191 +195 @@
     public Element process(Element message) {
 
-    //System.out.println("MR received request");
-    //System.out.println(converter_.getString(message));
+    System.out.println("MR received request");
+    System.out.println(this.converter.getString(message));
                
     // check that its a correct message tag
@@ -202 +206 @@
     NodeList requests = message.getElementsByTagName(GSXML.REQUEST_ELEM);
 
-    Element mainResult = doc_.createElement(GSXML.MESSAGE_ELEM);
+    Element mainResult = this.doc.createElement(GSXML.MESSAGE_ELEM);
     
     // empty request
@@ -222 +226 @@
         // its a message for the message router
         result = processMessage(req);
-        mainResult.appendChild(doc_.importNode(result, true));
+        mainResult.appendChild(this.doc.importNode(result, true));
         } else {
         // find the module to pass it on to
@@ -229 +233 @@
         mess.appendChild(req);
         String obj = GSPath.getFirstLink(path);
-        if (module_map_.containsKey(obj)) {
-            result = ((ModuleInterface)module_map_.get(obj)).process(mess);
+        if (this.module_map.containsKey(obj)) {
+            result = ((ModuleInterface)this.module_map.get(obj)).process(mess);
             if (result !=null ) {
             // append the contents of the message to the mainResult - there will only be one response at this stage
-            mainResult.appendChild(doc_.importNode(GSXML.getChildByTagName(result, GSXML.RESPONSE_ELEM), true));
+            mainResult.appendChild(this.doc.importNode(GSXML.getChildByTagName(result, GSXML.RESPONSE_ELEM), true));
             } else {
             System.err.println("MessageRouter Error: request had null result!");
             }
         } else {    
-            System.err.println("MessageRouter Error: request has illegal module name in:\n"+converter_.getString(req));
+            System.err.println("MessageRouter Error: request has illegal module name in:\n"+this.converter.getString(req));
         }
         }
@@ -244 +248 @@
     } // for each request
     
-    //System.out.println("MR returned response");
-    //System.out.println(converter_.getString(mainResult));
+    System.out.println("MR returned response");
+    System.out.println(this.converter.getString(mainResult));
 
     return mainResult;
@@ -251 +255 @@
     }
     
-    //********************************************************************
+    // ********************************************************************
     // auxiliary configure methods
     // *******************************************************************
 
-    /**
-     * configures the message router based on the site config file 
-     * - siteConfig.xml
-     *
-     */
-    protected boolean configureSystem(File file) {
-
-    System.out.println("MessageRouter:configuring site");
-    Element config = converter_.getDOM(file).getDocumentElement();
-
-    Element local_site_name = (Element)GSXML.getChildByTagName(config, 
-                         GSXML.SITE_NAME_ELEM);
-    if (local_site_name == null) {
-        System.err.println("MessageRouter configure error:no site name in config file");
-        return false;
-    } else {
-        global_site_name_ = local_site_name.getAttribute(GSXML.VALUE_ATT);
-    }
-    
-    Element http_address = (Element)GSXML.getChildByTagName(config, 
-                        GSXML.SITE_HTTP_ADDRESS_ELEM);
-    if (http_address == null) {
-        System.err.println("MessageRouter configure error: no http address  in config file");
-        return false;
-    } else {
-        site_http_address_ = http_address.getAttribute(GSXML.VALUE_ATT);
-    }
-    
+
+    protected boolean configureServices(Element service_rack_list) {
+
+    this.service_list = this.doc.createElement(GSXML.SERVICE_ELEM+GSXML.LIST_MODIFIER);
+
+    // load up the individual services
+    System.out.println("loading service modules...");
+    
+    if (service_rack_list == null) {
+        System.out.println("... none to be loaded");
+        return true;
+    } 
+    
+    NodeList service_racks = service_rack_list.getElementsByTagName(GSXML.SERVICE_CLASS_ELEM);
+    if (service_racks.getLength()==0) {
+        System.out.println("... none to be loaded");
+        return true;
+    } 
+        
+    Element service_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
+    Element service_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, "", "");
+    service_message.appendChild(service_request);
+    service_request.setAttribute(GSXML.INFO_ATT, GSXML.SERVICE_ELEM+GSXML.LIST_MODIFIER);
+        
+    for(int i=0; i<service_racks.getLength(); i++) {
+        Element n = (Element)service_racks.item(i);
+        String service_name = n.getAttribute(GSXML.NAME_ATT);
+        System.out.println("..."+service_name);
+        try {
+        ServiceRack s = (ServiceRack)Class.forName("org.greenstone.gsdl3.service."+service_name).newInstance();
+        s.setSiteHome(this.site_home);
+        s.setSiteAddress(this.site_http_address);
+        s.setMessageRouter(this);
+        // pass the XML node to the service for service configuration
+        s.configure(n, null);
+
+        // find out the supported services for this service module
+        Element service_response = (Element) s.process(service_message);
+        NodeList services = service_response.getElementsByTagName(GSXML.SERVICE_ELEM);
+        if (services.getLength()==0) {
+            System.err.println("MessageRouter configure error: serviceRack "+service_name+" has no services!");
+        } else {
+            for (int j=0; j<services.getLength();j++) {
+            String service = ((Element)services.item(j)).getAttribute(GSXML.NAME_ATT);
+            this.module_map.put(service, s);
+            
+                // add short info to service_list_ XML
+            this.service_list.appendChild(this.doc.importNode(services.item(j), true));
+            }
+        }
+        } catch (Exception e ) {
+        System.err.println("MessageRouter configure exception:  in ServiceRack class specification:  "+ e.getMessage());
+        e.printStackTrace();
+        } 
+    } // for each service module
+    return true;
+    }
+    
+    protected boolean configureClusters(Element 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 ...");
-    Node cluster_list = GSXML.getChildByTagName(config, 
-                 GSXML.CLUSTER_ELEM+GSXML.LIST_MODIFIER);
     if (cluster_list == null) {
         System.out.println("... none to be loaded");
-    } else {
-        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(GSXML.CLUSTER_ELEM)) {
-            Element cluster = (Element)service_clusters.item(i);
-            String name = cluster.getAttribute(GSXML.NAME_ATT);
-            System.out.println("..."+name);
-            ServiceCluster sc = new ServiceCluster();
-            sc.setSiteHome(site_home_);
-            sc.setSiteAddress(site_http_address_);
-            sc.setClusterName(name);
-            sc.setMessageRouter(this);
-            sc.configure(cluster);
-            module_map_.put(name, sc);
-            //add short info to 
-            Element e = doc_.createElement(GSXML.CLUSTER_ELEM);
-            e.setAttribute(GSXML.NAME_ATT, name);
-            cluster_list_.appendChild(e);
-
+        return true;
+    } 
+    NodeList service_clusters = cluster_list.getElementsByTagName(GSXML.CLUSTER_ELEM);
+    if (service_clusters.getLength()==0) {
+        System.out.println("... none to be loaded");
+        return true;
+    }
+    
+    for (int i=0; i<service_clusters.getLength(); i++) {
+        Element cluster = (Element)service_clusters.item(i);
+        String name = cluster.getAttribute(GSXML.NAME_ATT);
+        System.out.println("..."+name);
+        ServiceCluster sc = new ServiceCluster();
+        sc.setSiteHome(this.site_home);
+        sc.setSiteAddress(this.site_http_address);
+        sc.setClusterName(name);
+        sc.setMessageRouter(this);
+        sc.configure(cluster);
+        this.module_map.put(name, sc); // this replaces the old one if there was one already present
+        //add short info to cluster list
+        Element e = this.doc.createElement(GSXML.CLUSTER_ELEM);
+        e.setAttribute(GSXML.NAME_ATT, name);
+        this.cluster_list.appendChild(e);
+        
+    }
+    return true;
+    }
+    
+    protected boolean configureCollections() {
+
+    this.collection_list = this.doc.createElement(GSXML.COLLECTION_ELEM+GSXML.LIST_MODIFIER);
+
+    // read thru the collect directory and activate all the valid collections
+    File collectDir = new File(GSFile.collectDir(this.site_home));
+    if (collectDir.exists()) {
+        System.out.println("Reading thru directory "+collectDir.getPath()+" to find collections.");
+        File[] contents = collectDir.listFiles();
+        for (int i=0; i<contents.length;i++) {
+        if(contents[i].isDirectory()) {
+            
+            String colName = contents[i].getName();
+            if (!colName.startsWith("CVS")) {
+            activateCollection(colName);
             }
         }
         }
-        
-    }
-
-    // load up the individual services
-    System.out.println("loading service modules...");
-    
-    Node module_list = GSXML.getChildByTagName(config, 
-                           GSXML.SERVICE_CLASS_ELEM+GSXML.LIST_MODIFIER);
-    if (module_list == null) {
-        System.out.println("... none to be loaded");
-    } else {
-        NodeList service_impls = module_list.getChildNodes();
-        if (service_impls.getLength()==0) {
-        System.out.println("... none to be loaded");
-        } else {
-        
-        Element service_message = doc_.createElement(GSXML.MESSAGE_ELEM);
-        Element service_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_DESCRIBE, "", "");
-        service_message.appendChild(service_request);
-        service_request.setAttribute(GSXML.INFO_ATT, GSXML.SERVICE_ELEM+GSXML.LIST_MODIFIER);
-        
-        for(int i=0; i<service_impls.getLength(); i++) {
-            if (service_impls.item(i).getNodeName().equals(GSXML.SERVICE_CLASS_ELEM)) {
-            Element n = (Element)service_impls.item(i);
-            String service_name = n.getAttribute(GSXML.NAME_ATT);
-            System.out.println("..."+service_name);
-            try {
-                ServiceRack s = (ServiceRack)Class.forName("org.greenstone.gsdl3.service."+service_name).newInstance();
-                s.setSiteHome(site_home_);
-                s.setSiteAddress(site_http_address_);
-                s.setMessageRouter(this);
-                // pass the XML node to the service for service configuration
-                s.configure(n, null);
-
-                // find out the supported services for this service module
-                Element service_response = (Element) s.process(service_message);
-                NodeList services = service_response.getElementsByTagName(GSXML.SERVICE_ELEM);
-                if (services.getLength()==0) {
-                System.err.println("MessageRouter configure error: serviceRack "+service_name+" has no services!");
-                } else {
-                for (int j=0; j<services.getLength();j++) {
-                    String service = ((Element)services.item(j)).getAttribute(GSXML.NAME_ATT);
-                    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 ServiceRack class specification:  "+ e.getMessage());
-                e.printStackTrace();
-            } 
-            } // if
-        } // for each service module
-        }
-    }
-    
+    } // collectDir
+    return true;
+    }
+
+    protected boolean configureSites(Element site_list) {
+
+    this.site_list = this.doc.createElement(GSXML.SITE_ELEM+GSXML.LIST_MODIFIER);
     // load up the sites
     System.out.println("loading external sites...");
-    Node site_list = GSXML.getChildByTagName(config, GSXML.SITE_ELEM+GSXML.LIST_MODIFIER);
     if (site_list ==null ) {
         System.out.println("...none found");
-    } else {
-        NodeList sites = site_list.getChildNodes();
-        if (sites.getLength()==0) {
-        System.out.println("...none found");
+        return true;
+    }
+    NodeList sites = site_list.getElementsByTagName(GSXML.SITE_ELEM);
+    if (sites.getLength()==0) {
+        System.out.println("...none found");
+        return true;
+    }
+    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- this may introduce a 
+            // configure problem - leave as  is for now, 
+            // but fix up later - kjdon
+            if (!getRemoteSiteInfo(comm, name)) {
+            System.err.println("couldn't get info from site "+name);
+            }
+        } else {
+            System.err.println("couldn't configure soap site:"+name);
+        }
+        
         } else {
-        
-        for (int i=0; i<sites.getLength(); i++) {
-            if (sites.item(i).getNodeName().equals(GSXML.SITE_ELEM)) {
-            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(global_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
-                if (!getRemoteSiteInfo(comm, name)) {
-                    System.err.println("couldn't get info from site "+name);
-                }
-                } else {
-                System.err.println("couldn't configure soap site:"+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_);
-        
+        System.err.print("cant talk to server of type:"+type);
+        System.err.println(", so not making a connection to "+name);
+        }
+        
+    }
     return true;
-
-    }
-
+    }
+    
     
     /** get site info from external site
@@ -437 +432 @@
     System.out.println("MessageRouter: getting info from site:"+site_name);
 
-    Element info_request = doc_.createElement(GSXML.MESSAGE_ELEM);
-    Element req = doc_.createElement(GSXML.REQUEST_ELEM);
+    Element info_request = this.doc.createElement(GSXML.MESSAGE_ELEM);
+    Element req = this.doc.createElement(GSXML.REQUEST_ELEM);
     info_request.appendChild(req);
     req.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_DESCRIBE);
@@ -457 +452 @@
         // other collections ??
         e.setAttribute(GSXML.NAME_ATT, GSPath.prependLink(col_name, site_name));
-        collection_list_.appendChild(doc_.importNode(e, true));
+        this.collection_list.appendChild(this.doc.importNode(e, true));
         }
     }
@@ -468 +463 @@
         String serv_name = e.getAttribute(GSXML.NAME_ATT);
         e.setAttribute(GSXML.NAME_ATT, GSPath.prependLink(serv_name, site_name));
-        service_list_.appendChild(doc_.importNode(e, true));
+        this.service_list.appendChild(this.doc.importNode(e, true));
         }
     }
@@ -479 +474 @@
         String clus_name = e.getAttribute(GSXML.NAME_ATT);
         e.setAttribute(GSXML.NAME_ATT, GSPath.prependLink(clus_name, site_name));
-        cluster_list_.appendChild(doc_.importNode(e, true));
+        this.cluster_list.appendChild(this.doc.importNode(e, true));
         }
     }
@@ -485 +480 @@
     }
 
-
-    /** creates and configures a new collection
-     *
-     *@param col_name the name of the collection
-     *@return true if collection created ok
-     */
-    protected boolean activateCollection(String col_name) {
-
-    System.out.println("MessageRouter:Activating collection: "+col_name+".");
-              
-    Collection c = new Collection();
-    c.setCollectionName(col_name);
-    c.setSiteHome(site_home_);
-    c.setSiteAddress(site_http_address_);
-    if (c.configure()) {
-        // this could be a reactivation, so delete the old version
-        deactivate(GSXML.COLLECTION_ELEM, col_name);
-        // add to list of collections
-        module_map_.put(col_name, c);
-        //add short description_ to collection_list_
-        Element e = doc_.createElement(GSXML.COLLECTION_ELEM);
-        e.setAttribute(GSXML.NAME_ATT, col_name);
-        collection_list_.appendChild(e);
-        return true;
-    } else {
-        System.err.println("MessageRouter:Couldn't configure collection: "+
-                   col_name+".");
-        return false;
-    }
-    
-    }
-
-    protected boolean activateServiceCluster(String cluster_name) {
-    return false;
-
-    }
-
-    protected boolean activateServiceRack(String module_name) {
-    return false;
-    }
 
     //*****************************************************************
@@ -539 +494 @@
     // message for self, should be type=describe/configure at this stage
     String type = req.getAttribute(GSXML.TYPE_ATT);
-    Element response = doc_.createElement(GSXML.RESPONSE_ELEM);
+    Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
     response.setAttribute(GSXML.FROM_ATT, "");
     if (type.equals(GSXML.REQUEST_TYPE_DESCRIBE)) {
+        response.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_DESCRIBE);
         // check the param list
         Element param_list = (Element) GSXML.getChildByTagName(req, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
         if (param_list == null) {
-        // no params - just return teh full description
-        return description_; // this is already in a response elem
-        }
-        System.out.println("poarams found, getting subset");
-        // use the new response with the appropriate info 
-        response.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_DESCRIBE);
+        response.appendChild(this.collection_list);
+        response.appendChild(this.cluster_list);
+        response.appendChild(this.site_list);
+        response.appendChild(this.service_list);
+        return response;
+        }
+        System.out.println("params found, getting subset");
         
         // go through the param list and see what components are wanted
@@ -563 +520 @@
             String info = param.getAttribute(GSXML.VALUE_ATT);
             if (info.equals(GSXML.COLLECTION_ELEM+GSXML.LIST_MODIFIER)) {
-            response.appendChild(collection_list_);
+            response.appendChild(this.collection_list);
             
             } else if (info.equals(GSXML.CLUSTER_ELEM+GSXML.LIST_MODIFIER)) {
-            response.appendChild(cluster_list_);
+            response.appendChild(this.cluster_list);
             
             } else if (info.equals(GSXML.SERVICE_ELEM+GSXML.LIST_MODIFIER)) {
-            return response;
+            response.appendChild(this.service_list);
             } else if (info.equals(GSXML.SITE_ELEM+GSXML.LIST_MODIFIER)) {
-            response.appendChild(site_list_);
+            response.appendChild(this.site_list);
             } 
         }
@@ -578 +535 @@
         return response;
         
-    } else if (type.equals(GSXML.REQUEST_TYPE_CONFIGURE)) {
+    } 
+
+    if (type.equals(GSXML.REQUEST_TYPE_CONFIGURE)) {
         
         // a list of configure requests - should put any error messages
@@ -601 +560 @@
             }
         } else if (action.equals(GSXML.CONFIG_ACTION_DEACTIVATE)) {
-            deactivate(module_type, module_name);
+            deactivateModule(module_type, module_name);
+            
+        }
+        }
+        
+        return response;
+        
+    } 
+    
+    if (type.equals(GSXML.REQUEST_TYPE_SYSTEM)) {
+        
+        // a list of system requests - should put any error messages
+        // or success messages into response
+        NodeList commands = req.getElementsByTagName("system");//GSXML.SYSTEM_ELEM);
+        Element site_config_elem = null;
+        for (int i=0; i<commands.getLength(); i++) {
+        // all the commands should be Elements
+        Element elem = (Element)commands.item(i);
+        String action = elem.getAttribute(GSXML.TYPE_ATT);
+        if (action.equals("configure")) {
+            String subset = elem.getAttribute("subset");
+            if (subset.equals("")) {
+            // need to reconfigure the MR
+            this.configure();
+            Element s = GSXML.createTextElement(this.doc, "status", "mr reconfigured");
+            response.appendChild(s);
             
-        }
-        }
-        
+            } else {
+            // else it a specific request
+            boolean success = false;
+            if (subset.equals(GSXML.COLLECTION_ELEM+GSXML.LIST_MODIFIER)) {
+                success = configureCollections();
+            } else {
+
+                // need the site config file
+                if (site_config_elem==null) {
+                
+                File configFile = new File(GSFile.siteConfigFile(this.site_home));
+                if (!configFile.exists() ) {
+                    System.err.println("MessageRouter: site config file: "+configFile.getPath()+" not found!");
+                    continue;
+                }
+                site_config_elem  = this.converter.getDOM(configFile).getDocumentElement();
+                }
+                if (subset.equals(GSXML.SERVICE_ELEM+GSXML.LIST_MODIFIER)) {
+                Element service_rack_list = (Element)GSXML.getChildByTagName(site_config_elem, GSXML.SERVICE_CLASS_ELEM+GSXML.LIST_MODIFIER);
+                
+                success = configureServices(service_rack_list);
+                } else if (subset.equals(GSXML.CLUSTER_ELEM+GSXML.LIST_MODIFIER)) {
+                Element cluster_list = (Element)GSXML.getChildByTagName(site_config_elem, GSXML.CLUSTER_ELEM+GSXML.LIST_MODIFIER);  
+                
+                success = configureClusters(cluster_list);
+                } else if (subset.equals(GSXML.SITE_ELEM+GSXML.LIST_MODIFIER)) {
+                Element site_list = (Element)GSXML.getChildByTagName(site_config_elem, GSXML.SITE_ELEM+GSXML.LIST_MODIFIER);
+                success = configureSites(site_list);
+                }
+            }
+            String message=null;
+            if (success) {
+                message = subset + "reconfigured successfully";
+            } else {
+                message = "Error in reconfiguring "+subset;
+            }
+            Element s = GSXML.createTextElement(this.doc, "status", message);
+            response.appendChild(s);
+            }
+            
+            
+        } else {
+            String module_name = elem.getAttribute("moduleName");
+            String module_type = elem.getAttribute("moduleType");
+
+            if (action.equals("deactivate")) {
+            deactivateModule(module_type, module_name);
+            Element s = GSXML.createTextElement(this.doc, "status", module_type+": "+module_name+" deactivated");
+            response.appendChild(s);
+            }
+        }
+        } // for all commands
         return response;
-        
+            
+
     }
     // if get here something has gone wrong
     System.err.println("MessageRouter: cant process request:");
-    System.err.println(converter_.getString(req));
+    System.err.println(this.converter.getString(req));
     return null;
        
     }
 
-    protected boolean deactivate(String type, String name) {
-    
-    if (module_map_.containsKey(name)) {
+    // ****************************************************
+    // other methods
+    // ****************************************************
+
+    /** creates and configures a new collection
+     *
+     *@param col_name the name of the collection
+     *@return true if collection created ok
+     */
+    protected boolean activateCollection(String col_name) {
+
+    System.out.println("MessageRouter:Activating collection: "+col_name+".");
+              
+    Collection c = new Collection();
+    c.setCollectionName(col_name);
+    c.setSiteHome(this.site_home);
+    c.setSiteAddress(this.site_http_address);
+    if (c.configure()) {
+        // this could be a reactivation, so delete the old version
+        deactivateModule(GSXML.COLLECTION_ELEM, col_name);
+        // add to list of collections
+        this.module_map.put(col_name, c);
+        //add short description_ to collection_list_
+        Element e = this.doc.createElement(GSXML.COLLECTION_ELEM);
+        e.setAttribute(GSXML.NAME_ATT, col_name);
+        this.collection_list.appendChild(e);
+        return true;
+    } else {
+        System.err.println("MessageRouter:Couldn't configure collection: "+
+                   col_name+".");
+        return false;
+    }
+    
+    }
+
+    protected boolean activateServiceCluster(String cluster_name) {
+    return false;
+
+    }
+
+    protected boolean activateServiceRack(String module_name) {
+    return false;
+    }
+
+    protected boolean deactivateModule(String type, String name) {
+    
+    if (this.module_map.containsKey(name)) {
 
         System.out.println("MessageRouter: deactivating "+name);
-        module_map_.remove(name);
+        this.module_map.remove(name);
 
         // also remove the xml bit from description list
         if (type.equals(GSXML.COLLECTION_ELEM)) {
-        Element this_col = GSXML.getNamedElement(collection_list_, GSXML.COLLECTION_ELEM, GSXML.NAME_ATT, name);
-        collection_list_.removeChild(this_col);
+        Element this_col = GSXML.getNamedElement(this.collection_list, GSXML.COLLECTION_ELEM, GSXML.NAME_ATT, name);
+        if (this_col != null) {
+            this.collection_list.removeChild(this_col);
+        }
         return true;
         } else if (type.equals(GSXML.SERVICE_ELEM)) {
-        Element this_service = GSXML.getNamedElement(service_list_, GSXML.SERVICE_ELEM, GSXML.NAME_ATT, name);
-        service_list_.removeChild(this_service);
+        Element this_service = GSXML.getNamedElement(this.service_list, GSXML.SERVICE_ELEM, GSXML.NAME_ATT, name);
+        if (this_service != null) {
+            this.service_list.removeChild(this_service);
+        }
         return true;
         } else if (type.equals(GSXML.CLUSTER_ELEM)) {
-        Element this_cluster = GSXML.getNamedElement(cluster_list_, GSXML.CLUSTER_ELEM, GSXML.NAME_ATT, name);
-        cluster_list_.removeChild(this_cluster);
+        Element this_cluster = GSXML.getNamedElement(this.cluster_list, GSXML.CLUSTER_ELEM, GSXML.NAME_ATT, name);
+        if (this_cluster != null) {
+            this.cluster_list.removeChild(this_cluster);
+        }
         return true;
+        } else if (type.equals(GSXML.SITE_ELEM)) {
+        Element this_site = GSXML.getNamedElement(this.site_list, GSXML.SITE_ELEM, GSXML.NAME_ATT, name);
+        if (this_site != null) {
+            this.site_list.removeChild(this_site);
+
+            // also need to remove from the other lists any 
+            // services/clusters/collections that belong to this site
+        }
         } else {
         System.err.println("couldn't deactivate coll");
@@ -642 +734 @@
         }
     }
-    // else not activated 
+    // else not deactivated 
     return false;