Author: tv
Date: Tue Jan 6 12:54:04 2009
New Revision: 732115
URL: http://svn.apache.org/viewvc?rev=732115&view=rev
Log:
Removed the dependency on commons-logging
Modified:
turbine/fulcrum/trunk/parser/project.xml
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DataStreamParser.java
turbine/fulcrum/trunk/parser/xdocs/changes.xml
Modified: turbine/fulcrum/trunk/parser/project.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/project.xml?rev=732115&r1=732114&r2=732115&view=diff
==============================================================================
--- turbine/fulcrum/trunk/parser/project.xml (original)
+++ turbine/fulcrum/trunk/parser/project.xml Tue Jan 6 12:54:04 2009
@@ -54,12 +54,6 @@
<url>http://commons.apache.org/lang/</url>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- <url>http://commons.apache.org/logging/</url>
- </dependency>
- <dependency>
<groupId>fulcrum</groupId>
<artifactId>fulcrum-pool</artifactId>
<version>1.0.3</version>
Modified:
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DataStreamParser.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DataStreamParser.java?rev=732115&r1=732114&r2=732115&view=diff
==============================================================================
---
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DataStreamParser.java
(original)
+++
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DataStreamParser.java
Tue Jan 6 12:54:04 2009
@@ -31,8 +31,8 @@
import java.util.List;
import java.util.NoSuchElementException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.logger.Logger;
/**
* DataStreamParser is used to parse a stream with a fixed format and
@@ -57,7 +57,7 @@
* @version $Id$
*/
public abstract class DataStreamParser
- implements Iterator
+ implements Iterator, LogEnabled
{
/**
* The list of column names.
@@ -87,7 +87,7 @@
/**
* Logger to use
*/
- Log log = LogFactory.getLog(DataStreamParser.class);
+ protected Logger log;
/**
* Create a new DataStreamParser instance. Requires a Reader to read the
@@ -130,6 +130,16 @@
protected abstract void initTokenizer(StreamTokenizer tokenizer);
/**
+ * Provide a logger
+ *
+ * @see
org.apache.avalon.framework.logger.LogEnabled#enableLogging(org.apache.avalon.framework.logger.Logger)
+ */
+ public void enableLogging(Logger logger)
+ {
+ this.log = logger.getChildLogger("DataStreamParser");
+ }
+
+ /**
* Set the list of column names explicitly.
*
* @param columnNames A list of column names.
Modified: turbine/fulcrum/trunk/parser/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/xdocs/changes.xml?rev=732115&r1=732114&r2=732115&view=diff
==============================================================================
--- turbine/fulcrum/trunk/parser/xdocs/changes.xml (original)
+++ turbine/fulcrum/trunk/parser/xdocs/changes.xml Tue Jan 6 12:54:04 2009
@@ -25,6 +25,9 @@
<body>
<release version="1.0.2-dev" date="in SVN">
+ <action type="update" dev="tv">
+ Removed the dependency on commons-logging.
+ </action>
<action type="add" dev="tv">
Added getBooleans() and getBooleanObjects() to the ValueParser to
provide
a "more orthogonal" interface.
