Changeset 5400 for trunk/gsdl3/src/java/org/greenstone

Timestamp:

2003-09-01T15:33:58+12:00 (21 years ago)

Author:

kjdon

Message:

tidying up println stuff

Location:

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

Files:

• LibraryServlet.java (modified) (5 diffs)
• collection/Collection.java (modified) (4 diffs)
• collection/ServiceCluster.java (modified) (8 diffs)
• util/GSXML.java (modified) (1 diff)
• util/Misc.java (modified) (2 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/LibraryServlet.java

@@ -48 +48 @@
     super.init(config);
 
+    // disable preferences - does this work anyway??
+    //System.setProperty("java.util.prefs.PreferencesFactory", "org.greenstone.gsdl3.util.DisabledPreferencesFactory");
+
     String library_name = config.getInitParameter(GSConstants.LIBRARY_NAME);
     String gsdl3_home = config.getInitParameter(GSConstants.GSDL3_HOME);
@@ -86 +89 @@
         message_router = (MessageRouter)Class.forName("org.greenstone.gsdl3.core."+mr_name).newInstance();
         } catch (Exception e) { // cant use this new one, so use normal one
-        System.out.println("LibraryServlet configure exception when trying to use a new MessageRouter "+mr_name+": "+e.getMessage());
+        System.err.println("LibraryServlet configure exception when trying to use a new MessageRouter "+mr_name+": "+e.getMessage());
         e.printStackTrace();
         message_router = new MessageRouter();
@@ -104 +107 @@
         this.recept = (Receptionist)Class.forName("org.greenstone.gsdl3.core."+recept_name).newInstance();
         } catch (Exception e) { // cant use this new one, so use normal one
-        System.out.println("LibraryServlet configure exception when trying to use a new Receptionist "+recept_name+": "+e.getMessage());
+        System.err.println("LibraryServlet configure exception when trying to use a new Receptionist "+recept_name+": "+e.getMessage());
         e.printStackTrace();
         this.recept = new DefaultReceptionist();
@@ -120 +123 @@
         this.params = (GSParams)Class.forName("org.greenstone.gsdl3.util."+params_name).newInstance();
         } catch (Exception e) {
-        System.out.println("LibraryServlet configure exception when trying to use a new params thing "+params_name+": "+e.getMessage());
+        System.err.println("LibraryServlet configure exception when trying to use a new params thing "+params_name+": "+e.getMessage());
         e.printStackTrace();
         this.params = new GSParams();
@@ -136 +139 @@
     
     HttpSession session = request.getSession(true);
-
-    // print them out to test it
-//      Enumeration stored_names = session.getAttributeNames();
-//      System.out.println("session values are:");
-//      while (stored_names.hasMoreElements()) {
-//          String name = (String)stored_names.nextElement();
-//          System.out.println("stored "+name+":" +session.getAttribute(name));
-//      }
 
     request.setCharacterEncoding("UTF-8");

trunk/gsdl3/src/java/org/greenstone/gsdl3/collection/Collection.java

@@ -69 +69 @@
     
     if (this.site_home == null || this.cluster_name== null) {
-        System.err.println("site_home and collection_name must be set before configure called!");
+        System.err.println("Collection: site_home and collection_name must be set before configure called!");
         return false;
     }
@@ -97 +97 @@
     
     if (!coll_config_file.exists()) {
-        System.err.println(coll_config_file+" does not exist");
-        System.err.println("couldn't configure collection: "+this.cluster_name);
+        System.err.println("Collection: couldn't configure collection: "+this.cluster_name+", "+coll_config_file+" does not exist");
         return null;
     }
@@ -114 +113 @@
     File build_config_file = new File(GSFile.collectionBuildConfigFile(this.site_home, this.cluster_name));
     if (!build_config_file.exists()) {
-        System.err.println(build_config_file+" does not exist");
-        System.err.println("couldn't configure collection: "+this.cluster_name);
+        System.err.println("Collection: couldn't configure collection: "+this.cluster_name+", "+coll_config_file+" does not exist");
         return null;
     }
@@ -171 +169 @@
     }
     
-    System.err.println("ServiceCluster: cant process system request, configure "+subset);
+    System.err.println("Collection: cant process system request, configure "+subset);
     return false;
     } 

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

@@ -123 +123 @@
 
     if (this.site_home == null || this.cluster_name== null) {
-        System.err.println("site_home and cluster_name must be set before configure called!");
+        System.err.println("ServiceCluster: site_home and cluster_name must be set before configure called!");
         return false;
     }
@@ -131 +131 @@
 
     if (!config_file.exists()) {
-        System.err.println(config_file+" does not exist");
-        System.err.println("couldn't configure cluster: "+this.cluster_name);
+        System.err.println("ServiceCluster: couldn't configure cluster: "+this.cluster_name +", "+config_file+" does not exist");
         return false;
     }
@@ -154 +153 @@
         if (!addMetadata(meta_list)) {
         
-        System.err.println("couldn't configure the metadata");
+        System.err.println("ServiceCluster: couldn't configure the metadata");
         }
     }
@@ -163 +162 @@
         if (!addDisplayItems(display_list)) {
         
-        System.err.println("couldn't configure the display items");
+        System.err.println("ServiceCluster: couldn't configure the display items");
         }
     }
@@ -173 +172 @@
         // is this an error? could you ever have a service cluster
         // without service racks???
-        System.err.println("cluster has no service racks!!");
+        System.err.println("ServiceCluster: cluster has no service racks!!");
     } else {
         
         if (!configureServiceRack(service_rack_list, null)) {
-        System.err.println("couldn't configure the  service racks!!");
+        System.err.println("ServiceCluster: couldn't configure the  service racks!!");
         return false;
         }
@@ -211 +210 @@
         }
         String name = d.getAttribute(GSXML.NAME_ATT);
-        System.out.println("adding display named "+name);
         Element this_item = GSXML.getNamedElement(this.display_item_list, GSXML.DISPLAY_TEXT_ELEM, GSXML.NAME_ATT, name);
         if (this_item==null) {
@@ -241 +239 @@
     NodeList nodes = service_rack_list.getElementsByTagName(GSXML.SERVICE_CLASS_ELEM);
     if (nodes.getLength()==0) {
-        System.err.println("Cluster configuration error: cluster "+this.cluster_name+" has no service modules!");
+        System.err.println("ServiceCluster configuration error: cluster "+this.cluster_name+" has no service modules!");
         return false;
     }
@@ -469 +467 @@
             this.service_map.remove(module_name);
             Element service_elem = GSXML.getNamedElement(this.service_list, GSXML.SERVICE_ELEM, GSXML.NAME_ATT, module_name);
-            System.out.println("service list before: "+this.converter.getPrettyString(service_list));
-            service_list.removeChild(service_elem);
-            System.out.println("service list after: "+this.converter.getPrettyString(service_list));
-            
+            service_list.removeChild(service_elem);         
             message = module_type+": "+module_name+" deactivated";
         } else {

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

@@ -211 +211 @@
             String namespace = name.substring(0, pos);
             name = name.substring(pos+1);
-            System.out.println("namespace = "+namespace+" name= "+name);
             HashMap map = (HashMap)param_map.get(namespace);
             if (map == null) {

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

@@ -13 +13 @@
     
     public static void printHash(HashMap map) {
-    System.out.println("Map entries are :");
     Set entries = map.entrySet();
     Iterator i = entries.iterator();
@@ -20 +19 @@
         String name = (String)m.getKey();
         String value = (String)m.getValue();
-        System.out.println(name+"="+value);
     }  
     }