svn commit: r470075 - in /struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles: listener/TilesContainerListener.java servlet/TilesServlet.java

[ddewolf]

Author: ddewolf
Date: Wed Nov  1 12:18:57 2006
New Revision: 470075

URL: http://svn.apache.org/viewvc?view=rev&rev=470075
Log:
Standardizing on commons-logging

Modified:
    
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/listener/TilesContainerListener.java
    
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/servlet/TilesServlet.java

Modified: 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/listener/TilesContainerListener.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/listener/TilesContainerListener.java?view=diff&rev=470075&r1=470074&r2=470075
==============================================================================
--- 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/listener/TilesContainerListener.java
 (original)
+++ 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/listener/TilesContainerListener.java
 Wed Nov  1 12:18:57 2006
@@ -32,7 +32,7 @@
         implements ServletContextListener {
 
     /**
-     * Logger instance.
+     * Log instance.
      */
     protected static final Log LOG =
             LogFactory.getLog(TilesListener.class);

Modified: 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/servlet/TilesServlet.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/servlet/TilesServlet.java?view=diff&rev=470075&r1=470074&r2=470075
==============================================================================
--- 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/servlet/TilesServlet.java
 (original)
+++ 
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/servlet/TilesServlet.java
 Wed Nov  1 12:18:57 2006
@@ -25,12 +25,13 @@
 import javax.servlet.http.*;
 
 import java.util.HashMap;
-import java.util.logging.Logger;
 
 import org.apache.tiles.*;
 import org.apache.tiles.access.TilesAccess;
 import org.apache.tiles.context.TilesContextFactory;
 import org.apache.tiles.context.BasicTilesContextFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * This is the entry point for Tiles. The <code>TilesServlet</code> initializes
@@ -117,8 +118,7 @@
     /**
      * The LOG for this class
      */
-    protected static Logger logger = Logger.getLogger(TilesServlet.class.
-            getName());
+    protected static final Log LOG = LogFactory.getLog(TilesServlet.class);
 
 
     /**
@@ -163,7 +163,7 @@
     public void init(ServletConfig config)
             throws javax.servlet.ServletException {
         super.init(config);
-        logger.info("Initializing TilesServlet");
+        LOG.info("Initializing TilesServlet");
         configFiles = config.getInitParameter("definitions-config");
 
         try {
@@ -201,10 +201,10 @@
 
         try {
             if (configFiles != null) {
-                logger.info("CONFIG FILES DEFINED IN WEB.XML");
+                LOG.info("CONFIG FILES DEFINED IN WEB.XML");
                 map.put(DEFAULT_CONFIG_FILE_PARAM, configFiles);
             } else {
-                logger.info("CONFIG FILES WERE NOT DEFINED IN WEB.XML, " +
+                LOG.info("CONFIG FILES WERE NOT DEFINED IN WEB.XML, " +
                         "LOOKING FOR " + DEFAULT_CONFIG_FILE);
                 map.put(DEFAULT_CONFIG_FILE_PARAM, DEFAULT_CONFIG_FILE);
             }
@@ -229,7 +229,7 @@
     private void initDefinitionsFactory(ServletContext servletContext,
                                         DefinitionsFactoryConfig factoryConfig)
             throws ServletException {
-        logger.info("initializing definitions impl...");
+        LOG.info("initializing definitions impl...");
         // Create configurable impl
         try {
 
@@ -252,9 +252,7 @@
      * @param ex     An exception
      */
     private void saveExceptionMessage(ServletConfig config, Exception ex) {
-        logger.warning("Caught exception when initializing definitions impl");
-        logger.warning(ex.getMessage());
-        logger.warning(ex.toString());
+        LOG.warn("Caught exception when initializing definitions impl", ex);
         
//config.getServletContext().setAttribute(Globals.TILES_INIT_EXCEPTION, 
ex.getMessage());
     }