svn commit: r634985 - /cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java

[gk...@apache.org]

Author: gkossakowski
Date: Sat Mar  8 07:15:23 2008
New Revision: 634985

URL: http://svn.apache.org/viewvc?rev=634985&view=rev
Log:
TreeProcessor does not extend AbstractLogEnabled any more.

Modified:
    cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java

Modified: cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java?rev=634985&r1=634984&r2=634985&view=diff
==============================================================================
--- cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java (original)
+++ cocoon/whiteboard/micro/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java Sat Mar  8 07:15:23 2008
@@ -41,7 +41,8 @@
 import org.apache.cocoon.environment.internal.EnvironmentHelper;
 import org.apache.cocoon.sitemap.SitemapExecutor;
 import org.apache.cocoon.sitemap.impl.DefaultExecutor;
-import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.excalibur.source.Source;
 import org.apache.excalibur.source.SourceResolver;
 import org.apache.regexp.RE;
@@ -52,7 +53,7 @@
  *
  * @version $Id$
  */
-public class TreeProcessor extends AbstractLogEnabled implements Processor {
+public class TreeProcessor implements Processor {
 
     /** The component manager */
     protected ServiceManager manager;
@@ -78,6 +79,8 @@
     /** The sitemap schema used for validation. */
     protected Schema sitemapSchema;
     
+    private final Log logger = LogFactory.getLog(getClass()); 
+    
     /**
      * Name of the 'sitemap-path' servlet init parameter. Value should point
      * to the location of sitemap file, defaults to '/sitemap.xmap'.
@@ -238,8 +241,8 @@
         // do we validate? Default is false
         final String value = this.settings.getProperty("org.apache.cocoon.sitemap.validating", "false");
         if ( Boolean.valueOf(value).booleanValue() ) {
-            if ( this.getLogger().isDebugEnabled() ) {
-                this.getLogger().debug("Validating sitemap " + sitemapSource.getURI());
+            if (this.logger.isDebugEnabled() ) {
+                this.logger.debug("Validating sitemap " + sitemapSource.getURI());
             }
             final Validator validator = this.sitemapSchema.newValidator();
             validator.validate(new StreamSource(sitemapSource.getInputStream()));
@@ -289,8 +292,8 @@
                         root,
                         treeBuilder.getDisposableNodes());
 
-                if (getLogger().isDebugEnabled()) {
-                    getLogger().debug("ConcreteTreeProcessor ready");
+                if (this.logger.isDebugEnabled()) {
+                    this.logger.debug("ConcreteTreeProcessor ready");
                 }
 
                 // Get the actual interpreter
@@ -307,9 +310,9 @@
             EnvironmentHelper.leaveProcessor();
         }
 
-        if (getLogger().isDebugEnabled()) {
+        if (this.logger.isDebugEnabled()) {
             double time = (System.nanoTime() - startTime) / 1000.0 / 1000000;
-            getLogger().debug("TreeProcessor built in " + time + " secs from " + source.getURI());
+            this.logger.debug("TreeProcessor built in " + time + " secs from " + source.getURI());
         }
     }