Changeset 32450 for main/trunk

Timestamp:

2018-09-13T14:12:34+12:00 (6 years ago)

Author:

kjdon

Message:

now storing and passing round gsparams class so that service clusters and services can add params to it if needed

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/MessageRouter.java (modified) (12 diffs)

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

@@ -22 +22 @@
 import java.net.Authenticator;
 import java.net.PasswordAuthentication;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
@@ -36 +37 @@
 import org.greenstone.gsdl3.util.DisplayItemUtil;
 import org.greenstone.gsdl3.util.GSFile;
+import org.greenstone.gsdl3.util.GSParams;
 import org.greenstone.gsdl3.util.GSPath;
 import org.greenstone.gsdl3.util.GSXML;
@@ -100 +102 @@
   protected Element display_item_list = null;
 
+    /** the list of params */
+    protected GSParams params = null;
+
   /** a customised class loader so we can find resources in site resources folder*/
   protected CustomClassLoader class_loader = null;
@@ -140 +145 @@
     }
 
+    public void setParams(GSParams params)
+    {
+        this.params = params;
+    }
+ 
     /**
      * configures the system
@@ -342 +352 @@
         } // for each request
 
-            logger.debug("MR returned response");
-        logger.debug(XMLConverter.getString(mainResult));
+        //logger.debug("MR returned response");
+        //logger.debug(XMLConverter.getString(mainResult));
 
         return mainResult;
@@ -393 +403 @@
     protected void cleanUpModuleMapSubset(Element list, String remote_site)
     {
-        logger.error(XMLConverter.getString(list));
+
         NodeList elements = list.getChildNodes(); // we are assuming no extraneous nodes
         for (int i = elements.getLength() - 1; i >= 0; i--)
@@ -418 +428 @@
             }
         }
-        logger.error(XMLConverter.getString(list));
     }
 
@@ -542 +551 @@
                 catch (ClassNotFoundException ae)
                 {
-                    logger.info(ae.getMessage());
+                    logger.error(ae.getMessage());
                 }
             }
@@ -559 +568 @@
                 }
 
+                s.addServiceParameters(this.params); // copyign recpt and actions.
                 // find out the supported services for this service module
                 Element service_response = (Element) s.process(service_message);
@@ -616 +626 @@
             sc.setSiteAddress(this.site_http_address);
             sc.setClusterName(name);
+            sc.setParams(this.params); // pass in params class so SC can add any service ones to it
             sc.setMessageRouter(this);
             if (!sc.configure(cluster))
@@ -622 +633 @@
                 continue;
             }
-
+            
             this.module_map.put(name, sc); // this replaces the old one if there was one already present
             //add short info to cluster list
@@ -721 +732 @@
         c.setSiteHome(this.site_home);
         c.setSiteAddress(this.site_http_address);
+        c.setParams(this.params); // pass in params class so coll can add any service ones to it
         c.setMessageRouter(this);
         if (c.configure())