Changeset 3485

Timestamp:

2002-10-25T16:25:41+13:00 (22 years ago)

Author:

kjdon

Message:

ServiceModules changed to ServicesImpl, activate and deactivate module methods added

File:

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

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

@@ -53 +53 @@
  * @see ModuleInterface
  * @see Collection
- * @see ServiceModule
+ * @see ServicesImpl
  * @see Communicator
  *
@@ -140 +140 @@
     }
 
-    // read thru the collect directory and create all the collections
+    // read thru the collect directory and activate all the valid collections
     File collectDir = new File(GSFile.collectDir(site_home_));
     if (collectDir.exists()) {
@@ -150 +150 @@
             String colName = contents[i].getName();
             if (!colName.startsWith("CVS")) {
-            createCollection(colName);
+            activateCollection(colName);
             }
         }
@@ -293 +293 @@
             System.out.println("..."+name);
             ServiceCluster sc = new ServiceCluster();
-            sc.setSiteHome(site_name_);
+            sc.setSiteHome(site_home_);
             sc.setClusterName(name);
+            sc.setMessageRouter(this);
             sc.configure(cluster);
             module_map_.put(name, sc);
@@ -312 +313 @@
     
     Node module_list = GSXML.getChildByTagName(config, 
-                           "serviceModuleList");
+                           "servicesImplList");
     if (module_list == null) {
         System.out.println("... none to be loaded");
     } else {
-        NodeList service_modules = module_list.getChildNodes();
-        if (service_modules.getLength()==0) {
+        NodeList service_impls = module_list.getChildNodes();
+        if (service_impls.getLength()==0) {
         System.out.println("... none to be loaded");
         } else {
@@ -325 +326 @@
         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);
+        for(int i=0; i<service_impls.getLength(); i++) {
+            if (service_impls.item(i).getNodeName().equals("servicesImpl")) {
+            Element n = (Element)service_impls.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();
+                ServicesImpl s = (ServicesImpl)Class.forName("org.greenstone.gsdl3.service."+service_name).newInstance();
                 s.setSiteHome(site_home_);
                 s.setMessageRouter(this);
@@ -342 +343 @@
                 NodeList services = service_response.getElementsByTagName("service");
                 if (services.getLength()==0) {
-                System.err.println("MessageRouter configure error: serviceModule "+service_name+" has no services!");
+                System.err.println("MessageRouter configure error: servicesImpl "+service_name+" has no services!");
                 } else {
                 for (int j=0; j<services.getLength();j++) {
@@ -353 +354 @@
                 }
             } catch (Exception e ) {
-                System.err.println("MessageRouter configure exception:  in ServiceModule class specification:  "+ e.getMessage());
+                System.err.println("MessageRouter configure exception:  in ServicesImpl class specification:  "+ e.getMessage());
                 
             } 
@@ -471 +472 @@
      *@return true if collection created ok
      */
-    protected boolean createCollection(String col_name) {
-
-    System.out.println("MessageRouter:Creating and configuring collection: "+col_name+".");
+    protected boolean activateCollection(String col_name) {
+
+    System.out.println("MessageRouter:Activating collection: "+col_name+".");
               
     Collection c = new Collection();
@@ -479 +480 @@
     c.setSiteHome(site_home_);
     if (c.configure()) {
+        // this could be a reactivation, so delete the old version
+        deactivate("collection", col_name);
         // add to list of collections
         module_map_.put(col_name, c);
@@ -494 +497 @@
     }
 
+    protected boolean activateServiceCluster(String cluster_name) {
+    return false;
+
+    }
+
+    protected boolean activateServicesImpl(String module_name) {
+    return false;
+    }
+
     //*****************************************************************
     // auxiliary process methods
@@ -505 +517 @@
     protected Element processMessage(Element req) {
 
-    // message for self, should be type=describe at this stage
+    // message for self, should be type=describe/configure at this stage
     String type = req.getAttribute("type");
+    Element response = doc_.createElement("response");
     
     if (type.equals("describe")) {
@@ -514 +527 @@
         return description_;
         }
-        // else create a new response with the appropriate info 
-        Element response = doc_.createElement("response");
+        // use the new response with the appropriate info 
         response.setAttribute("type", "describe");
         
@@ -531 +543 @@
         return response;
         } 
+
+    } else if (type.equals("configure")) {
+        
+        // a list of configure requests - should put any error messages
+        // or success messages into response
+        NodeList commands = req.getChildNodes();
+        for (int i=0; i<commands.getLength(); i++) {
+        // all the commands should be Elements
+        if (commands.item(i).getNodeType() == Node.ELEMENT_NODE) {
+            Element elem = (Element)commands.item(i);
+            String name = elem.getNodeName();
+            String module_name = elem.getAttribute("name");
+            String module_type = elem.getAttribute("type");
+            if (name.equals("activate")) {
+            if (module_type.equals("collection")) {
+                activateCollection(module_name);
+            } else if (module_type.equals("servicesImpl")) {
+                activateServicesImpl(module_name);
+            } else if (module_type.equals("serviceCluster")) {
+                activateServiceCluster(module_name);
+            } else {
+                // cant process the activation
+                // send an error
+            }
+            } else if (name.equals("deactivate")) {
+            deactivate(module_type, module_name);
+            
+            }
+        }
+        }
+        return response;
         
     }
@@ -540 +583 @@
     }
 
+    protected boolean deactivate(String type, String name) {
+    
+    if (module_map_.containsKey(name)) {
+
+        System.out.println("MessageRouter: deactivating thing, name="+name);
+        module_map_.remove(name);
+
+        // also remove the xml bit from description list
+        if (type.equals("collection")) {
+        Element this_col = GSXML.getNamedElement(collection_list_, "collection", "name", name);
+        collection_list_.removeChild(this_col);
+        return true;
+        } else if (type.equals("service")) {
+        Element this_service = GSXML.getNamedElement(service_list_, "service", "name", name);
+        service_list_.removeChild(this_service);
+        return true;
+        } else if (type.equals("serviceCluster")) {
+        Element this_cluster = GSXML.getNamedElement(cluster_list_, "serviceCluster", "name", name);
+        cluster_list_.removeChild(this_cluster);
+        return true;
+        } else {
+        System.out.println("couldn't deactivate coll");
+        // couldn't do it
+        return false;
+        }
+    }
+    // else not activated 
+    return false;
+
+    }
 }
+
+