Changeset 25750 for main

Timestamp:

2012-06-05T15:42:12+12:00 (12 years ago)

Author:

sjm84

Message:

Some tidying and minor fixes

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/ServiceCluster.java (modified) (8 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/ServiceCluster.java

@@ -21 +21 @@
 package org.greenstone.gsdl3.collection;
 
-import org.greenstone.gsdl3.util.*;
-import org.greenstone.gsdl3.core.*;
-import org.greenstone.gsdl3.service.*;
-
-// java XML classes we're using
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-import java.io.*;
+import java.io.File;
 import java.util.HashMap;
 import java.util.Iterator;
 
-import org.apache.log4j.*;
+import org.apache.log4j.Logger;
+import org.greenstone.gsdl3.core.MessageRouter;
+import org.greenstone.gsdl3.core.ModuleInterface;
+import org.greenstone.gsdl3.service.ServiceRack;
+import org.greenstone.gsdl3.util.GSFile;
+import org.greenstone.gsdl3.util.GSPath;
+import org.greenstone.gsdl3.util.GSXML;
+import org.greenstone.gsdl3.util.UserContext;
+import org.greenstone.gsdl3.util.XMLConverter;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 
 /* ServiceCluster - a groups of services that are related in some way
  * Implements ModuleInterface. Contains a list of services provided by the cluster, along with metadata about the cluster itself.
  * a collection is a special type of cluster
- *  @author Katherine Don
+ *  @author <a href="mailto:[email protected]">Katherine Don</a>
  *  @version $Revision$
  *  @see ModuleInterface
@@ -357 +359 @@
                 // try for a default service in standard package
                 s = (ServiceRack) Class.forName("org.greenstone.gsdl3.service." + servicetype).newInstance();
-
             }
             catch (Exception e)
@@ -387 +388 @@
             if (s.configure(n, extra_info))
             {
-
                 // find out the supported service types for this service module
                 Node types = s.process(message);
@@ -395 +395 @@
                 {
                     String service = ((Element) typenodes.item(j)).getAttribute(GSXML.NAME_ATT);
+
                     if (service_map.get(service) != null)
                     {
@@ -444 +445 @@
     public Node process(Node message_node)
     {
-
         Element message = this.converter.nodeToElement(message_node);
 
@@ -499 +499 @@
                 Element single_message = mess_doc.createElement(GSXML.MESSAGE_ELEM);
                 single_message.appendChild(request);
+
                 Node response_message = this.service_map.get(service).process(single_message);
                 if (response_message != null)
@@ -536 +537 @@
     protected Element processMessage(Element request)
     {
-
         Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
         response.setAttribute(GSXML.FROM_ATT, this.cluster_name);
@@ -547 +547 @@
             // create the collection element
             Element description = (Element) this.description.cloneNode(false);
-            // set collection type : mg or mgpp
+            // set collection type : mg, mgpp, lucene or solr
             description.setAttribute(GSXML.TYPE_ATT, col_type);
             description.setAttribute(GSXML.DB_TYPE_ATT, db_type);