Changeset 13124

Timestamp:

2006-10-17T15:52:42+13:00 (18 years ago)

Author:

shaoqun

Message:

added the code to use log4j and replace system.out or system.err to logger.info or logger.error respectively. The commented out output has been replaced with logger.debug. The log file is in web/logs/greenstone.log

Location:

trunk/gsdl3/src/java/org/greenstone/gsdl3

Files:

• action/Action.java (modified) (3 diffs)
• action/AppletAction.java (modified) (2 diffs)
• action/BrowseAction.java (modified) (5 diffs)
• action/DocumentAction.java (modified) (7 diffs)
• action/GS2BrowseAction.java (modified) (4 diffs)
• action/GeneralAction.java (modified) (1 diff)
• action/NoCollQueryAction.java (modified) (5 diffs)
• action/PageAction.java (modified) (6 diffs)
• action/QueryAction.java (modified) (5 diffs)
• action/SystemAction.java (modified) (2 diffs)
• core/DefaultReceptionist.java (modified) (8 diffs)
• core/MessageRouter.java (modified) (34 diffs)
• core/NZDLReceptionist.java (modified) (3 diffs)
• core/Receptionist.java (modified) (16 diffs)
• core/TransformingReceptionist.java (modified) (12 diffs)
• service/AbstractBrowse.java (modified) (9 diffs)
• service/AbstractDocumentRetrieve.java (modified) (6 diffs)
• service/AbstractGS2DocumentRetrieve.java (modified) (5 diffs)
• service/AbstractMGPPSearch.java (modified) (7 diffs)
• service/AbstractMGSearch.java (modified) (6 diffs)
• service/AbstractSearch.java (modified) (3 diffs)
• service/BerryBasket.java (modified) (7 diffs)
• service/CrossCollectionSearch.java (modified) (9 diffs)
• service/GS2Browse.java (modified) (4 diffs)
• service/GS2Construct.java (modified) (9 diffs)
• service/GS2MGPPRetrieve.java (modified) (5 diffs)
• service/GS2MGPPSearch.java (modified) (3 diffs)
• service/GS2MGRetrieve.java (modified) (5 diffs)
• service/GS2MGSearch.java (modified) (3 diffs)
• service/IViaProxy.java (modified) (17 diffs)
• service/IViaRetrieve.java (modified) (5 diffs)
• service/IViaSearch.java (modified) (6 diffs)
• service/LuceneSearch.java (modified) (4 diffs)
• service/MapRetrieve.java (modified) (6 diffs)
• service/MapSearch.java (modified) (5 diffs)
• service/ModuleWrapper.java (modified) (8 diffs)
• service/PhindPhraseBrowse.java (modified) (4 diffs)
• service/ServiceRack.java (modified) (7 diffs)
• service/XMLRetrieve.java (modified) (11 diffs)
• service/XSLTServices.java (modified) (7 diffs)
• util/Dictionary.java (modified) (5 diffs)
• util/GDBMWrapper.java (modified) (8 diffs)
• util/GSEntityResolver.java (modified) (3 diffs)
• util/GSFile.java (modified) (7 diffs)
• util/GSXML.java (modified) (4 diffs)
• util/GlobalProperties.java (modified) (3 diffs)
• util/Processing.java (modified) (4 diffs)
• util/XMLConverter.java (modified) (8 diffs)
• util/XMLTransformer.java (modified) (7 diffs)
• util/XSLTUtil.java (modified) (2 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/action/Action.java

@@ -16 +16 @@
 import java.util.Iterator;
 
+import org.apache.log4j.*;
+
 /** base class for Actions */
 abstract public class Action {
@@ -29 +31 @@
      doesn't care about that */
     protected ModuleInterface mr=null;
+
+    static Category logger = Category.getInstance(org.greenstone.gsdl3.action.Action.class.getName());
 
     public Action() {
@@ -54 +58 @@
     Document message_doc = this.converter.getDOM(xml_in);
     if (message_doc == null) {
-        System.err.println("Action.process(String) Error: Couldn't parse request");
-        System.err.println(xml_in);
+        logger.error("Couldn't parse request");
+        logger.error(xml_in);
         return null;
     }

trunk/gsdl3/src/java/org/greenstone/gsdl3/action/AppletAction.java

@@ -12 +12 @@
 import java.io.File;
 
+import org.apache.log4j.*;
+
 /** action class for handling applets */
 public class AppletAction extends Action {
-    
+
+      static Category logger = Category.getInstance(org.greenstone.gsdl3.action.AppletAction.class.getName());   
 
     public Element process (Element message) {
@@ -30 +33 @@
     String request_type = (String)params.get(GSParams.REQUEST_TYPE);
     if (!request_type.equals("d")&&!request_type.equals("r")) {
-        System.err.println("AppletAction Error: the rt arg should be either d or r, instead it was "+request_type+"!");
+        logger.error("AppletAction Error: the rt arg should be either d or r, instead it was "+request_type+"!");
         return result;
     }

trunk/gsdl3/src/java/org/greenstone/gsdl3/action/BrowseAction.java

@@ -14 +14 @@
 import java.io.File;
 
+import org.apache.log4j.*;
+
 //NOTE: this class not used at present!!!!!
 /** action for classifier browsing */
 public class BrowseAction extends Action {
-    
+
+    static Category logger = Category.getInstance(org.greenstone.gsdl3.action.BrowseAction.class.getName());
+
     public static final String CLASSIFIER_ARG = "cl";
     public static final String SIBLING_ARG = "sib";
@@ -46 +50 @@
     String collection = (String)params.get(GSParams.COLLECTION);
     if (collection == null || collection.equals("")) {
-        System.err.println("BrowseAction Error:classifierBrowse, need to specify a collection!");
+        logger.error("classifierBrowse, need to specify a collection!");
         return page_response;
        
@@ -123 +127 @@
     }
     
-    System.out.println("extracted meta names, "+metadata_names.toString());
+    logger.info("extracted meta names, "+metadata_names.toString());
     // get the browse structure for the selected node
     Element classify_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
@@ -166 +170 @@
                                 path);
     if (cl_structure ==null) {
-        System.err.println("BrowseAction: classifier structure request returned no structure");
+        logger.error("classifier structure request returned no structure");
         return page_response;
     }   
@@ -281 +285 @@
         
 
-    ///ystem.out.println("(BrowseAction) Page:\n" + this.converter.getPrettyString(page_response));
+    logger.debug("(BrowseAction) Page:\n" + this.converter.getPrettyString(page_response));
     return page_response;
     }
 
     protected Element unknownBrowse(Element page, Element request, String browse_type) {
-    System.err.println("BrowseAction Error: unknown browse subtype: "+browse_type);
+    logger.error("unknown browse subtype: "+browse_type);
     return null;
     }

trunk/gsdl3/src/java/org/greenstone/gsdl3/action/DocumentAction.java

@@ -36 +36 @@
 import java.io.File;
 
+import org.apache.log4j.*;
 
 /** Action class for retrieving Documents  via the message router
  */
 public class DocumentAction extends Action {
-  
+
+   static Category logger = Category.getInstance(org.greenstone.gsdl3.action.DocumentAction.class.getName());
+
     // this is used to specify that the sibling nodes of a selected one should be obtained
     public static final String SIBLING_ARG = "sib";
@@ -86 +89 @@
     String document_name = (String) params.get(GSParams.DOCUMENT);
     if (document_name == null || document_name.equals("")) {
-        System.err.println("DocumentAction Error: no document specified!");
+        logger.error("no document specified!");
         return result;
     }
@@ -352 +355 @@
         dc_request.appendChild(basic_doc_list);
     }
-    ///ystem.err.println("request = "+converter.getString(dc_message));
+    logger.debug("request = "+converter.getString(dc_message));
     Element dc_response_message = (Element) this.mr.process(dc_message);
     if (processErrorElements(dc_response_message, page_response)) {
@@ -453 +456 @@
     }
     }
-    ///ystem.out.println("(DocumentAction) Page:\n" + this.converter.getPrettyString(result));
+    logger.debug("(DocumentAction) Page:\n" + this.converter.getPrettyString(result));
     return result;
     }
@@ -499 +502 @@
     Element format_elem = (Element)GSXML.getChildByTagName(format_resp, GSXML.FORMAT_ELEM);
     if (format_elem != null) {
-        ///ystem.out.println("doc action found a format statement");
+        logger.debug("doc action found a format statement");
         // set teh format type
         format_elem.setAttribute(GSXML.TYPE_ATT, "display");  
@@ -552 +555 @@
         String service_name = (String)previous_params.get(GSParams.SERVICE);
     if (service_name == null || !service_name.endsWith("Query")) { // hack for now - we only do highlighting if we were in a query last - ie not if we were in a browse thingy
-        System.err.println("DocumentAction: invalid service, not doing highlighting");
+        logger.error("invalid service, not doing highlighting");
         return dc_response_doc_content;
     }
@@ -578 +581 @@
     if (query_term_list_element == null) {
         // no term info
-        System.err.println("DocumentAction: Warning: No query term information.\n");
+        logger.error("No query term information.\n");
         return dc_response_doc_content;
     } 

trunk/gsdl3/src/java/org/greenstone/gsdl3/action/GS2BrowseAction.java

@@ -14 +14 @@
 import java.io.File;
 
+import org.apache.log4j.*;
+
 /** action for GS2 style classifier browsing */
 public class GS2BrowseAction extends Action {
     
     public static final String CLASSIFIER_ARG = "cl";
-    
+
+    static Category logger = Category.getInstance(org.greenstone.gsdl3.action.GS2BrowseAction.class.getName());    
+
     /** process the request */
     public Element process (Element message) {
@@ -44 +48 @@
     String collection = (String)params.get(GSParams.COLLECTION);
     if (collection == null || collection.equals("")) {
-        System.err.println("GS2BrowseAction Error:classifierBrowse, need to specify a collection!");
+        logger.error("classifierBrowse, need to specify a collection!");
         return page_response;
        
@@ -175 +179 @@
                                 path);
     if (cl_structure ==null) {
-        System.err.println("GS2BrowseAction: classifier structure request returned no structure");
+        logger.error("classifier structure request returned no structure");
         return page_response;
     }   
@@ -302 +306 @@
         
 
-    ///ystem.out.println("(GS2BrowseAction) Page:\n" + this.converter.getPrettyString(page_response));
+    logger.debug("(GS2BrowseAction) Page:\n" + this.converter.getPrettyString(page_response));
     return page_response;
     }

trunk/gsdl3/src/java/org/greenstone/gsdl3/action/GeneralAction.java

@@ -13 +13 @@
 import java.util.Iterator;
 import java.io.File;
+
 
 public class GeneralAction extends Action {

trunk/gsdl3/src/java/org/greenstone/gsdl3/action/NoCollQueryAction.java

@@ -17 +17 @@
 import java.io.File;
 
+import org.apache.log4j.*;
+
 /** action class for queries 
  * this is used when querying isn't collection specific, but it occurs across all collections in the site. The service description is assumed to be known by the xslt so we dont ask for it. we just pass all the service params to the TextQuery service of all the collections */
 public class NoCollQueryAction extends Action {
-   
+    
+    static Category logger = Category.getInstance(org.greenstone.gsdl3.action.NoCollQueryAction.class.getName());
     /** process - processes a request.
      */ 
@@ -70 +73 @@
     
     if (query_coll_list == null || query_coll_list.equals("")) {
-        System.err.println("NoCollQueryAction Error: no collections were specified!");
+        logger.error("no collections were specified!");
         Element coll_list = getCollectionList(lang, uid);
         page_response.appendChild(this.doc.importNode(coll_list, true));
@@ -167 +170 @@
     Element coll_list_response = (Element)this.mr.process(coll_list_message);
     if (coll_list_response==null) {
-        System.err.println("NoCollQueryAction Error: couldn't query the message router!");
+        logger.error("couldn't query the message router!");
         return null;
     }
@@ -193 +196 @@
     // check that have same number of responses as collections
     if (colls.getLength() != coll_responses.getLength()) {
-        System.err.println("NoCollQueryAction Error: didn't get a response for each collection - somethings gone wrong!");
+        logger.error("didn't get a response for each collection - somethings gone wrong!");
         // for now, dont use the metadata
     } else {
@@ -203 +206 @@
             GSXML.mergeElements(c1, (Element)GSXML.getChildByTagName(c2, GSXML.COLLECTION_ELEM));
         } else {
-            System.err.println("NoCollQueryAction Error: response does not correspond to request!");
+            logger.error("response does not correspond to request!");
         } 
         

trunk/gsdl3/src/java/org/greenstone/gsdl3/action/PageAction.java

@@ -12 +12 @@
 import java.io.File;
 
+import org.apache.log4j.*;
+
 public class PageAction extends Action {
+   
+     static Category logger = Category.getInstance(org.greenstone.gsdl3.action.PageAction.class.getName());
 
     public static final String HOME_PAGE = "home";
@@ -35 +39 @@
     } else { // unknown page
         
-        System.err.println("PageAction Error: unknown page specified!");
+        logger.error("unknown page specified!");
         response =  unknownPage(request);
     }
     
     result.appendChild(this.doc.importNode(response, true));
-    ///ystem.out.println("page action result: "+this.converter.getPrettyString(result));
+    logger.debug("page action result: "+this.converter.getPrettyString(result));
     return result;
     }
@@ -55 +59 @@
     Element info_response_message = (Element)this.mr.process(info_message);
     if (info_response_message==null) {
-        System.err.println("PageAction Error: couldn't query the message router!");
+        logger.error(" couldn't query the message router!");
         return null;
     }
     Element info_response = (Element)GSXML.getChildByTagName(info_response_message, GSXML.RESPONSE_ELEM);
     if (info_response==null) {
-        System.err.println("PageAction Error: couldn't query the message router!");
+        logger.error("couldn't query the message router!");
         return null;
     }
@@ -108 +112 @@
     String coll_name = (String)params.get(GSParams.COLLECTION);
     if (coll_name == null || coll_name.equals("")) {
-        System.err.println("PageAction Error: about page requested with no collection or cluster specified!");
+        logger.error("about page requested with no collection or cluster specified!");
         // return an empty response
         return this.doc.createElement(GSXML.RESPONSE_ELEM);
@@ -194 +198 @@
     // check that have same number of responses as requests
     if (items.getLength() != responses.getLength()) {
-        System.err.println("PageAction Error: didn't get a response for each request - somethings gone wrong!");
+        logger.error("didn't get a response for each request - somethings gone wrong!");
         return false;
     } 
@@ -205 +209 @@
         GSXML.mergeElements(c1, c2);
         } else {
-        System.err.println("PageAction Error: response does not correspond to request!");
+        logger.error(" response does not correspond to request!");
         } 
         

trunk/gsdl3/src/java/org/greenstone/gsdl3/action/QueryAction.java

@@ -17 +17 @@
 import java.io.File;
 
+import org.apache.log4j.*;
+
 /** action class for queries */
 public class QueryAction extends Action {
+
+
+     static Category logger = Category.getInstance(org.greenstone.gsdl3.action.QueryAction.class.getName());
     
     /** process - processes a request.
@@ -116 +121 @@
     Element query_result_metadata_list = (Element) GSXML.getChildByTagName(query_response, GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
     if (query_result_metadata_list == null) {
-        System.err.println("QueryAction: Warning: No query result metadata.\n");
+        logger.error("No query result metadata.\n");
     } else { // add it into the page response
         page_response.appendChild(this.doc.importNode(query_result_metadata_list, true)); 
@@ -123 +128 @@
     Element query_term_info_list = (Element) GSXML.getChildByTagName(query_response, GSXML.TERM_ELEM+GSXML.LIST_MODIFIER);
     if (query_term_info_list == null) {
-        System.err.println("QueryAction: Warning: No query term information.\n");
+        logger.error("No query term information.\n");
     } else { // add it into the page response
         page_response.appendChild(this.doc.importNode(query_term_info_list, true));
@@ -140 +145 @@
     NodeList doc_metadata = document_list.getElementsByTagName(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
     if (doc_metadata.getLength()>0) {
-        System.err.println("have already found metadata!");
+        logger.error("have already found metadata!");
         // append the doc list to the result
         page_response.appendChild(this.doc.importNode(document_list, true));
@@ -193 +198 @@
     }
     
-    ///ystem.out.println("Query page:\n" + this.converter.getPrettyString(page_response));
+    logger.debug("Query page:\n" + this.converter.getPrettyString(page_response));
     return page_response;
     }

trunk/gsdl3/src/java/org/greenstone/gsdl3/action/SystemAction.java

@@ -13 +13 @@
 import java.util.HashMap;
 
+import org.apache.log4j.*;
+
 public class SystemAction extends Action {
     
+      static Category logger = Category.getInstance(org.greenstone.gsdl3.action.SystemAction.class.getName());
+
     /** process a request */
     public Element process (Element message) {
@@ -65 +69 @@
         // create the default response
         // for now just have an error
-        System.err.println("SystemAction error: bad subaction type");
+        logger.error("bad subaction type");
         Element page_response = this.doc.createElement(GSXML.RESPONSE_ELEM);
         result.appendChild(page_response);

trunk/gsdl3/src/java/org/greenstone/gsdl3/core/DefaultReceptionist.java

@@ -14 +14 @@
 import java.util.Enumeration;
 
+import org.apache.log4j.*;
+
 /** The default greenstone receptionist - needs some extra info for each page
  */
 public class DefaultReceptionist extends TransformingReceptionist {
+
+     static Category logger = Category.getInstance(org.greenstone.gsdl3.core.DefaultReceptionist.class.getName());
     
     protected void addExtraInfo(Element page) {
@@ -27 +31 @@
     String action = page_request.getAttribute(GSXML.ACTION_ATT);
     if (action.equals("s")) {
-        System.err.println("HACK: don't ask for coll info if system action");
+        logger.error("HACK: don't ask for coll info if system action");
         return;
     }
-    ///ystem.out.println("add extra info, page request="+this.converter.getString(page_request));
+    logger.debug("add extra info, page request="+this.converter.getString(page_request));
     // is a collection defined?
     Element param_list = (Element)GSXML.getChildByTagName(page_request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     if (param_list==null) { // must be the original home page
-        ///ystem.out.println("DefaultReceptionist: no param list, assuming home page");
+        logger.debug(" no param list, assuming home page");
         return;
     }
     Element coll_param = GSXML.getNamedElement(param_list, GSXML.PARAM_ELEM, GSXML.NAME_ATT, GSParams.COLLECTION);
     if (coll_param == null) {
-        ///ystem.out.println("DefaultReceptionist: coll param is null, returning");
+        logger.debug(" coll param is null, returning");
         return;
     }
@@ -75 +79 @@
         
         if (coll_description == null) {
-        System.err.println("DefaultReceptionist: no collection description, returning");
+        logger.error(" no collection description, returning");
         return;
         }
@@ -89 +93 @@
     Element service_list = (Element)GSXML.getChildByTagName(coll_description, GSXML.SERVICE_ELEM+GSXML.LIST_MODIFIER);
     if (service_list == null) {
-        System.err.println("DefaultReceptionist: no service list, returning");
+        logger.error(" no service list, returning");
         // something weird has gone wrong
         return;
@@ -96 +100 @@
     NodeList services = service_list.getElementsByTagName(GSXML.SERVICE_ELEM);
     if (services.getLength()==0) {
-        System.err.println("DefaultReceoptionist: no services found for colllection/cluster "+ coll_name);
+        logger.error("DefaultReceoptionist: no services found for colllection/cluster "+ coll_name);
         return;
     }
@@ -118 +122 @@
 
     // if get here, we need to get the service descriptions
-    ///ystem.out.println("getting services description");
+    logger.debug("getting services description");
         
     // we will send all the requests in a single message
@@ -139 +143 @@
     // check that have same number of responses as collections
     if (services.getLength() != service_responses.getLength()) {
-        System.err.println("DefaultReceptionist Error: didn't get a response for each service - somethings gone wrong!");
+        logger.error(" didn't get a response for each service - somethings gone wrong!");
         // for now, dont use the metadata
     } else {
@@ -149 +153 @@
             GSXML.mergeElements(c1, c2);
         } else {
-            System.err.println("DefaultReceptionist Error: response does not correspond to request!");
+            logger.error(" response does not correspond to request!");
         } 
         

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

@@ -42 +42 @@
 import java.util.Properties;
 
+import org.apache.log4j.*;
+
 /**
  * The hub of a Greenstone system. 
@@ -62 +64 @@
 public class MessageRouter implements  ModuleInterface {
 
+     static Category logger = Category.getInstance(org.greenstone.gsdl3.core.MessageRouter.class.getName());
+
     /** the (directory) name of the site */
     protected String site_name = null;
@@ -127 +131 @@
     public boolean configure() { 
 
-    System.out.println("MessageRouter:configuring site");
+    logger.info("configuring site");
 
     if (this.site_name==null) {
-        System.err.println("MessageRouter: You must set site_name before calling configure");
+        logger.error(" You must set site_name before calling configure");
         return false;
     }
@@ -158 +162 @@
             
         } catch (Exception e) {
-            System.err.println("MessageRouter Error: couldn't set up an authenticator the proxy");
+            logger.error("MessageRouter Error: couldn't set up an authenticator the proxy");
             
         }
@@ -168 +172 @@
 
     if (!configFile.exists() ) {
-        System.err.println("MessageRouter: site config file: "+configFile.getPath()+" not found!");
+        logger.error(" site config file: "+configFile.getPath()+" not found!");
         return false;
     }
@@ -174 +178 @@
     Document config_doc = this.converter.getDOM(configFile);
     if (config_doc == null) {
-System.err.println("MessageRouter: couldn't parse site config file: "+configFile.getPath());
+logger.error(" couldn't parse site config file: "+configFile.getPath());
         return false;
     }
@@ -226 +230 @@
      */
     public Element process(Element message) {
-
-    ///ystem.out.println("MR received request");
-    ///ystem.out.println(this.converter.getString(message));
+     
+    logger.debug("MR received request");
+    logger.debug(this.converter.getString(message));
     // check that its a correct message tag
     if (!message.getTagName().equals(GSXML.MESSAGE_ELEM)) {
-        System.err.println("MessageRouter: Invalid message. GSDL message should start with <"+GSXML.MESSAGE_ELEM+">, instead it starts with:"+message.getTagName()+".");
+        logger.error(" Invalid message. GSDL message should start with <"+GSXML.MESSAGE_ELEM+">, instead it starts with:"+message.getTagName()+".");
         return null;
     }
@@ -254 +258 @@
         Element req = (Element)requests.item(i);
         if (req == null) {
-        System.err.println("request "+i+" is null");
+        logger.error("request "+i+" is null");
         continue;
         }
@@ -294 +298 @@
                 response.setAttribute(GSXML.FROM_ATT, this_mod);
                 mainResult.appendChild(response);
-                System.err.println("MessageRouter Error: request had null result!");
+                logger.error("MessageRouter Error: request had null result!");
             }
             
             } else {    
-            System.err.println("MessageRouter Error: request has illegal module name in:\n"+this.converter.getString(req));
+            logger.error("MessageRouter Error: request has illegal module name in:\n"+this.converter.getString(req));
             }
         }
@@ -305 +309 @@
     } // for each request
     
-    ///ystem.out.println("MR returned response");
-    ///ystem.out.println(this.converter.getString(mainResult));
+    logger.debug("MR returned response");
+    logger.debug(this.converter.getString(mainResult));
 
     return mainResult;
@@ -322 +326 @@
 
     // load up the individual services
-    System.out.println("loading service modules...");
+    logger.info("loading service modules...");
     
     if (service_rack_list == null) {
-        System.out.println("... none to be loaded");
+        logger.info("... none to be loaded");
         return true;
     } 
@@ -331 +335 @@
     NodeList service_racks = service_rack_list.getElementsByTagName(GSXML.SERVICE_CLASS_ELEM);
     if (service_racks.getLength()==0) {
-        System.out.println("... none to be loaded");
+        logger.info("... none to be loaded");
         return true;
     } 
@@ -342 +346 @@
         Element n = (Element)service_racks.item(i);
         String service_name = n.getAttribute(GSXML.NAME_ATT);
-        System.out.println("..."+service_name);
+        logger.info("..."+service_name);
         try {
         ServiceRack s = (ServiceRack)Class.forName("org.greenstone.gsdl3.service."+service_name).newInstance();
@@ -355 +359 @@
         NodeList services = service_response.getElementsByTagName(GSXML.SERVICE_ELEM);
         if (services.getLength()==0) {
-            System.err.println("MessageRouter configure error: serviceRack "+service_name+" has no services!");
+            logger.error("MessageRouter configure error: serviceRack "+service_name+" has no services!");
         } else {
             for (int j=0; j<services.getLength();j++) {
@@ -366 +370 @@
         }
         } catch (Exception e ) {
-        System.err.println("MessageRouter configure exception:  in ServiceRack class specification:  "+ e.getMessage());
+        logger.error("MessageRouter configure exception:  in ServiceRack class specification:  "+ e.getMessage());
         e.printStackTrace();
         } 
@@ -377 +381 @@
     this.cluster_list = this.doc.createElement(GSXML.CLUSTER_ELEM+GSXML.LIST_MODIFIER);
     // load up the service clusters
-    System.out.println("loading service clusters ...");
+    logger.info("loading service clusters ...");
     if (config_cluster_list == null) {
-        System.out.println("... none to be loaded");
+        logger.info("... none to be loaded");
         return true;
     } 
     NodeList service_clusters = config_cluster_list.getElementsByTagName(GSXML.CLUSTER_ELEM);
     if (service_clusters.getLength()==0) {
-        System.out.println("... none to be loaded");
+        logger.info("... none to be loaded");
         return true;
     }
@@ -391 +395 @@
         Element cluster = (Element)service_clusters.item(i);
         String name = cluster.getAttribute(GSXML.NAME_ATT);
-        System.out.println("..."+name);
+        logger.info("..."+name);
         ServiceCluster sc = new ServiceCluster();
         sc.setSiteHome(this.site_home);
@@ -415 +419 @@
     File collectDir = new File(GSFile.collectDir(this.site_home));
     if (collectDir.exists()) {
-        System.out.println("Reading thru directory "+collectDir.getPath()+" to find collections.");
+        logger.info("Reading thru directory "+collectDir.getPath()+" to find collections.");
         File[] contents = collectDir.listFiles();
         for (int i=0; i<contents.length;i++) {
@@ -434 +438 @@
     this.site_list = this.doc.createElement(GSXML.SITE_ELEM+GSXML.LIST_MODIFIER);
     // load up the sites
-    System.out.println("loading external sites...");
+    logger.info("loading external sites...");
     if (config_site_list ==null ) {
-        System.out.println("...none found");
+        logger.info("...none found");
         return true;
     }
@@ -442 +446 @@
     NodeList sites = config_site_list.getElementsByTagName(GSXML.SITE_ELEM);
     if (sites.getLength()==0) {
-        System.out.println("...none found");
+        logger.info("...none found");
         return true;
     }
@@ -475 +479 @@
         // have to be added later 
         if (!getRemoteSiteInfo(comm, name)) {
-            System.err.println("MessageRouter: couldn't get info from site "+name);
+            logger.error(" couldn't get info from site "+name);
         }
         } else {
-        System.err.println("MessageRouter: couldn't configure soap site:"+name);
+        logger.error(" couldn't configure soap site:"+name);
         return false;
         }
         
     } else {
-        System.err.print("MessageRouter: cant talk to server of type:"+type + ", so not making a connection to "+name);
+        System.err.print(" cant talk to server of type:"+type + ", so not making a connection to "+name);
         return false;
     }
@@ -497 +501 @@
     protected boolean getRemoteSiteInfo(Communicator comm, String site_name) {
     
-    System.out.println("MessageRouter: getting info from site:"+site_name);
+    logger.info(" getting info from site:"+site_name);
 
     Element info_request = this.doc.createElement(GSXML.MESSAGE_ELEM);
@@ -630 +634 @@
                 File configFile = new File(GSFile.siteConfigFile(this.site_home));
                 if (!configFile.exists() ) {
-                    System.err.println("MessageRouter: site config file: "+configFile.getPath()+" not found!");
+                    logger.error(" site config file: "+configFile.getPath()+" not found!");
                     continue;
                 }
                 Document site_config_doc = this.converter.getDOM(configFile);
                 if (site_config_doc == null) {
-                    System.err.println("MessageRouter: couldn't parse site config file: "+configFile.getPath());
+                    logger.error(" couldn't parse site config file: "+configFile.getPath());
                     continue;
                 }
@@ -696 +700 @@
     
     // if get here something has gone wrong
-    System.err.println("MessageRouter: cant process request:");
-    System.err.println(this.converter.getString(req));
+    logger.error(" cant process request:");
+    logger.error(this.converter.getString(req));
     return null;
        
@@ -708 +712 @@
     NodeList commands = request.getElementsByTagName("command");
     if (commands == null) {
-        System.err.println("no commands, "+converter.getPrettyString(request));
+        logger.error("no commands, "+converter.getPrettyString(request));
         return response;
     }
@@ -769 +773 @@
     protected boolean activateCollectionByName(String col_name) {
 
-    System.out.println("MessageRouter:Activating collection: "+col_name+".");
+    logger.info("Activating collection: "+col_name+".");
         
     // now we need to look for the etc/collectionInit.xml file, and see what sort of Collection to load
@@ -784 +788 @@
                 c = (Collection)Class.forName("org.greenstone.gsdl3.collection."+coll_class_name).newInstance();
             } catch (Exception e) {
-                System.out.println("MessageRouter: couldn't create a new collection, type "+coll_class_name+", defaulting to class Collection");
+                logger.info(" couldn't create a new collection, type "+coll_class_name+", defaulting to class Collection");
             }
             }
@@ -809 +813 @@
         return true;
     } else {
-        System.err.println("MessageRouter:Couldn't configure collection: "+
+        logger.error("Couldn't configure collection: "+
                    col_name+".");
         return false;
@@ -817 +821 @@
     
     protected boolean activateSiteByName(String site_name) {
-    System.out.println("MessageRouter:Activating site: "+site_name+".");
+    logger.info("Activating site: "+site_name+".");
     
     // just in case this is a reactivation, deactivate this site first
@@ -824 +828 @@
 
     if (!configFile.exists() ) {
-        System.err.println("MessageRouter: site config file: "+configFile.getPath()+" not found!");
+        logger.error(" site config file: "+configFile.getPath()+" not found!");
         return false;
     }
     Document config_doc = this.converter.getDOM(configFile);
     if (config_doc == null) {
-        System.err.println("MessageRouter: couldn't parse site config file: "+configFile.getPath());
+        logger.error(" couldn't parse site config file: "+configFile.getPath());
         return false;
     }
@@ -836 +840 @@
     Element config_site_list = (Element)GSXML.getChildByTagName(config_elem, GSXML.SITE_ELEM+GSXML.LIST_MODIFIER);
     if (config_site_list ==null ) {
-        System.err.println("MessageRouter:activateSite, no sites found");
+        logger.error("activateSite, no sites found");
         return false;
     }
@@ -847 +851 @@
     Element this_site_elem = GSXML.getNamedElement(config_site_list, GSXML.SITE_ELEM, GSXML.NAME_ATT, site_name);
     if (this_site_elem == null) {
-        System.err.println("MessageRouter:activateSite, site "+site_name+" not found");
+        logger.error("activateSite, site "+site_name+" not found");
         return false;
     }
@@ -867 +871 @@
     if (this.module_map.containsKey(name)) {
 
-        System.out.println("MessageRouter: deactivating "+name);
+        logger.info(" deactivating "+name);
         ModuleInterface m = (ModuleInterface)this.module_map.remove(name);
         m.cleanUp(); // clean up any open files/connections etc - can cause trouble on windows
@@ -900 +904 @@
         }
         } else {
-        System.err.println("MessageRouter: couldn't deactivate coll");
+        logger.error(" couldn't deactivate coll");
         // couldn't do it
         return false;

trunk/gsdl3/src/java/org/greenstone/gsdl3/core/NZDLReceptionist.java

@@ -14 +14 @@
 import java.util.Enumeration;
 
+import org.apache.log4j.*;
+
 /** 
  * This is a new version of the Receptionist for the NZDL interface
@@ -20 +22 @@
  */
 public class NZDLReceptionist extends DefaultReceptionist {
-    
+
+     static Category logger = Category.getInstance(org.greenstone.gsdl3.core. NZDLReceptionist.class.getName());
+
     protected void addExtraInfo(Element page) {
-    ///ystem.out.println("the  page before adding extra info is");
-    ///ystem.out.println(this.converter.getPrettyString(page));
+    logger.debug("the  page before adding extra info is");
+    logger.debug(this.converter.getPrettyString(page));
 
     super.addExtraInfo(page);
@@ -87 +91 @@
         }
     }
-    ///ystem.out.println("the final page before transforming is");
-    ///ystem.out.println(this.converter.getPrettyString(page));
+    logger.debug("the final page before transforming is");
+    logger.debug(this.converter.getPrettyString(page));
     return;
     }

trunk/gsdl3/src/java/org/greenstone/gsdl3/core/Receptionist.java

@@ -15 +15 @@
 import java.util.ArrayList;
 
+import org.apache.log4j.*;
+
 /** the most basic Receptionist, used for interface generation. 
  * Receives requests consisting
@@ -23 +25 @@
 public class Receptionist implements ModuleInterface {
 
+     static Category logger = Category.getInstance(org.greenstone.gsdl3.core.Receptionist.class.getName());
+
     /** the set up variables */
     protected HashMap config_params = null;
@@ -67 +71 @@
 
     if (this.config_params==null) {
-        System.err.println("Receptionist Error: config variables must be set before calling configure");
+        logger.error(" config variables must be set before calling configure");
         return false;
     }
     if (this.mr==null) {       
-        System.err.println("Receptionist Error: message router must be set  before calling configure");
+        logger.error(" message router must be set  before calling configure");
         return false;
     }
@@ -78 +82 @@
     File interface_config_file = new File(GSFile.interfaceConfigFile(GSFile.interfaceHome(GlobalProperties.getGSDL3Home(), (String)this.config_params.get(GSConstants.INTERFACE_NAME))));
     if (!interface_config_file.exists()) {
-        System.err.println("Receptionist: interface config file: "+interface_config_file.getPath()+" not found!");
+        logger.error(" interface config file: "+interface_config_file.getPath()+" not found!");
         return false;
     }
@@ -84 +88 @@
     Document config_doc = this.converter.getDOM(interface_config_file);
     if (config_doc == null) {
-        System.err.println("Receptionist: could not parse interface config file: "+interface_config_file.getPath());
+        logger.error(" could not parse interface config file: "+interface_config_file.getPath());
         return false;
     }
@@ -104 +108 @@
         ac = (Action)Class.forName("org.greenstone.gsdl3.action."+class_name).newInstance();
         } catch (Exception e) {
-        System.err.println("Receptionist: couldn't load in action "+class_name);
+        logger.error(" couldn't load in action "+class_name);
         e.printStackTrace();
         continue;
@@ -117 +121 @@
     this.language_list = (Element)GSXML.getChildByTagName(config_elem, "languageList");
     if (language_list == null) {
-        System.err.println("Receptionist: didn't find a language list in the config file!!");
+        logger.error(" didn't find a language list in the config file!!");
     }
 
@@ -138 +142 @@
     Element request = (Element)GSXML.getChildByTagName(message, GSXML.REQUEST_ELEM);
     if (request == null) {
-        System.err.println("Receptionist Error: message had no request!");
+        logger.error(" message had no request!");
         return null; 
     }
@@ -145 +149 @@
     if (!type.equals(GSXML.REQUEST_TYPE_PAGE)) { 
         // now Receptionist forwards non-page requests straight to the MR, and returns the responses
-        System.err.println("Receptionist: request type is not '"+GSXML.REQUEST_TYPE_PAGE+"', but it is '"+type+"', so forwarding the message to the MR!");
+        logger.error(" request type is not '"+GSXML.REQUEST_TYPE_PAGE+"', but it is '"+type+"', so forwarding the message to the MR!");
         // process the whole message - mr needs <message> tags, and 
         // in this case, there may be more than one request in the message
@@ -153 +157 @@
     String action = request.getAttribute(GSXML.ACTION_ATT);
     if (action.equals("")) {
-        System.err.println("Receptionist Error: no action specified in the request!");
+        logger.error(" no action specified in the request!");
         return null;
     }
@@ -173 +177 @@
         } catch (Exception e) {
         
-        System.err.println("Receptionist Error: a new action ("+action_name+") was specified and it couldn't be created. Error message:"+e.getMessage());
+        logger.error(" a new action ("+action_name+") was specified and it couldn't be created. Error message:"+e.getMessage());
         return null;
         }
@@ -209 +213 @@
     page.appendChild(page_response);
 
-    ///ystem.out.println("Receptionist: raw page="+this.converter.getString(page));
+    logger.debug(" raw page="+this.converter.getString(page));
     // transform the result in some way
     Element resulting_page = postProcessPage(page);
@@ -226 +230 @@
         File base_interface_config_file = new File(GSFile.interfaceConfigFile(GSFile.interfaceHome(GlobalProperties.getGSDL3Home(), base_interface)));
         if (!base_interface_config_file.exists()) {
-        System.err.println("Receptionist: base interface config file: "+base_interface_config_file.getPath()+" not found!");
+        logger.error(" base interface config file: "+base_interface_config_file.getPath()+" not found!");
         return false;
         }
@@ -237 +241 @@
         Document config_doc = this.converter.getDOM(base_interface_config_file);
         if (config_doc == null) {
-        System.err.println("Receptionist: could not parse base interface config file: "+base_interface_config_file.getPath());
+        logger.error(" could not parse base interface config file: "+base_interface_config_file.getPath());
         return false;
         }
@@ -249 +253 @@
     Element option_list = (Element)GSXML.getChildByTagName(config_elem, "optionList");
     if (option_list != null) {
-        System.err.println("found an option list");
+        logger.error("found an option list");
         // we set any options in the config params
         NodeList options = option_list.getElementsByTagName("option");
@@ -256 +260 @@
         String name = option.getAttribute(GSXML.NAME_ATT);
         String value = option.getAttribute(GSXML.VALUE_ATT);
-        System.err.println("option: "+name+", "+value);
+        logger.error("option: "+name+", "+value);
         if (!name.equals("") && !value.equals("")) {
             this.config_params.put(name, value);

trunk/gsdl3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java

@@ -14 +14 @@
 import java.util.Enumeration;
 
+import org.apache.log4j.*;
+
 /** A receptionist that uses xslt to transform the page_data before returning it. . Receives requests consisting
  * of an xml representation of cgi args, and returns the page of data - in 
@@ -22 +24 @@
 public class TransformingReceptionist extends Receptionist{
     
+     static Category logger = Category.getInstance(org.greenstone.gsdl3.core.TransformingReceptionist.class.getName());
+
     /** the list of xslt to use for actions */
     protected HashMap xslt_map = null;
@@ -38 +42 @@
     
     if (this.config_params==null) {
-        System.err.println("TransformingReceptionist Error: config variables must be set before calling configure");
+        logger.error(" config variables must be set before calling configure");
         return false;
     }
     if (this.mr==null) {       
-        System.err.println("TransformingReceptionist Error: message router must be set  before calling configure");
+        logger.error(" message router must be set  before calling configure");
         return false;
     }
@@ -49 +53 @@
     File interface_config_file = new File(GSFile.interfaceConfigFile(GSFile.interfaceHome(GlobalProperties.getGSDL3Home(), (String)this.config_params.get(GSConstants.INTERFACE_NAME))));
     if (!interface_config_file.exists()) {
-        System.err.println("TransformingReceptionist: interface config file: "+interface_config_file.getPath()+" not found!");
+        logger.error(" interface config file: "+interface_config_file.getPath()+" not found!");
         return false;
     }
     Document config_doc = this.converter.getDOM(interface_config_file, "utf-8");
     if (config_doc == null) {
-        System.err.println("TransformingReceptionist: could not parse interface config file: "+interface_config_file.getPath());
+        logger.error(" could not parse interface config file: "+interface_config_file.getPath());
         return false;
     }
@@ -73 +77 @@
         ac = (Action)Class.forName("org.greenstone.gsdl3.action."+class_name).newInstance();
         } catch (Exception e) {
-        System.err.println("TransformingReceptionist Error: couldn't load in action "+class_name);
+        logger.error(" couldn't load in action "+class_name);
         e.printStackTrace();
         continue;
@@ -95 +99 @@
         
         String map_key = action_name+":"+subname;
-        ///ystem.out.println("adding in to xslt map, "+map_key+"->"+subxslt);
+        logger.debug("adding in to xslt map, "+map_key+"->"+subxslt);
         this.xslt_map.put(map_key, subxslt);
         }
@@ -103 +107 @@
     Element lang_list = (Element)GSXML.getChildByTagName(config_elem, "languageList");
     if (lang_list == null) {
-        System.err.println("TransformingReceptionist: didn't find a language list in the config file!!");
+        logger.error(" didn't find a language list in the config file!!");
     } else {
         this.language_list = (Element) this.doc.importNode(lang_list, true);
@@ -130 +134 @@
     protected Element transformPage(Element page) {
 
-    //ystem.out.println("page before transfomring:");
-    //ystem.out.println(this.converter.getPrettyString(page));
+    logger.debug("page before transfomring:");
+    logger.debug(this.converter.getPrettyString(page));
 
     Element request = (Element)GSXML.getChildByTagName(page, GSXML.PAGE_REQUEST_ELEM);
@@ -157 +161 @@
     if (xslt_file==null) {
         // cant transform the page - return null or the original?
-        System.err.println("TransformingReceptionist: cant find the xslt file needed, so returning the original page!");
+        logger.error(" cant find the xslt file needed, so returning the original page!");
         return page;
     }
     Document style_doc = this.converter.getDOM(new File(xslt_file), "UTF-8");
     if (style_doc == null) {
-        System.err.println("TransformingReceptionist: cant parse the xslt file needed, so returning the original page!");
+        logger.error(" cant parse the xslt file needed, so returning the original page!");
         return page;
         
@@ -172 +176 @@
     if (format_elem != null) {
         //page_response.removeChild(format_elem);
-        ///ystem.err.println("format elem="+this.converter.getPrettyString(format_elem));
+        logger.debug("format elem="+this.converter.getPrettyString(format_elem));
         // need to transform the format info
         String stylesheet_file = GSFile.stylesheetFile(GlobalProperties.getGSDL3Home(), (String)this.config_params.get(GSConstants.SITE_NAME), collection, (String)this.config_params.get(GSConstants.INTERFACE_NAME), base_interfaces,   "config_format.xsl");
@@ -180 +184 @@
         format_doc.appendChild(format_doc.importNode(format_elem, true));
         Element new_format = (Element)this.transformer.transform(stylesheet_doc, format_doc);
-        ///ystem.err.println("new format elem="+this.converter.getPrettyString(new_format));
+        logger.debug("new format elem="+this.converter.getPrettyString(new_format));
         
         // add it in to the main stylesheet
         GSXSLT.mergeStylesheets(style_doc, new_format);
         } else {
-        System.err.println("TransformingReceptionist: couldn't parse the config_format stylesheet, adding the format info as is");
+        logger.error(" couldn't parse the config_format stylesheet, adding the format info as is");
         GSXSLT.mergeStylesheets(style_doc, format_elem);
         }
-        ///ystem.out.println("the converted stylesheet is:");
-        ///ystem.out.println(this.converter.getPrettyString(style_doc.getDocumentElement()));
+        logger.debug("the converted stylesheet is:");
+        logger.debug(this.converter.getPrettyString(style_doc.getDocumentElement()));
     }
     
@@ -215 +219 @@
     String stylesheet = GSFile.stylesheetFile(GlobalProperties.getGSDL3Home(), (String)this.config_params.get(GSConstants.SITE_NAME), collection, (String)this.config_params.get(GSConstants.INTERFACE_NAME), base_interfaces, name);
     if (stylesheet==null) {
-        System.out.println("TransformingReceptionist: cant find stylesheet for "+name);
+        logger.info(" cant find stylesheet for "+name);
     }
     return stylesheet;

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractBrowse.java

@@ -34 +34 @@
 import java.util.ArrayList;
 
+import org.apache.log4j.*;
+
 /** Partially implements a generic classifier service
  *
  * @author <a href="mailto:[email protected]">Katherine Don</a>
  */
-
 public abstract class AbstractBrowse
     extends ServiceRack {
+
+     static Category logger = Category.getInstance(org.greenstone.gsdl3.service.AbstractBrowse.class.getName());
 
     // the browsing services
@@ -80 +83 @@
     }
 
-    System.out.println("Configuring AbstractBrowse...");
+    logger.info("Configuring AbstractBrowse...");
     this.config_info = info;
 
@@ -259 +262 @@
                                name);
         if (node_extra == null) {
-        System.err.println("GS2REtrieve: haven't found extra info for classifier named "+name);
+        logger.error("GS2REtrieve: haven't found extra info for classifier named "+name);
         continue;
         }
@@ -304 +307 @@
     Element query_node_list = (Element) GSXML.getChildByTagName(request, GSXML.CLASS_NODE_ELEM+GSXML.LIST_MODIFIER);
     if (query_node_list == null) {
-        System.err.println("AbstractBrowse Error: ClassifierBrowse request specified no doc nodes.\n");
+        logger.error(" ClassifierBrowse request specified no doc nodes.\n");
         return result;
     }
@@ -311 +314 @@
     Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     if (param_list == null) {
-        System.err.println("AbstractBrowse Error: ClassifierBrowse request had no paramList.");
+        logger.error(" ClassifierBrowse request had no paramList.");
         return result;  // Return the empty result
     }
@@ -353 +356 @@
             want_entire_structure = true;
         else
-            System.err.println("AbstractDocumentRetrieve Warning: Unknown value \"" + p_value + "\".");
+            logger.error("AbstractDocumentRetrieve Warning: Unknown value \"" + p_value + "\".");
         } else if (p_name.equals(INFO_PARAM)) {
         want_info = true;
@@ -485 +488 @@
     Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     if (param_list == null) {
-        System.err.println("AbstractBrowse, ClassifierBrowseMetadataRetrieve Error: missing paramList.\n");
+        logger.error("AbstractBrowse, ClassifierBrowseMetadataRetrieve Error: missing paramList.\n");
         return result;  // Return the empty result
     }
@@ -513 +516 @@
     Element request_node_list = (Element) GSXML.getChildByTagName(request, GSXML.CLASS_NODE_ELEM+GSXML.LIST_MODIFIER);
     if (request_node_list == null) {
-        System.err.println("AbstractBrowse Error: ClassifierBrowseMetadataRetrieve request had no "+GSXML.CLASS_NODE_ELEM+GSXML.LIST_MODIFIER);
+        logger.error(" ClassifierBrowseMetadataRetrieve request had no "+GSXML.CLASS_NODE_ELEM+GSXML.LIST_MODIFIER);
         return result;
     }
@@ -622 +625 @@
     if (current_node == null) {
         // create a sensible error message
-        System.err.println("AbstractBrowse Error: there should be a first child.");
+        logger.error(" there should be a first child.");
         return null;
     }

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractDocumentRetrieve.java

@@ -41 +41 @@
 import java.util.ArrayList;
 
+
+import org.apache.log4j.*;
+
 /** Abstract class for Document Retrieval Services
  *
@@ -48 +51 @@
 public abstract class AbstractDocumentRetrieve
     extends ServiceRack {
+
+    static Category logger = Category.getInstance(org.greenstone.gsdl3.service.AbstractDocumentRetrieve.class.getName());
 
     // the services on offer
@@ -93 +98 @@
     }
 
-    System.out.println("Configuring AbstractDocumentRetrieve...");
+    logger.info("Configuring AbstractDocumentRetrieve...");
     this.config_info = info;
 
@@ -345 +350 @@
             want_entire_structure = true;
         else
-            System.err.println("AbstractDocumentRetrieve Warning: Unknown value \"" + p_value + "\".");
+            logger.error("AbstractDocumentRetrieve Warning: Unknown value \"" + p_value + "\".");
         } else if (p_name.equals(INFO_PARAM)) {
         want_info = true;
@@ -483 +488 @@
     Element query_doc_list = (Element) GSXML.getChildByTagName(request, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
     if (query_doc_list == null) {
-        System.err.println("Error: DocumentContentRetrieve request specified no doc nodes.\n");
+        logger.error("Error: DocumentContentRetrieve request specified no doc nodes.\n");
         return result;
     }
@@ -569 +574 @@
     if (current_node == null) {
         // create a sensible error message
-        System.err.println("AbstractDocumentRetrieve Error: there should be a first child.");
+        logger.error(" there should be a first child.");
         return null;
     }

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractGS2DocumentRetrieve.java

@@ -42 +42 @@
 import java.util.ArrayList;
 
+import org.apache.log4j.*;
+
 /** Implements the generic retrieval and classifier services for GS2 
  * collections.
@@ -52 +54 @@
     extends AbstractDocumentRetrieve {
 
+      static Category logger = Category.getInstance(org.greenstone.gsdl3.service.AbstractGS2DocumentRetrieve.class.getName());
+
     //    protected static final String EXTLINK_PARAM = "ext"; here or in base??    
     protected String index_stem = null;
@@ -76 +80 @@
     }
     
-    System.out.println("Configuring AbstractGS2DocumentRetrieve...");
+    logger.info("Configuring AbstractGS2DocumentRetrieve...");
     //this.config_info = info;
     
@@ -85 +89 @@
     }
     if (this.index_stem == null || this.index_stem.equals("")) {
-        System.err.println("AbstractGS2DocumentRetrieve.configure(): indexStem element not found, stem will default to collection name");
+        logger.error("AbstractGS2DocumentRetrieve.configure(): indexStem element not found, stem will default to collection name");
         this.index_stem = this.cluster_name;
     }
@@ -92 +96 @@
     String gdbm_db_file = GSFile.GDBMDatabaseFile(this.site_home, this.cluster_name, this.index_stem);
     if (!this.gdbm_src.openDatabase(gdbm_db_file, GDBMWrapper.READER)) {
-        System.err.println("AbstractGS2DocumentRetrieve Error: Could not open GDBM database!");
+        logger.error("Could not open GDBM database!");
         return false;
     }

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractMGPPSearch.java

@@ -38 +38 @@
 import java.io.File;
 
+import org.apache.log4j.*;
 
 /** Partially implements a generic MGPP search service
@@ -47 +48 @@
     extends AbstractSearch
 {
+
+      static Category logger = Category.getInstance(org.greenstone.gsdl3.service.AbstractMGPPSearch.class.getName());
 
     // extra services offered by mgpp collections
@@ -123 +126 @@
     
     // Do specific configuration
-    System.out.println("Configuring AbstractMGPPSearch...");
+    logger.info("Configuring AbstractMGPPSearch...");
 
     // do we support any of the extended features?
@@ -139 +142 @@
     }
     if (this.index_stem == null || this.index_stem.equals("")) {
-        System.err.println("AbstractMGPPSearch.configure(): indexStem element not found, stem will default to collection name");
+        logger.error("AbstractMGPPSearch.configure(): indexStem element not found, stem will default to collection name");
         this.index_stem = this.cluster_name;
     }
@@ -186 +189 @@
     }
     if (this.default_level == null || this.default_level.equals("")) {
-        System.err.println("Error: default level not specified!");
+        logger.error("default level not specified!");
         return false;
     }
@@ -442 +445 @@
     default:
         // should never get here
-        System.err.println("AbstractMGPPSearch: wrong query type!!");
+        logger.error("wrong query type!!");
         return null;
     }
@@ -454 +457 @@
     Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     if (param_list == null) {
-        System.err.println("Error: TextQuery request had no paramList.");
+        logger.error("TextQuery request had no paramList.");
         return result;  // Return the empty result
     }

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractMGSearch.java

@@ -37 +37 @@
 import java.io.File;
 
+import org.apache.log4j.*;
+
 /** Partially implements a generic MG search service
  *
@@ -45 +47 @@
     extends AbstractSearch
 {
+
+    static Category logger = Category.getInstance(org.greenstone.gsdl3.service.AbstractMGSearch.class.getName());
     protected static final String CASE_PARAM = "case";
     protected static final String STEM_PARAM = "stem";
@@ -99 +103 @@
     }
     if (this.index_stem == null || this.index_stem.equals("")) {
-        System.err.println("AbstractMGSearch.configure(): indexStem element not found, stem will default to collection name");
+        logger.error("AbstractMGSearch.configure(): indexStem element not found, stem will default to collection name");
         this.index_stem = this.cluster_name;
     }
@@ -118 +122 @@
                                name);
         if (node_extra == null) {
-            System.err.println("GS2Search: haven't found extra info for index named "+name);
+            logger.error("haven't found extra info for index named "+name);
             continue;
         }
@@ -168 +172 @@
     Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     if (param_list == null) {
-        System.err.println("Error: TextQuery request had no paramList.");
+        logger.error("TextQuery request had no paramList.");
         return result;  // Return the empty result
     }
@@ -207 +211 @@
     Vector docs = mqr.getDocs();
     if (docs.size() == 0) {
-        System.err.println("GS2MGSearch: Warning: No results found...\n");
+        logger.error("No results found...\n");
     }
 

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractSearch.java

@@ -32 +32 @@
 import java.util.HashMap;
 
+import org.apache.log4j.*;
+
 /** Partially implements a generic search service
  *
@@ -40 +42 @@
     extends ServiceRack 
 {
+
+   static Category logger = Category.getInstance(org.greenstone.gsdl3.service.AbstractSearch.class.getName());
+
     
     // the search service
@@ -91 +96 @@
     }
 
-    System.out.println("Configuring AbstractSearch...");
+    logger.info("Configuring AbstractSearch...");
     
     this.config_info = info;

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/BerryBasket.java

@@ -44 +44 @@
 import javax.swing.Timer;
 
+import org.apache.log4j.*;
+
 public class BerryBasket
     extends ServiceRack {
+
+    static Category logger = Category.getInstance(org.greenstone.gsdl3.service.BerryBasket.class.getName());
 
     // the services on offer
@@ -98 +102 @@
     public boolean configure(Element info, Element extra_info)
     {
-    System.out.println("Configuring BerryBasket...");
+    logger.info("Configuring BerryBasket...");
     this.config_info = info;
 
@@ -204 +208 @@
     Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     if (param_list == null) {
-        System.err.println("BerryBasket Error: AddItem request had no paramList.");
+        logger.error("BerryBasket Error: AddItem request had no paramList.");
         return result;  // Return the empty result
     }
@@ -286 +290 @@
 
     if (param_list == null) {
-        System.err.println("BerryBasket Error: DeleteItem request had no paramList.");
+        logger.error("BerryBasket Error: DeleteItem request had no paramList.");
         return result;  // Return the empty result
     }
@@ -335 +339 @@
 
     if (param_list == null) {
-        System.err.println("BerryBasket Error: DeleteItem request had no paramList.");
+        logger.error("BerryBasket Error: DeleteItem request had no paramList.");
         return result;  // Return the empty result
     }
@@ -489 +493 @@
      
     if (param_list == null) {
-        System.err.println("BerryBasket Error: SendMail request had no paramList.");
+        logger.error("BerryBasket Error: SendMail request had no paramList.");
         return result;  // Return the empty result
     }
@@ -551 +555 @@
         Transport.send(msg);
         
-        System.out.println("\nMail was sent successfully.");
+        logger.info("\nMail was sent successfully.");
             result.appendChild(this.doc.createTextNode("Mail was sent successfully."));
     } catch (Exception e) {

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/CrossCollectionSearch.java

@@ -31 +31 @@
 import java.util.HashMap;
 
+import org.apache.log4j.*;
 
 /**
@@ -40 +41 @@
     extends ServiceRack {
 
+     static Category logger = Category.getInstance(org.greenstone.gsdl3.service.CrossCollectionSearch.class.getName());
     protected static final String QUERY_PARAM = "query";
     protected static final String COLLECTION_PARAM = "collection";
@@ -60 +62 @@
     {
     // any parameters? colls to include??
-    System.out.println("Configuring CrossCollectionSearch...");
+    logger.info("Configuring CrossCollectionSearch...");
     // query service
     Element ccs_service = this.doc.createElement(GSXML.SERVICE_ELEM);
@@ -118 +120 @@
         }
         
-        ///ystem.err.println("service description="+this.converter.getPrettyString(ccs_service));
+        logger.debug("service description="+this.converter.getPrettyString(ccs_service));
         return ccs_service;
     }
@@ -141 +143 @@
     Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     if (param_list == null) {
-        System.err.println("Error: TextQuery request had no paramList.");
+        logger.error("TextQuery request had no paramList.");
         return result;  // Return the empty result
     }
@@ -240 +242 @@
     Element coll_list_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, "", lang, ""); // uid
     coll_list_message.appendChild(coll_list_request);
-    ///ystem.err.println("coll list request = "+this.converter.getPrettyString(coll_list_request));
+    logger.debug("coll list request = "+this.converter.getPrettyString(coll_list_request));
     Element coll_list_response = (Element)this.router.process(coll_list_message);
     if (coll_list_response==null) {
-        System.err.println("PageAction Error: couldn't query the message router!");
+        logger.error("couldn't query the message router!");
         return false;
     }
-    ///ystem.err.println("coll list response = "+this.converter.getPrettyString(coll_list_response));
+    logger.debug("coll list response = "+this.converter.getPrettyString(coll_list_response));
     // second, get some info from each collection. we want the coll name 
     // and whether its got a text query service 
@@ -259 +261 @@
         metadata_message.appendChild(metadata_request);
     }
-    ///ystem.err.println("metadata request = "+this.converter.getPrettyString(metadata_message));
+    logger.debug("metadata request = "+this.converter.getPrettyString(metadata_message));
     Element metadata_response = (Element)this.router.process(metadata_message);
-    ///ystem.err.println("metadata response = "+this.converter.getPrettyString(metadata_response));
+    logger.debug("metadata response = "+this.converter.getPrettyString(metadata_response));
 
     NodeList coll_responses = metadata_response.getElementsByTagName(GSXML.COLLECTION_ELEM);
@@ -300 +302 @@
     Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     if (param_list == null) {
-        System.err.println("Error: DocumentMetadataRetrieve request had no paramList.");
+        logger.error("DocumentMetadataRetrieve request had no paramList.");
         return result;  // Return the empty result
     }
@@ -306 +308 @@
     NodeList query_doc_list = request.getElementsByTagName(GSXML.DOC_NODE_ELEM);
     if (query_doc_list.getLength()==0) {
-       System.err.println("Error: DocumentMetadataRetrieve request had no documentNodes.");
+       logger.error("DocumentMetadataRetrieve request had no documentNodes.");
         return result;  // Return the empty result
     } 

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2Browse.java

@@ -38 +38 @@
 import java.util.Iterator;
 
+import org.apache.log4j.*;
+
 /** Greenstone 2 collection classifier service
  *
@@ -47 +49 @@
     extends AbstractBrowse 
 {
-    
+
+     static Category logger = Category.getInstance(org.greenstone.gsdl3.service.GS2Browse.class.getName());
+
     protected GDBMWrapper gdbm_src = null;
 
@@ -67 +71 @@
     }
 
-    System.err.println("Configuring GS2Browse...");
+    logger.info("Configuring GS2Browse...");
     // the index stem is either specified in the config file or is  the collection name
     Element index_stem_elem = (Element) GSXML.getChildByTagName(info, GSXML.INDEX_STEM_ELEM);
@@ -81 +85 @@
     String gdbm_db_file = GSFile.GDBMDatabaseFile(this.site_home, this.cluster_name, index_stem);
     if (!this.gdbm_src.openDatabase(gdbm_db_file, GDBMWrapper.READER)) {
-        System.err.println("GS2Browse Error: Could not open GDBM database!");
+        logger.error("Could not open GDBM database!");
         return false;
     }

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2Construct.java

@@ -36 +36 @@
 import java.util.Locale;
 
+import org.apache.log4j.*;
+
 /**
  * A Services class for building collections
@@ -46 +48 @@
     extends ServiceRack { 
     
+     static Category logger = Category.getInstance(org.greenstone.gsdl3.service.GS2Construct.class.getName()); 
+
     // services offered
     private static final String NEW_SERVICE = "NewCollection";
@@ -166 +170 @@
     GS2PerlListener listener = (GS2PerlListener)this.listeners.get(id);
     if (listener==null) {
-        System.err.println("somethings gone wrong, couldn't find the listener");
+        logger.error("somethings gone wrong, couldn't find the listener");
         status.setAttribute(GSXML.STATUS_ERROR_CODE_ATT, Integer.toString(GSStatus.ERROR));
         return response;
@@ -217 +221 @@
     if (get_status_only) {
         // at the moment, delete is synchronous. but it may take ages so should do the command in another thread maybe? in which case we will want to ask for status
-        System.err.println("had a status request for delete - this shouldn't happen!!");
+        logger.error("had a status request for delete - this shouldn't happen!!");
         //t = this.doc.createTextNode("");
         //status.appendChild(t);
@@ -267 +271 @@
     if (get_status_only) {
         // reload is synchronous - this makes no sense
-        System.err.println("had a status request for reload - this shouldn't happen!!");
+        logger.error("had a status request for reload - this shouldn't happen!!");
         //t = this.doc.createTextNode("");
         //status.appendChild(t);
@@ -300 +304 @@
         command.setAttribute(GSXML.TYPE_ATT, GSXML.SYSTEM_TYPE_ACTIVATE);
     } else {
-        System.err.println("invalid action name passed to systemRequest:"+action_name);
+        logger.error("invalid action name passed to systemRequest:"+action_name);
         return;
     }
@@ -330 +334 @@
     }
 
-    System.out.println("configuring GS2Construct");
+    logger.info("configuring GS2Construct");
 
     Element e = null;
@@ -427 +431 @@
         coll_name = (String)params.get(COL_PARAM);
     }
-    System.err.println("Coll name = "+coll_name);
+    logger.error("Coll name = "+coll_name);
     // makes a paramList of the relevant params
     Element other_params = extractOtherParams(params, type);
@@ -471 +475 @@
     File collectDir = new File(GSFile.collectDir(this.site_home));
     if (!collectDir.exists()) {
-        System.err.println("couldn't find collect dir: "+collectDir.toString());
+        logger.error("couldn't find collect dir: "+collectDir.toString());
         return null;
     }
-    System.out.println("GS2Construct: reading thru directory "+collectDir.getPath()+" to find collections.");
+    logger.info("GS2Construct: reading thru directory "+collectDir.getPath()+" to find collections.");
     File[] contents = collectDir.listFiles();
     int num_colls=0;

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2MGPPRetrieve.java

@@ -32 +32 @@
 import java.io.File;
 
+import org.apache.log4j.*;
+
 public class GS2MGPPRetrieve
     extends AbstractGS2DocumentRetrieve
 {
+     static Category logger = Category.getInstance(org.greenstone.gsdl3.service.GS2MGPPRetrieve.class.getName());
+
      // Parameters used
     private static final String LEVEL_PARAM = "level";
@@ -63 +67 @@
 
     // Do specific configuration
-    System.out.println("Configuring GS2MGPPRetrieve...");
+    logger.info("Configuring GS2MGPPRetrieve...");
 
     // Get the default level out of <defaultLevel> (buildConfig.xml)
@@ -71 +75 @@
     }
     if (this.default_level == null || this.default_level.equals("")) {
-        System.err.println("Error: default level not specified!");
+        logger.error("default level not specified!");
         return false;
     }
-    // System.out.println("Default level: " + default_level_);
     
     // The location of the MGPP text files
@@ -93 +96 @@
     long doc_num = this.gdbm_src.OID2Docnum(doc_id);
     if (doc_num == -1) {
-        System.err.println("OID "+doc_id +" couldn't be converted to mgpp num");
+        logger.error("OID "+doc_id +" couldn't be converted to mgpp num");
         return null;
     }
@@ -107 +110 @@
         } 
     } catch (Exception e) {
-        System.out.println("exception happended with mgpp_src.getDocument()" + e);
+        logger.info("exception happended with mgpp_src.getDocument()" + e);
         doc_content = "this is the content for section hash id "+ doc_id+", mgpp doc num "+doc_num+"\n";
 

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2MGPPSearch.java

@@ -27 +27 @@
 import org.w3c.dom.NodeList;
 
+import org.apache.log4j.*;
+
 /**
  *
@@ -37 +39 @@
 {
     protected GDBMWrapper gdbm_src = null;
+     static Category logger = Category.getInstance(org.greenstone.gsdl3.service.GS2MGPPSearch.class.getName());
 
     /** constructor */
@@ -59 +62 @@
     String gdbm_db_file = GSFile.GDBMDatabaseFile(this.site_home, this.cluster_name, this.index_stem);
     if (!this.gdbm_src.openDatabase(gdbm_db_file, GDBMWrapper.READER)) {
-        System.err.println("Error: Could not open GDBM database!");
+        logger.error("Could not open GDBM database!");
         return false;
     }

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2MGRetrieve.java

@@ -32 +32 @@
 import java.io.File;
 
+import org.apache.log4j.*;
+
 public class GS2MGRetrieve
     extends AbstractGS2DocumentRetrieve
 {
+   static Category logger = Category.getInstance(org.greenstone.gsdl3.service.GS2MGRetrieve.class.getName());
+
     // Elements used in the config file that are specific to this class
     private static final String DEFAULT_INDEX_ELEM = "defaultIndex";
@@ -60 +64 @@
     
     // Do specific configuration
-    System.out.println("Configuring GS2MGRetrieve...");
-    // System.out.println("info:\n" + converter_.getString(info));
-    // System.out.println("extra_info:\n" + converter_.getString(extra_info));
-
+    logger.info("Configuring GS2MGRetrieve...");
+    
     // Get the default index out of <defaultIndex> (buildConfig.xml)
     Element def = (Element) GSXML.getChildByTagName(info, DEFAULT_INDEX_ELEM);
@@ -70 +72 @@
     }
     if (this.default_index == null || this.default_index.equals("")) {
-        System.err.println("Error: default index not specified!");
+        logger.error("default index not specified!");
         return false;
     }
-    // System.out.println("Default index: " + this.default_index);
+    logger.debug("Default index: " + this.default_index);
 
     // The location of the MG index and text files
@@ -93 +95 @@
     long doc_num = this.gdbm_src.OID2Docnum(doc_id);
     if (doc_num == -1) {
-        System.err.println("OID "+doc_id +" couldn't be converted to mg num");
+        logger.error("OID "+doc_id +" couldn't be converted to mg num");
         return null;
     }
@@ -108 +110 @@
         //GSXML.addDocText(this.doc, doc, doc_content);
     } else {
-        System.err.println("the doc content was null, not getting that section\n");
+        logger.error("the doc content was null, not getting that section\n");
         doc_content = "couldn't retrieve content for this section\n";
     }

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2MGSearch.java

@@ -27 +27 @@
 import org.w3c.dom.NodeList;
 
+import org.apache.log4j.*;
+
 /**
  *
@@ -37 +39 @@
 {
     protected GDBMWrapper gdbm_src = null;
+    static Category logger = Category.getInstance(org.greenstone.gsdl3.service.GS2MGSearch.class.getName());
+
 
     /** constructor */
@@ -58 +62 @@
     String gdbm_db_file = GSFile.GDBMDatabaseFile(this.site_home, this.cluster_name, this.index_stem);
     if (!this.gdbm_src.openDatabase(gdbm_db_file, GDBMWrapper.READER)) {
-        System.err.println("Error: Could not open GDBM database!");
+        logger.error(" Could not open GDBM database!");
         return false;
     }

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/IViaProxy.java

@@ -21 +21 @@
 import java.net.MalformedURLException;
 
+import org.apache.log4j.*;
+
 /**
  *
@@ -29 +31 @@
 public class IViaProxy 
     extends ServiceRack {
+   
+     static Category logger = Category.getInstance(org.greenstone.gsdl3.service.IViaProxy.class.getName());
     
     // the services on offer
@@ -54 +58 @@
     Element server_elem = (Element)GSXML.getChildByTagName(info, "iViaServer");
     if (server_elem == null) {
-        System.err.println("IViaProxy.configure error: no iViaServer element found");
+        logger.error("no iViaServer element found");
         return false;
     }
     ivia_server_url = server_elem.getAttribute("url");
     if (ivia_server_url.equals("")) {
-        System.err.println("IViaProxy.configure error: no url for the iViaServer element");
+        logger.error("no url for the iViaServer element");
         return false;
     }
@@ -167 +171 @@
     Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     if (param_list == null) {
-        System.err.println("IViaProxy Error:: TextQuery request had no paramList.");
+        logger.error("TextQuery request had no paramList.");
         return result;  // Return the empty result
     }
@@ -203 +207 @@
     String doc_ids = null;
     try {
-        ///ystem.err.println("IViaProxy, sending "+url_string);
+        logger.debug("IViaProxy, sending "+url_string);
         BufferedReader reader = makeConnection(url_string);
         results_num = reader.readLine();
@@ -209 +213 @@
         
     } catch (Exception e) {
-        System.err.println("IViaProxy.TextQuery Error: exception happened during query");
+        logger.error("exception happened during query");
         e.printStackTrace();
         return result;
@@ -217 +221 @@
         results_num = results_num.substring(11);
     } else {
-        System.err.println("IViaProxy.TextQuery Error: badly formatted results line: "+results_num);
+        logger.error("badly formatted results line: "+results_num);
         return result;
     }
@@ -223 +227 @@
         doc_ids = doc_ids.substring(5).trim();
     } else {
-        System.err.println("IViaProxy.TextQuery Error: badly formatted docs line: "+doc_ids);
+        logger.error("badly formatted docs line: "+doc_ids);
         return result;
     }
@@ -241 +245 @@
         doc_node_list.appendChild(doc_node);
     }
-    ///ystem.err.println("IViaProxy result:");
-    ///ystem.err.println(this.converter.getString(result));
+    logger.debug("IViaProxy result:");
+    logger.debug(this.converter.getString(result));
     return result;
     
@@ -255 +259 @@
     Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     if (param_list == null) {
-        System.err.println("IViaProxy.DocumentMetadataRetrieve Error: missing paramList.\n");
+        logger.error("missing paramList.\n");
         return result;  // Return the empty result
     }
@@ -275 +279 @@
     
     if (field_list.length()==0) {
-        System.err.println("IViaProxy.DocumentMetadataRetrieve Error: no metadata specified.\n"); 
+        logger.error("no metadata specified.\n"); 
         return result;
     }
@@ -282 +286 @@
     Element request_node_list = (Element) GSXML.getChildByTagName(request, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
     if (request_node_list == null) {
-        System.err.println("IViaProxy Error: DocumentMetadataRetrieve request had no "+GSXML.DOC_NODE_ELEM+"List.\n");
+        logger.error("DocumentMetadataRetrieve request had no "+GSXML.DOC_NODE_ELEM+"List.\n");
         return result;
     }
@@ -329 +333 @@
         }
     } catch (Exception e) {
-        System.err.println("IViaProxy Error:exception happened");
+        logger.error("exception happened");
         e.printStackTrace();
     }
-    ///ystem.out.println("IViaProxy: returning result: ");
-    ///ystem.out.println(this.converter.getPrettyString(result));
+    logger.debug("IViaProxy: returning result: ");
+    logger.debug(this.converter.getPrettyString(result));
     return result;
  
@@ -346 +350 @@
     Element query_doc_list = (Element) GSXML.getChildByTagName(request, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
     if (query_doc_list == null) {
-        System.err.println("IViaProxy Error: DocumentContentRetrieve request specified no doc nodes.\n");
+        logger.error("DocumentContentRetrieve request specified no doc nodes.\n");
         return result;
     }
@@ -381 +385 @@
         
     } catch (Exception e) {
-        System.err.println("IViaProxy Error:exception happened");
+        logger.error("exception happened");
         e.printStackTrace();
     }
@@ -414 +418 @@
         doc_node.appendChild(this.doc.importNode(content_element, true));
     } else {
-        System.err.println("IViaProxy.getDocument Error: Couldn't parse the node content");
+        logger.error("Couldn't parse the node content");
     }
     return doc_node;
@@ -495 +499 @@
     } catch (java.net.MalformedURLException e) {
 
-        System.err.println("IViaProxy Error: Malformed URL: "+url_string);
+        logger.error("Malformed URL: "+url_string);
     } catch (java.io.IOException e) {
-        System.err.println("IViaProxy Error: An error occurred during IO to url "+url_string);
+        logger.error("An error occurred during IO to url "+url_string);
     }
     return reader;

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/IViaRetrieve.java

@@ -23 +23 @@
 import java.net.MalformedURLException;
 
+import org.apache.log4j.*;
+
 /**
  *
@@ -32 +34 @@
 public class IViaRetrieve 
     extends AbstractDocumentRetrieve {
-    
+
+      static Category logger = Category.getInstance(org.greenstone.gsdl3.service.IViaRetrieve.class.getName());
+    
+
     protected String ivia_server_url = null;
     
@@ -48 +53 @@
     Element server_elem = (Element)GSXML.getChildByTagName(info, "iViaServer");
     if (server_elem == null) {
-        System.err.println("IViaRetrieve.configure error: no iViaServer element found");
+        logger.error("no iViaServer element found");
         return false;
     }
     ivia_server_url = server_elem.getAttribute("url");
     if (ivia_server_url.equals("")) {
-        System.err.println("IViaRetrieve.configure error: no url for the iViaServer element");
+        logger.error("no url for the iViaServer element");
         return false;
     }
@@ -103 +108 @@
     Document content_doc = this.converter.getDOM(processed_content.toString());
     if (content_doc == null) {
-        System.err.println("IViaRetrieve.getNodeContent Error: Couldn't parse node content");
-        System.err.println(processed_content.toString());
+        logger.error("Couldn't parse node content");
+        logger.error(processed_content.toString());
         return null;
     }
@@ -181 +186 @@
     int p = oid.lastIndexOf('.');
     if (p != oid.length()-3) {
-        System.out.println("translateoid error: '.' is not the third to last char!!");
+        logger.info("translateoid error: '.' is not the third to last char!!");
         return oid;
     }

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/IViaSearch.java

@@ -16 +16 @@
 import java.net.Authenticator;
 
+import org.apache.log4j.*;
+
 /**
  *
@@ -25 +27 @@
     extends AbstractSearch {
     
+
+     static Category logger = Category.getInstance(org.greenstone.gsdl3.service.IViaSearch.class.getName());
+ 
     // have standard gs param names for hits per page, and start page
     // these need to be mapped to iVia params
@@ -45 +50 @@
     Element server_elem = (Element)GSXML.getChildByTagName(info, "iViaServer");
     if (server_elem == null) {
-        System.err.println("IViaSearch.configure error: no iViaServer element found");
+        logger.error("no iViaServer element found");
         return false;
     }
     ivia_server_url = server_elem.getAttribute("url");
     if (ivia_server_url.equals("")) {
-        System.err.println("IViaSearch.configure error: no url for the iViaServer element");
+        logger.error("no url for the iViaServer element");
         return false;
     }
@@ -77 +82 @@
     Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     if (param_list == null) {
-        System.err.println("IViaSearch Error:: TextQuery request had no paramList.");
+        logger.error("TextQuery request had no paramList.");
         return result;  // Return the empty result
     }
@@ -115 +120 @@
     BufferedReader reader = null;
     try {
-        ///system.err.println("IViaSearch, sending "+url_string);
+        logger.debug("sending "+url_string);
         reader = Misc.makeHttpConnection(url_string);
         results_num = reader.readLine();
@@ -132 +137 @@
 
     } else {
-        System.err.println("IViaSearch.TextQuery Error: badly formatted results:");
+        logger.error("badly formatted results:");
         StringBuffer result_string = new StringBuffer();
         result_string.append("Error: badly formatted result from IVia server:\n ");

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/LuceneSearch.java

@@ -24 +24 @@
 
 import java.io.File;
+
+import org.apache.log4j.*;
+
 /**
  *
@@ -32 +35 @@
 public class LuceneSearch 
     extends AbstractSearch {
+
+     static Category logger = Category.getInstance(org.greenstone.gsdl3.service.LuceneSearch.class.getName());
 
     protected static final String INDEX_ELEM = "index";
@@ -71 +76 @@
     Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     if (param_list == null) {
-        System.err.println("LuceneSearch Error: TextQuery request had no paramList.");
+        logger.error("TextQuery request had no paramList.");
         GSXML.addMetadata(this.doc, metadata_list, "numDocsMatched", "0");
         return result;  // Return the empty result
@@ -82 +87 @@
     String query_string = (String) params.get(QUERY_PARAM);
     if (query_string == null || query_string.equals("")) {
-        System.err.println("LuceneSearch Error: TextQuery request had no query string.");
+        logger.error("TextQuery request had no query string.");
         GSXML.addMetadata(this.doc, metadata_list, "numDocsMatched", "0");
         return result;  // Return the empty result

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/MapRetrieve.java

@@ -22 +22 @@
 import javax.swing.tree.DefaultMutableTreeNode;
 
-/** 
- */
+import org.apache.log4j.*;
 
 public class MapRetrieve
     extends ServiceRack {
+
+    static Category logger = Category.getInstance(org.greenstone.gsdl3.service.MapRetrieve.class.getName());
 
     // the services on offer
@@ -59 +60 @@
     }
 
-    System.out.println("Configuring MapRetrieve...");
+    logger.info("Configuring MapRetrieve...");
     this.config_info = info;
 
@@ -186 +187 @@
     String uid = request.getAttribute(GSXML.USER_ID_ATT);
     if (uid.equals("")) {
-        System.out.println("in metadata retrieve, uid = ''\n"+converter.getPrettyString(request));
+        logger.info("in metadata retrieve, uid = ''\n"+converter.getPrettyString(request));
     }
     result.setAttribute(GSXML.FROM_ATT, DOCUMENT_METADATA_RETRIEVE_SERVICE);
@@ -194 +195 @@
     Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     if (param_list == null) {
-        System.err.println("MapRetrieve Error: missing paramList.\n");
+        logger.error("missing paramList.\n");
         return result;  // Return the empty result
     }
@@ -223 +224 @@
     Element request_node_list = (Element) GSXML.getChildByTagName(request, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
     if (request_node_list == null) {
-        System.err.println("Error: DocumentMetadataRetrieve request had no "+GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
+        logger.error(" DocumentMetadataRetrieve request had no "+GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
         return result;
     }
@@ -365 +366 @@
     Element query_doc_list = (Element) GSXML.getChildByTagName(request, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
     if (query_doc_list == null) {
-        System.err.println("Error: DocumentContentRetrieve request specified no doc nodes.\n");
+        logger.error("DocumentContentRetrieve request specified no doc nodes.\n");
         return result;
     }

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/MapSearch.java

@@ -43 +43 @@
 import java.lang.ClassNotFoundException;
 
+import org.apache.log4j.*;
+
 /**
  *
@@ -49 +51 @@
 public class MapSearch 
     extends AbstractSearch {
+
+
+    static Category logger = Category.getInstance(org.greenstone.gsdl3.service.MapSearch.class.getName());
 
     protected String files_home_dir = null;
@@ -71 +76 @@
         return false;
     }
-    System.out.println("Configuring MapSearch...");
+    logger.info("Configuring MapSearch...");
 
     // set the files_home_dir variable for this collection
@@ -164 +169 @@
     Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     if (param_list == null) {
-        System.err.println("Error: TextQuery request had no paramList.");
+        logger.error("TextQuery request had no paramList.");
         return result;  // Return the empty result
     }
@@ -249 +254 @@
 
         if((nameArray = (Object[])hashNames.get(terms[k].toLowerCase())) != null){
-        //System.out.println(hashNames.get(terms[k].toLowerCase()));
+        logger.debug(hashNames.get(terms[k].toLowerCase()));
         
         nameArraySize = Arrays.asList(nameArray).size();

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/ModuleWrapper.java

@@ -41 +41 @@
 import java.security.SecureRandom;
 
+import org.apache.log4j.*;
+
 /**
  * A classes for logging and checking all traffic to and from a ModuleInterface
@@ -57 +59 @@
   implements ModuleInterface 
 {
+
+    static Category logger = Category.getInstance(org.greenstone.gsdl3.service. ModuleWrapper.class.getName());
+
   /** the module we're wrapping */
   protected ModuleInterface inner = null;
@@ -138 +143 @@
     writer.write(xmlIn);
       } catch (IOException e) {
-    System.err.println("ModuleWrapper: caught exception: " +e );
+    logger.error("caught exception: " +e );
       }
     }
@@ -149 +154 @@
       writer.write(xmlOut);
     } catch (IOException e) {
-      System.err.println("ModuleWrapper: caught exception: " +e );
+      logger.error("caught exception: " +e );
     }
     return xmlOut;
@@ -179 +184 @@
     parser.setFeature("http://apache.org/xml/features/warn-on-duplicate-entitydef", true);
       } catch (Exception a) {
-    System.err.println("unable to set feature:" +a);
+    logger.error("unable to set feature:" +a);
     a.printStackTrace();
       }
@@ -188 +193 @@
     parser.parse(xml_source);
       } catch (Exception e){  
-    System.err.println("parsing error:" +e);
+    logger.error("parsing error:" +e);
     e.printStackTrace();
     return "<response> <error class=\"ModuleWrapper\" code=1> Error: supplied string contained the parse error: " + e + " </error> </response>";
@@ -200 +205 @@
     parser.parse(xmlResult);
       } catch (Exception e){  
-    System.err.println("parsing error:" +e);
+    logger.error("parsing error:" +e);
     e.printStackTrace();
     return "<response> <error class=\"ModuleWrapper\" code=2> Error: returned string contained the parse error: " + e + "</error></response>";
@@ -208 +213 @@
 
     } catch (Exception e){  
-      System.err.println("other error:" +e);
+      logger.error("other error:" +e);
       e.printStackTrace();
       return "<response> <error class=\"ModuleWrapper\" code=3>Error: Unknown error or warning: " + e + " </error></response>";

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/PhindPhraseBrowse.java

@@ -30 +30 @@
 import java.util.HashMap;
 import java.io.File;
+
+import org.apache.log4j.*;
+
 /** 
  * PhindServices - the phind phrase browsing service
@@ -39 +42 @@
     extends ServiceRack {
     
+     static Category logger = Category.getInstance(org.greenstone.gsdl3.service.PhindPhraseBrowse.class.getName());
+
     // the services on offer
     private static final String PHIND_SERVICE = "PhindApplet";
@@ -73 +78 @@
     }
 
-    System.out.println("configuring PhindPhraseBrowse");
+    logger.info("configuring PhindPhraseBrowse");
 
     // set up short_service_info_ - for now just has name and type
@@ -100 +105 @@
     Document dom = this.converter.getDOM(app_info);
     if (dom==null) {
-        System.err.println("PhindPhraseBrowse.configure Error: Couldn't parse applet info");
+        logger.error("Couldn't parse applet info");
         return false;
     }

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/ServiceRack.java

@@ -41 +41 @@
 import java.lang.reflect.Method;
 
+import org.apache.log4j.*;
+
 /**
  * ServiceRack - abstract base class for services
@@ -58 +60 @@
 {
 
+     static Category logger = Category.getInstance(org.greenstone.gsdl3.service.ServiceRack.class.getName());
+
     /** the absolute address of the site home */
     protected String site_home =null;
@@ -155 +159 @@
     Document doc = this.converter.getDOM(xml_in);
     if (doc == null) {
-        System.err.println("ServiceRack.process(String) Error: Couldn't parse request");
-        System.err.println(xml_in);
+        logger.error("Couldn't parse request");
+        logger.error(xml_in);
         return null;
     }
@@ -217 +221 @@
                 c = c.getSuperclass();
             } catch (SecurityException e) {
-                System.err.println("ServiceRack.process: security exception for finding method "+method_name);
+                logger.error("security exception for finding method "+method_name);
                 error_string.append("ServiceRack.process: security exception for finding method "+method_name);
             }
@@ -227 +231 @@
                 
             } catch (Exception e) {
-                System.err.println("ServiceRack.process: Trying to call a processService type method (process"+to+") on a subclass("+this.getClass().getName()+"), but an exception happened:"+e.toString());
-                error_string.append("ServiceRack.process: Trying to call a processService type method (process"+to+") on a subclass("+this.getClass().getName()+"), but an exception happened:"+e.toString());
+                logger.error("Trying to call a processService type method (process"+to+") on a subclass("+this.getClass().getName()+"), but an exception happened:"+e.toString());
+                error_string.append("Trying to call a processService type method (process"+to+") on a subclass("+this.getClass().getName()+"), but an exception happened:"+e.toString());
             }
             } else {
-            System.err.println("ServiceRack.process: method "+method_name+" not found for class "+this.getClass().getName());
+            logger.error("method "+method_name+" not found for class "+this.getClass().getName());
             error_string.append("ServiceRack.process: method "+method_name+" not found for class "+this.getClass().getName());
             }
             
         } catch (ClassNotFoundException e) {
-            System.err.println("ServiceRack error: Element class not found");
-            error_string.append("ServiceRack error: Element class not found");
+            logger.error("Element class not found");
+            error_string.append("Element class not found");
         }
         if (response !=null) {
@@ -243 +247 @@
         } else {
             // add in a dummy response
-            System.err.println("adding in an error element\n");
+            logger.error("adding in an error element\n");
             response = this.doc.createElement(GSXML.RESPONSE_ELEM);
             GSXML.addError(this.doc, response, error_string.toString());
@@ -321 +325 @@
     }
     // else no format info
-    System.err.println("ServiceRack describe request: no format info for "+to+".");
+    logger.error("ServiceRack describe request: no format info for "+to+".");
     return response;
     }   

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/XMLRetrieve.java

@@ -19 +19 @@
 import java.util.HashMap;
 
+import org.apache.log4j.*;
 
 public class XMLRetrieve extends ServiceRack {
 
+      static Category logger = Category.getInstance(org.greenstone.gsdl3.service.XMLRetrieve.class.getName());
     protected static final String CONTENT_SERVICE = "DocumentContentRetrieve";
     protected static final String METADATA_SERVICE = "DocumentMetadataRetrieve";
@@ -41 +43 @@
         return false;
     }
-    System.out.println("configuring XMLRetrieve...");
+    logger.info("configuring XMLRetrieve...");
     // look for the parameters
     Element param_list = (Element)GSXML.getChildByTagName(info, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
@@ -167 +169 @@
     Element doc_list = (Element)GSXML.getChildByTagName(request, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
     if (doc_list == null) {
-        System.err.println("XMLRetrieve.DocumentStructureRetrieve: no documents specified in the request. ");
+        logger.error("no documents specified in the request. ");
         return result;
     }
@@ -180 +182 @@
     }
     if (!stylesheet.exists()) {
-        System.err.println("XMLRetrieve.DocumentStructureRetrieve: couldn't find the stylesheet file to produce the table of contents:"+stylesheet.getPath());
+        logger.error("couldn't find the stylesheet file to produce the table of contents:"+stylesheet.getPath());
         return result;
     }
@@ -202 +204 @@
         
         if (!doc_file.exists()) {
-        System.err.println("XMLRetrieve.DocumentStructureRetrieve: couldn't find file in coll "+this.cluster_name +", file "+doc_name+".xml");
+        logger.error("couldn't find file in coll "+this.cluster_name +", file "+doc_name+".xml");
         } else {
         try {
@@ -208 +210 @@
             structure.appendChild(this.doc.importNode(toc, true));
         } catch (Exception e) {
-            System.err.println("XMLRetrieve.DocumentStructureRetrieve: couldn't transform the document to get the toc");
+            logger.error("couldn't transform the document to get the toc");
         }
         }
@@ -227 +229 @@
     Element doc_list = (Element)GSXML.getChildByTagName(request, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
     if (doc_list == null) {
-        System.err.println("XMLRetrieve.DocumentMetadataRetrieve: no documents in the request");
+        logger.error("no documents in the request");
         return result;
     }
@@ -236 +238 @@
     Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     if (param_list == null) {
-        System.err.println("XMLRetrieve.DocumentMetadataRetrieve: no metadata in the request");
+        logger.error("no metadata in the request");
         return result;
     }
@@ -275 +277 @@
         
     if (!doc_file.exists()) {
-        System.out.println("XMLRetrieve.loadDocument: couldn't find file in coll "+this.cluster_name +", file "+doc_name+".xml");
+        logger.info("couldn't find file in coll "+this.cluster_name +", file "+doc_name+".xml");
         return null;
     }
@@ -283 +285 @@
         the_doc = this.converter.getDOM(doc_file, this.document_encoding);
     } catch (Exception e) {
-        System.err.println("XMLRetrieve.loadDocument: couldn't create a DOM from file "+doc_file.getPath());
+        logger.error("couldn't create a DOM from file "+doc_file.getPath());
         return null;
     }
@@ -295 +297 @@
     String [] bits = node_id.split("\\.");
     if (bits.length > 4) {
-        System.err.println("XMLRetrieve.getSection: badly formatted node id ("+node_id +"), cant retrieve the section");
+        logger.error("badly formatted node id ("+node_id +"), cant retrieve the section");
         return null;
     }

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/XSLTServices.java

@@ -46 +46 @@
 import java.net.URLDecoder;
 
+import org.apache.log4j.*;
+
 /**
  * A ServiceRack class for XSLT query. 
@@ -62 +64 @@
   extends ServiceRack {
   
+    static Category logger = Category.getInstance(org.greenstone.gsdl3.service.XSLTServices.class.getName());
+
   // these strings must match what is found in the properties file
   // the services on offer
@@ -106 +110 @@
     }
 
-      System.out.println("configuring XSLTServices");
+      logger.info("configuring XSLTServices");
       this.config_info = info;
     try {
-      System.out.println("XSLTService::configure() called with:");
+      logger.info("called with:");
       TransformerFactory transformerFactory = TransformerFactory.newInstance();
       Element doc = (Element)info.getFirstChild();
@@ -117 +121 @@
       transformer.transform(source,result);
     } catch (Throwable t) {
-      System.err.println("Error printing XML in XSLTService::configure()");
+      logger.error("Error printing XML in XSLTService::configure()");
     }
     return true;    
@@ -145 +149 @@
     response.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
     
-    System.err.println("XSLTServices:should never get here. service type wrong:"+service);
+    logger.error("should never get here. service type wrong:"+service);
     GSXML.addError(this.doc, response,"XSLTServices:should never get here. service type wrong:"+service);
     return response;
@@ -172 +176 @@
 
     if (param_elem==null) { 
-    System.err.println("bad query request");
+    logger.error("bad query request");
     GSXML.addError(this.doc, response,"bad query request in XSLTServices");
     return response; 
@@ -228 +232 @@
                        Character.MAX_VALUE);
     } else {
-      System.err.println("XSLTServices: bad alphabet name : "+ alphabet);
+      logger.error("bad alphabet name : "+ alphabet);
       GSXML.addError(this.doc, response,"XSLTServices: bad alphabet name : "+ alphabet);
       stream = new GeneratedDocumentStream();

trunk/gsdl3/src/java/org/greenstone/gsdl3/util/Dictionary.java

@@ -23 +23 @@
 import java.util.Enumeration;
 
+import org.apache.log4j.*;
+
 public class Dictionary {
+
+    static Category logger = Category.getInstance(org.greenstone.gsdl3.util.Dictionary.class.getName());
 
     /** The locale of this dictionary. */
@@ -47 +51 @@
         this.raw = ResourceBundle.getBundle(this.resource, this.locale);
     } catch (Exception e) {
-        //System.err.println("Dictionary: couldn't locate a resource bundle for "+resource);
+        logger.debug("Dictionary: couldn't locate a resource bundle for "+resource);
     }
     }
@@ -57 +61 @@
         this.raw = ResourceBundle.getBundle(this.resource, this.locale);
     } catch (Exception e) {
-        //System.err.println("Dictionary: couldn't locate a resource bundle for "+resource);
+        logger.debug("Dictionary: couldn't locate a resource bundle for "+resource);
     }
     }
@@ -80 +84 @@
         this.raw = ResourceBundle.getBundle(this.resource, this.locale);
     } catch (Exception ex) {
-        //System.err.println("Dictionary: couldn't locate a resource bundle for "+resource);
+        logger.debug("Dictionary: couldn't locate a resource bundle for "+resource);
     }
     
@@ -139 +143 @@
     }
     catch (Exception e) {
-        //System.err.println("Dictionary Error: couldn't find string for key:" + key +" in resource "+this.resource);
+        logger.debug("Dictionary Error: couldn't find string for key:" + key +" in resource "+this.resource);
         return null;
     }

trunk/gsdl3/src/java/org/greenstone/gsdl3/util/GDBMWrapper.java

@@ -5 +5 @@
 import au.com.pharos.gdbm.GdbmException;
 
+import org.apache.log4j.*;
+
 /** java wrapper class for gdbm - uses Java-GDBM written by Martin Pool
  * replaces gdbmclass in the old version
@@ -10 +12 @@
 
 public class GDBMWrapper {
+
+      static Category logger = Category.getInstance(org.greenstone.gsdl3.util.GDBMWrapper.class.getName());
+
 
     // Values must match those from gdbm.h - uses the definitions from GdbmFile !
@@ -39 +44 @@
         db_ = new GdbmFile(filename, mode);
     } catch ( GdbmException e) { // the database wasn't opened or created
-        System.err.println("GDBMWrapper: couldn't open database "+filename);
+        logger.error("couldn't open database "+filename);
         return false;
     } 
@@ -56 +61 @@
     } catch (GdbmException e) {
         // should never get here - close never actually throws an exception
-        System.err.println("GDBMWrapper: error on close()");
+        logger.error("error on close()");
     }
     }
@@ -72 +77 @@
         s_info = (String)db_.fetch(main_key);
     } catch (GdbmException e) {
-        System.err.println("GDBMWrapper: couldn't get record");
+        logger.error("couldn't get record");
         return null;
     }
     if (s_info==null) {
         // record not present
-        System.err.println("GDBMWrapper: key "+main_key+" not present in db");
+        logger.error("key "+main_key+" not present in db");
         return null;
     }
@@ -86 +91 @@
     String value;
     for (int i=0; i<lines.length; i++) {
-        //System.out.println("line:"+lines[i]);
+        logger.debug("line:"+lines[i]);
         int a = lines[i].indexOf('<');
         int b= lines[i].indexOf('>');
         if (a==-1 || b==-1) {
-        System.err.println("error: bad format in db");
+        logger.error("bad format in db");
         }
         else {
         key=lines[i].substring(a+1, b);
         value=lines[i].substring(b+1);
-        //System.out.println("key="+key+", val="+value);
+        logger.debug("key="+key+", val="+value);
         info.addInfo(key, value);
 
@@ -165 +170 @@
     int p = oid.lastIndexOf('.');
     if (p != oid.length()-3) {
-        System.out.println("translateoid error: '.' is not the third to last char!!");
+        logger.info("translateoid error: '.' is not the third to last char!!");
         return oid;
     }
@@ -240 +245 @@
     DBInfo info = getInfo(doc_id);
     if (info==null) {
-        System.out.println("info is null!!");
+        logger.info("info is null!!");
         return top;
     }

trunk/gsdl3/src/java/org/greenstone/gsdl3/util/GSEntityResolver.java

@@ -7 +7 @@
 import java.net.URL;
 
+import org.apache.log4j.*;
+
 // uses a class loader to find entities
 // The class loader to use can be set by setClassLoader(), otherwise it will use the class loader that loaded itself. For the Tomcat webapp, this will be the webapp class loader, not the system class loader. the webapp classloader knows about the classes in the WEB-INF/classes dir, the system classloader knows about the ones on the classpath. The system class loader is a parent to web app classloader, so this will be used as well.
@@ -14 +16 @@
     ClassLoader class_loader = null;
     
+     static Category logger = Category.getInstance(org.greenstone.gsdl3.util.GSEntityResolver.class.getName());
+
     public void setClassLoader(ClassLoader loader) {
     this.class_loader = loader;
@@ -20 +24 @@
     public InputSource resolveEntity (String public_id, String system_id) {
     
-    //System.out.println("entity resolver for "+system_id);
+    logger.debug("entity resolver for "+system_id);
     String temp_id = system_id;
     if (temp_id.startsWith("file://")) {

trunk/gsdl3/src/java/org/greenstone/gsdl3/util/GSFile.java

@@ -32 +32 @@
 import java.util.ArrayList;
 
+import org.apache.log4j.*;
+
 /**
  * GSFile - utility class for Greenstone.
@@ -44 +46 @@
 
 public class GSFile {
+
+     static Category logger = Category.getInstance(org.greenstone.gsdl3.util.GSFile.class.getName());
 
     /**  site config file path */
@@ -312 +316 @@
         data = readFile(in_filename);
     } catch (Exception e) {
-        System.err.println("GSFile.base64EncodeFromFile: couldn't read the file");
+        logger.error("couldn't read the file");
     }
     String encodedString = Base64.encode(data);
@@ -326 +330 @@
        
     } catch (Exception e) {
-        System.err.println("GSFile.base64DecodeToFile: file opening/closing errors"+e.getMessage());
+        logger.error("file opening/closing errors"+e.getMessage());
         return false;
     }
