cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r490032 - in /cocoon/trunk/core/cocoon-xml/cocoon-xml-impl: pom.xml src/main/java/org/apache/cocoon/core/xml/impl/AbstractJaxpParser.java src/main/java/org/apache/cocoon/core/xml/impl/DefaultEntityResolver.java
Date Sun, 24 Dec 2006 15:10:28 GMT
Author: cziegeler
Date: Sun Dec 24 07:10:27 2006
New Revision: 490032

URL: http://svn.apache.org/viewvc?view=rev&rev=490032
Log:
Reduce dependencies

Modified:
    cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml
    cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/core/xml/impl/AbstractJaxpParser.java
    cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/core/xml/impl/DefaultEntityResolver.java

Modified: cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml?view=diff&rev=490032&r1=490031&r2=490032
==============================================================================
--- cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml Sun Dec 24 07:10:27 2006
@@ -39,11 +39,6 @@
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-util</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
       <version>2.0.1</version>

Modified: cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/core/xml/impl/AbstractJaxpParser.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/core/xml/impl/AbstractJaxpParser.java?view=diff&rev=490032&r1=490031&r2=490032
==============================================================================
--- cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/core/xml/impl/AbstractJaxpParser.java
(original)
+++ cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/core/xml/impl/AbstractJaxpParser.java
Sun Dec 24 07:10:27 2006
@@ -16,7 +16,8 @@
  */
 package org.apache.cocoon.core.xml.impl;
 
-import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.xml.sax.EntityResolver;
 
 /**
@@ -28,8 +29,7 @@
  * @version $Id$
  * @since 2.2
  */
-public abstract class AbstractJaxpParser
-    extends AbstractLogEnabled {
+public abstract class AbstractJaxpParser {
 
     /** the Entity Resolver */
     protected EntityResolver resolver;
@@ -39,6 +39,17 @@
 
     /** Do we want to validate? */
     protected boolean validate = false;
+
+    /** By default we use the logger for this class. */
+    private Log logger = LogFactory.getLog(getClass());
+
+    public Log getLogger() {
+        return this.logger;
+    }
+
+    public void setLogger(Log l) {
+        this.logger = l;
+    }
 
     public void setEntityResolver(EntityResolver r) {
         this.resolver = r;

Modified: cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/core/xml/impl/DefaultEntityResolver.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/core/xml/impl/DefaultEntityResolver.java?view=diff&rev=490032&r1=490031&r2=490032
==============================================================================
--- cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/core/xml/impl/DefaultEntityResolver.java
(original)
+++ cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/core/xml/impl/DefaultEntityResolver.java
Sun Dec 24 07:10:27 2006
@@ -20,6 +20,8 @@
 import java.io.IOException;
 
 import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.xml.resolver.CatalogManager;
 import org.apache.xml.resolver.tools.CatalogResolver;
 import org.springframework.core.io.Resource;
@@ -37,14 +39,24 @@
  * found at
  * http://xml.apache.org/cocoon/userdocs/concepts/catalog.html
  *
- * TODO - This class contains two methods copied from core's resource utils!!
+ * TODO - This class contains one method copied from core's resource utils!!
  *
  * @version $Id$
  * @since 2.2
  */
 public class DefaultEntityResolver
-    extends AbstractLogEnabled
     implements EntityResolver {
+
+    /** By default we use the logger for this class. */
+    private Log logger = LogFactory.getLog(getClass());
+
+    public Log getLogger() {
+        return this.logger;
+    }
+
+    public void setLogger(Log l) {
+        this.logger = l;
+    }
 
     /**
      * TODO - Copied from ResourceUtils



Mime
View raw message