Changeset 28985 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/OAIServer.java

Timestamp:

2014-04-17T13:14:45+12:00 (10 years ago)

Author:

kjdon

Message:

use OAIMessageRouter instead of MessageRouter. this will use OAICollection. then only the oai services will be loaded, not other colleciton services or site wide services, none of which are needed for oai server

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/OAIServer.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/OAIServer.java

@@ -34 +34 @@
 import org.greenstone.gsdl3.comms.Communicator;
 import org.greenstone.gsdl3.comms.SOAPCommunicator;
-import org.greenstone.gsdl3.core.MessageRouter;
+import org.greenstone.gsdl3.core.OAIMessageRouter;
 import org.greenstone.gsdl3.core.OAIReceptionist;
 import org.greenstone.gsdl3.util.GSConstants;
@@ -140 +140 @@
         this.recept = new OAIReceptionist();
 
-        // the receptionist uses a MessageRouter or Communicator to send its requests to. We either create a MessageRouter here for the designated site (if site_name set), or we create a Communicator for a remote site. The is given to teh Receptionist, and the servlet never talks to it again.directly.
+        // the receptionist uses a OAIMessageRouter or Communicator to send its requests to. We either create a OAIMessageRouter here for the designated site (if site_name set), or we create a Communicator for a remote site. The is given to teh Receptionist, and the servlet never talks to it again.directly.
         if (site_name != null)
         {
             //this site_name could consist of comma separated more than one site name.
             String mr_name = (String) config.getInitParameter("messagerouter_class");
-            MessageRouter message_router = null;
+            OAIMessageRouter message_router = null;
             if (mr_name == null)
             { // just use the normal MR *********
-                message_router = new MessageRouter();
+                message_router = new OAIMessageRouter();
             }
             else
@@ -154 +154 @@
                 try
                 {
-                    message_router = (MessageRouter) Class.forName("org.greenstone.gsdl3.core." + mr_name).newInstance();
+                    message_router = (OAIMessageRouter) Class.forName("org.greenstone.gsdl3.core." + mr_name).newInstance();
                 }
                 catch (Exception e)
                 { // cant use this new one, so use normal one
-                  logger.error("OAIServlet configure exception when trying to use a new MessageRouter " + mr_name, e);
-                  message_router = new MessageRouter();
+                  logger.error("OAIServlet configure exception when trying to use a new OAIMessageRouter " + mr_name, e);
+                  message_router = new OAIMessageRouter();
                 }
             }
 
             message_router.setSiteName(site_name);
-            // lots of work is done in this step; see MessageRouter.java
+            // lots of work is done in this step; see OAIMessageRouter.java
             if (!message_router.configure()) {
-              throw new UnavailableException("OAIServer: Couldn't configure MessageRouter");
+              throw new UnavailableException("OAIServer: Couldn't configure OAIMessageRouter");
             }
             this.recept.setSiteName(site_name);