@@ -369 +373 @@
     public static boolean copyFile(File source, File destination) {
     if (!source.isFile()) {
-        System.err.println("GSFile.copyFile(): "+source.getPath()+" is not a file!");
+        logger.error(source.getPath()+" is not a file!");
         return false;
     }
@@ -383 +387 @@
         out.close();
     } catch (Exception e) {
-        System.err.println("GSFile.copyFile(): something went wrong copying "+source.getPath()+" to "+destination.getPath());
-        System.err.println("Exception: "+e.getMessage());
+        logger.error("something went wrong copying "+source.getPath()+" to "+destination.getPath());
+        logger.error("Exception: "+e.getMessage());
         return false;
     }
@@ -428 +432 @@
             input[i].delete();
         } catch (Exception e) {
-            System.err.println("GSFile.moveDirectory: exception: "+e.getMessage());
+            logger.error("exception: "+e.getMessage());
             return false;
         }

trunk/gsdl3/src/java/org/greenstone/gsdl3/util/GSXML.java

@@ -17 +17 @@
 //import java.util.Locale;
 
+import org.apache.log4j.*;
+
 /** various functions for extracting info out of GS XML */
 public class GSXML {
+
+    static Category logger = Category.getInstance(org.greenstone.gsdl3.util.GSXML.class.getName());
 
     // greenstone xml elements
@@ -210 +214 @@
 
     if (!xml.getNodeName().equals(PARAM_ELEM+LIST_MODIFIER)) {
-        System.err.println("GSXML:paramList element should have been passed to extractParams, instead it was "+xml.getNodeName());
+        logger.error("paramList element should have been passed to extractParams, instead it was "+xml.getNodeName());
         return null;
     }
@@ -649 +653 @@
     for (int i=0; i<children.getLength(); i++) {
         Node child = children.item(i);
-        ///ystem.out.println("getnamed elem, node nmae="+child.getNodeName());
+        logger.debug("getnamed elem, node nmae="+child.getNodeName());
         if (child.getNodeName().equals(node_name)) {
         if (((Element)child).getAttribute(attribute_name).equals(attribute_value))
@@ -799 +803 @@
     if (e.getNodeType() == Node.TEXT_NODE){
         System.out.println("text") ;
-        //System.out.println(e.getNodeValue()) ;
+        logger.debug(e.getNodeValue()) ;
         return ;
     }

trunk/gsdl3/src/java/org/greenstone/gsdl3/util/GlobalProperties.java

@@ -5 +5 @@
 import java.io.InputStream;
 
+import org.apache.log4j.*;
+
 /** holds some global properties for the application. Read from a properties file */
 public class GlobalProperties {
 
+
+     static Category logger = Category.getInstance(org.greenstone.gsdl3.util.GlobalProperties.class.getName());
     private static Properties properties = null;
     private static String properties_filename = "global.properties";
@@ -44 +48 @@
         InputStream in = Class.forName("org.greenstone.gsdl3.util.GlobalProperties").getClassLoader().getResourceAsStream(properties_filename);
         if (in != null) {
-        System.err.println("loading global properties");
+        logger.error("loading global properties");
         properties.load(in);
         in.close();
         } else {
-        System.err.println("couldn't load gloabl properties!");
+        logger.error("couldn't load gloabl properties!");
         }
         gsdl3_home = properties.getProperty("gsdl3.home");
@@ -56 +60 @@
         gsdl3_web_address = "http://"+ properties.getProperty("tomcat.server")+":"+ properties.getProperty("tomcat.port")+"/"+properties.getProperty("tomcat.context");
     } catch (Exception e) {
-        System.err.println("Exception trying to reload global.properties: "+e);
+        logger.error("Exception trying to reload global.properties: "+e);
     }
     

trunk/gsdl3/src/java/org/greenstone/gsdl3/util/Processing.java

@@ -3 +3 @@
 import java.io.InputStreamReader;
 
+import org.apache.log4j.*;
+
 public class Processing {
 
+      static Category logger = Category.getInstance(org.greenstone.gsdl3.util.Processing.class.getName());
+ 
       /** Determine if the given process is still executing. It does this by attempting to throw an exception - not the most efficient way, but the only one as far as I know
      * @param process the Process to test
@@ -26 +30 @@
     static public int runProcess(String  command) {
     
-    System.err.println("executing command "+command);
+    logger.error("executing command "+command);
     int exit_value = -1;
     try {
@@ -74 +78 @@
         
         // do something with the messages
-        System.err.println("err>"+error_buffer.toString());
-        System.err.println("out>"+output_buffer.toString());
+        logger.error("err>"+error_buffer.toString());
+        logger.error("out>"+output_buffer.toString());
         // Ensure that any messages still remaining in the string buffers are fired off.
         // Now display final message based on exit value
@@ -87 +91 @@
         exit_value =  prcs.exitValue();
     } catch (Exception e) {
-        System.err.println("runProcess ERROR: "+e);
+        logger.error(e);
         return 1;
     }

trunk/gsdl3/src/java/org/greenstone/gsdl3/util/XMLConverter.java

@@ -37 +37 @@
 import java.io.FileReader;
 
+import org.apache.log4j.*;
+
 /** XMLConverter - utility class for greenstone
  *
@@ -48 +50 @@
  */
 public class XMLConverter {
+
+     static Category logger = Category.getInstance(org.greenstone.gsdl3.util.XMLConverter.class.getName());
 
     /** xerces parser */
@@ -67 +71 @@
         this.parser.setFeature("http://apache.org/xml/features/dom/defer-node-expansion", false);
     } catch (Exception e) {
-        System.err.println("XMLConverter:exception "+e.getMessage());
+        logger.error("exception "+e.getMessage());
     }
     }
@@ -89 +93 @@
         
     } catch (Exception e) {
-        System.err.println("XMLConverter.getDOM(String): exception "+e.getMessage());
+        logger.error("exception "+e.getMessage());
     }
     return null;
@@ -107 +111 @@
 
     } catch (Exception e) {
-        System.err.println("XMLConverter.getDOM(File): exception "+e.getMessage());
+        logger.error("exception "+e.getMessage());
         e.printStackTrace();
     }
@@ -126 +130 @@
 
     } catch (Exception e) {
-        System.err.println("XMLConverter.getDOM(File): exception "+e.getMessage());
+        logger.error("exception "+e.getMessage());
     }
     return null;
