[exo-jcr-commits] exo-jcr SVN: r466 - in kernel/trunk: exo.kernel.container/src/main/java/org/exoplatform/container/configuration and 1 other directory.

[do-not-reply at jboss.org]

Author: dkatayev
Date: 2009-11-04 04:10:21 -0500 (Wed, 04 Nov 2009)
New Revision: 466

Modified:
   kernel/trunk/exo.kernel.component.command/src/main/java/org/exoplatform/services/command/impl/CommonsXMLConfigurationPlugin.java
   kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationUnmarshaller.java
Log:
System.out.println changed to logger.info

Modified: kernel/trunk/exo.kernel.component.command/src/main/java/org/exoplatform/services/command/impl/CommonsXMLConfigurationPlugin.java
===================================================================
--- kernel/trunk/exo.kernel.component.command/src/main/java/org/exoplatform/services/command/impl/CommonsXMLConfigurationPlugin.java	2009-11-04 08:36:42 UTC (rev 465)
+++ kernel/trunk/exo.kernel.component.command/src/main/java/org/exoplatform/services/command/impl/CommonsXMLConfigurationPlugin.java	2009-11-04 09:10:21 UTC (rev 466)
@@ -23,6 +23,8 @@
 import org.exoplatform.container.configuration.ConfigurationManager;
 import org.exoplatform.container.xml.InitParams;
 import org.exoplatform.container.xml.ValueParam;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
 
 import java.net.URL;
 
@@ -40,6 +42,8 @@
 {
 
    // protected Catalog defaultCatalog;
+   
+   private static Log log = ExoLogger.getLogger(CommonsXMLConfigurationPlugin.class);
 
    public CommonsXMLConfigurationPlugin(InitParams params, ConfigurationManager configurationManager) throws Exception
    {
@@ -56,7 +60,7 @@
             res = configurationManager.getResource(path);
          if (res == null)
             throw new Exception("Resource not found " + path);
-         System.out.println("Catalog configuration found at " + res);
+         log.info("Catalog configuration found at " + res);
          parser.parse(res);
       }
 

Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationUnmarshaller.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationUnmarshaller.java	2009-11-04 08:36:42 UTC (rev 465)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationUnmarshaller.java	2009-11-04 09:10:21 UTC (rev 466)
@@ -71,23 +71,16 @@
          this.valid = true;
       }
 
-      private void log(String prefix, SAXParseException e)
-      {
-         System.err.println(prefix + " in document " + url + "  at (" + e.getLineNumber() + "," + e.getColumnNumber()
-            + ") :" + e.getMessage());
-      }
-
       public void warning(SAXParseException exception) throws SAXException
       {
-         log("Warning", exception);
+         log.warn(exception.getMessage(), exception);
       }
 
       public void error(SAXParseException exception) throws SAXException
       {
          if (exception.getMessage().equals("cvc-elt.1: Cannot find the declaration of element 'configuration'."))
          {
-            System.out
-               .println("The document "
+            log.info("The document "
                   + url
                   + " does not contain a schema declaration, it should have an "
                   + "XML declaration similar to\n"
@@ -98,14 +91,16 @@
          }
          else
          {
-            log("Error", exception);
+            log.error("In document " + url + "  at (" + exception.getLineNumber() + "," + exception.getColumnNumber()
+                     + ") :" + exception.getMessage());
          }
          valid = false;
       }
 
       public void fatalError(SAXParseException exception) throws SAXException
       {
-         log("Fatal error", exception);
+         log.fatal("In document " + url + "  at (" + exception.getLineNumber() + "," + exception.getColumnNumber()
+            + ") :" + exception.getMessage());
          valid = false;
       }
    }
@@ -138,7 +133,7 @@
          }
          catch (SAXException e)
          {
-            System.err.print("Got a sax exception when doing XSD validation");
+            log.error("Got a sax exception when doing XSD validation");
             e.printStackTrace(System.err);
             return false;
          }
@@ -160,14 +155,14 @@
             out.write(bytes, 0, s);
           }
           String s = out.toString();
-          System.out.println("s = " + s);
+          log.info("s = " + s);
       */
 
       //
       boolean valid = isValid(url);
       if (!valid)
       {
-         System.out.println("The configuration file " + url + " was not found valid according to its XSD");
+         log.info("The configuration file " + url + " was not found valid according to its XSD");
       }
 
       // The buffer