Changeset 14399 for greenstone3/trunk/src/java

Timestamp:

2007-09-03T13:16:35+12:00 (17 years ago)

Author:

xiao

Message:

modify the method configureServices so that if a service class is not found in package org.greenstone.gsdl3.service, try the service name alone in case the package is already specified in the name.

File:

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

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

@@ -61 +61 @@
  * @see Communicator
  *
- */
+  * Since some service classes are moved into a separate directory in order for them to be checked out from a different repository,
+ * we modify the configureServices method to search some of the classes in other place if they are not found in the service directory.
+*/
 public class MessageRouter implements  ModuleInterface {
   
@@ -239 +241 @@
     
     logger.debug("MR received request");
-    logger.info(this.converter.getString(message));
+    //logger.info(this.converter.getString(message));
     // check that its a correct message tag
     if (!message.getTagName().equals(GSXML.MESSAGE_ELEM)) {
@@ -303 +305 @@
           if (this.module_map.containsKey(obj)) {
             copied_request.setAttribute(GSXML.TO_ATT, this_mod);
+//            logger.info("::::::::::::::: \n"+this.converter.getString(req));
             result = ((ModuleInterface)this.module_map.get(obj)).process(mess);
             if (result !=null ) {
@@ -309 +312 @@
               if (res != null){
                 mainResult.appendChild(this.doc.importNode(res, true));
+ 
               }
             } else {
@@ -363 +367 @@
       String service_name = n.getAttribute(GSXML.NAME_ATT);
       logger.info("..."+service_name);
+      
+      Class service_class = null;
       try {
-        ServiceRack s = (ServiceRack)Class.forName("org.greenstone.gsdl3.service."+service_name).newInstance();
+          service_class = Class.forName("org.greenstone.gsdl3.service."+service_name);
+      } catch(ClassNotFoundException e) {
+          
+          try {
+              //try the service_name alone in case the package name is already specified
+              service_class = Class.forName(service_name);
+              
+          }catch(ClassNotFoundException ae) {
+              logger.info(ae.getMessage());
+          }
+      }
+      try {
+          
+        //ServiceRack s = (ServiceRack)Class.forName("org.greenstone.gsdl3.service."+service_name).newInstance();
+        ServiceRack s = (ServiceRack)service_class.newInstance();
         s.setSiteHome(this.site_home);
         s.setSiteAddress(this.site_http_address);