@@ -268 +272 @@
         }
         else {
-        System.err.println("XMLConverter.getString(): Warning: Unhandled processing instruction " + nodeName);
+        logger.error("Unhandled processing instruction " + nodeName);
         }
     }
@@ -283 +287 @@
     // A type of node that is not handled yet
     else {
-        System.err.println("XMLConverter.getString(): Warning: Unknown node type: " + nodeType+" "+getNodeTypeString(nodeType));
+        logger.error("Warning: Unknown node type: " + nodeType+" "+getNodeTypeString(nodeType));
     }
 

trunk/gsdl3/src/java/org/greenstone/gsdl3/util/XMLTransformer.java

@@ -42 +42 @@
 import java.util.Map;
 import java.util.Iterator;
+
+import org.apache.log4j.*;
+
 /** XMLTransformer - utility class for greenstone
  *
@@ -50 +53 @@
  */
 public class XMLTransformer {
+
+    static Category logger = Category.getInstance(org.greenstone.gsdl3.util.XMLTransformer.class.getName());
 
   /** The transformer factory we're using */
@@ -69 +74 @@
 
     } catch (Exception e) {
-        System.err.println("XMLTransformer() exception "+e.getMessage());
+        logger.error("exception "+e.getMessage());
     }
     }
@@ -94 +99 @@
         return output.toString();
     } catch (TransformerConfigurationException e) {
-        System.err.println("XMLTransformer: couldn't create transformer object: "+e.getMessageAndLocation());
-        System.err.println(e.getLocationAsString());  
+        logger.error("couldn't create transformer object: "+e.getMessageAndLocation());
+        logger.error(e.getLocationAsString());  
         return "";
     } catch (TransformerException e) {
-        System.err.println("XMLTransformer: couldn't transform the source: " + e.getMessage());
+        logger.error("couldn't transform the source: " + e.getMessage());
         return "";
     }   
