Changeset 32450
- Timestamp:
- 2018-09-13T14:12:34+12:00 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/MessageRouter.java
r31790 r32450 22 22 import java.net.Authenticator; 23 23 import java.net.PasswordAuthentication; 24 import java.util.ArrayList; 24 25 import java.util.HashMap; 25 26 import java.util.Map; … … 36 37 import org.greenstone.gsdl3.util.DisplayItemUtil; 37 38 import org.greenstone.gsdl3.util.GSFile; 39 import org.greenstone.gsdl3.util.GSParams; 38 40 import org.greenstone.gsdl3.util.GSPath; 39 41 import org.greenstone.gsdl3.util.GSXML; … … 100 102 protected Element display_item_list = null; 101 103 104 /** the list of params */ 105 protected GSParams params = null; 106 102 107 /** a customised class loader so we can find resources in site resources folder*/ 103 108 protected CustomClassLoader class_loader = null; … … 140 145 } 141 146 147 public void setParams(GSParams params) 148 { 149 this.params = params; 150 } 151 142 152 /** 143 153 * configures the system … … 342 352 } // for each request 343 353 344 345 logger.debug(XMLConverter.getString(mainResult));354 //logger.debug("MR returned response"); 355 //logger.debug(XMLConverter.getString(mainResult)); 346 356 347 357 return mainResult; … … 393 403 protected void cleanUpModuleMapSubset(Element list, String remote_site) 394 404 { 395 logger.error(XMLConverter.getString(list)); 405 396 406 NodeList elements = list.getChildNodes(); // we are assuming no extraneous nodes 397 407 for (int i = elements.getLength() - 1; i >= 0; i--) … … 418 428 } 419 429 } 420 logger.error(XMLConverter.getString(list));421 430 } 422 431 … … 542 551 catch (ClassNotFoundException ae) 543 552 { 544 logger. info(ae.getMessage());553 logger.error(ae.getMessage()); 545 554 } 546 555 } … … 559 568 } 560 569 570 s.addServiceParameters(this.params); // copyign recpt and actions. 561 571 // find out the supported services for this service module 562 572 Element service_response = (Element) s.process(service_message); … … 616 626 sc.setSiteAddress(this.site_http_address); 617 627 sc.setClusterName(name); 628 sc.setParams(this.params); // pass in params class so SC can add any service ones to it 618 629 sc.setMessageRouter(this); 619 630 if (!sc.configure(cluster)) … … 622 633 continue; 623 634 } 624 635 625 636 this.module_map.put(name, sc); // this replaces the old one if there was one already present 626 637 //add short info to cluster list … … 721 732 c.setSiteHome(this.site_home); 722 733 c.setSiteAddress(this.site_http_address); 734 c.setParams(this.params); // pass in params class so coll can add any service ones to it 723 735 c.setMessageRouter(this); 724 736 if (c.configure())
Note:
See TracChangeset
for help on using the changeset viewer.