@@ -129 +134 @@
         return output.toString();
     } catch (TransformerConfigurationException e) {
-        System.err.println("XMLTransformer: couldn't create transformer object: "+e.getMessageAndLocation());
-        System.err.println(e.getLocationAsString());  
+        logger.error("couldn't create transformer object: "+e.getMessageAndLocation());
+        logger.error(e.getLocationAsString());  
         return "";
     } catch (TransformerException e) {
-        System.err.println("XMLTransformer: couldn't transform the source: " + e.getMessage());
+        logger.error("couldn't transform the source: " + e.getMessage());
         return "";
     }   
@@ -160 +165 @@
         return result.getNode().getFirstChild();
     } catch (TransformerConfigurationException e) {
-        System.err.println("XMLTransformer: couldn't create transformer object: "+e.getMessageAndLocation());
-        System.err.println(e.getLocationAsString());  
+        logger.error("couldn't create transformer object: "+e.getMessageAndLocation());
+        logger.error(e.getLocationAsString());  
         return null;
     } catch (TransformerException e) {
-        System.err.println("XMLTransformer: couldn't transform the source: " + e.getMessage());
+        logger.error("couldn't transform the source: " + e.getMessage());
         return null;
     }   
@@ -180 +185 @@
         return result.getNode().getFirstChild();
     } catch (TransformerConfigurationException e) {
-        System.err.println("XMLTransformer: couldn't create transformer object: "+e.getMessageAndLocation());
-        System.err.println(e.getLocationAsString());  
+        logger.error("couldn't create transformer object: "+e.getMessageAndLocation());
+        logger.error(e.getLocationAsString());  
         return null;
     } catch (TransformerException e) {
-        System.err.println("XMLTransformer: couldn't transform the source: " + e.getMessage());
+        logger.error("couldn't transform the source: " + e.getMessage());
         return null;
     }   

trunk/gsdl3/src/java/org/greenstone/gsdl3/util/XSLTUtil.java

@@ -5 +5 @@
 import java.text.SimpleDateFormat;
 
+import org.apache.log4j.*;
+
 /** a class to contain various static methods that are used by the xslt
  * stylesheets
  */
 public class XSLTUtil {
+
+     static Category logger = Category.getInstance(org.greenstone.gsdl3.util.XSLTUtil.class.getName());
 
     /* some tests */
@@ -57 +61 @@
     }
     catch (Exception e){
-        System.err.println("XSLTUtil.toUTF8: unsupported encoding");
+        logger.error("unsupported encoding");
         return orig.getBytes();
     }