epugh 2004/10/30 05:28:01
Modified: parser/src/java/org/apache/fulcrum/parser
DefaultParameterParser.java
DefaultCookieParser.java DataStreamParser.java
parser/xdocs changes.xml
parser project.xml
Log:
Migrate to commons logger
Revision Changes Path
1.3 +7 -6
jakarta-turbine-fulcrum/parser/src/java/org/apache/fulcrum/parser/DefaultParameterParser.java
Index: DefaultParameterParser.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/parser/src/java/org/apache/fulcrum/parser/DefaultParameterParser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultParameterParser.java 29 Oct 2004 12:36:18 -0000 1.2
+++ DefaultParameterParser.java 30 Oct 2004 12:28:01 -0000 1.3
@@ -66,7 +66,8 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.commons.fileupload.FileItem;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* DefaultParameterParser is a utility object to handle parsing and
@@ -108,9 +109,9 @@
private byte[] uploadData = null;
/**
- * Log4j logger
+ * Logger to use
*/
- Logger LOG = Logger.getLogger(getClass().getName());
+ Log log = LogFactory.getLog(DefaultParameterParser.class);
/**
* Create a new empty instance of ParameterParser. Uses the
@@ -206,7 +207,7 @@
}
catch (UnsupportedEncodingException e)
{
- LOG.error(getCharacterEncoding() +
+ log.error(getCharacterEncoding() +
"encoding is not supported. Used the default "
+ "when reading form data.");
value = item.getString();
@@ -221,7 +222,7 @@
}
catch(Exception e)
{
- LOG.error(new Exception("File upload failed", e));
+ log.error(new Exception("File upload failed", e));
}
}
1.2 +8 -6
jakarta-turbine-fulcrum/parser/src/java/org/apache/fulcrum/parser/DefaultCookieParser.java
Index: DefaultCookieParser.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/parser/src/java/org/apache/fulcrum/parser/DefaultCookieParser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultCookieParser.java 13 Feb 2004 14:24:54 -0000 1.1
+++ DefaultCookieParser.java 30 Oct 2004 12:28:01 -0000 1.2
@@ -57,8 +57,10 @@
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.pool.Recyclable;
-import org.apache.log4j.Category;
/**
* CookieParser is used to get and set values of Cookies on the Client
@@ -99,9 +101,9 @@
private HttpServletResponse response;
/**
- * Log4j category
+ * Logger to use
*/
- Category category = Category.getInstance(getClass().getName());
+ Log log = LogFactory.getLog(DefaultCookieParser.class);
/**
* Constructs a new CookieParser.
@@ -146,13 +148,13 @@
Cookie[] cookies = request.getCookies();
- category.debug ("Number of Cookies "+cookies.length);
+ log.debug ("Number of Cookies "+cookies.length);
for (int i=0; i<cookies.length; i++)
{
String name = convert (cookies[i].getName());
String value = cookies[i].getValue();
- category.debug ("Adding "+name+"="+value);
+ log.debug ("Adding "+name+"="+value);
add (name,value);
}
1.3 +9 -7
jakarta-turbine-fulcrum/parser/src/java/org/apache/fulcrum/parser/DataStreamParser.java
Index: DataStreamParser.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/parser/src/java/org/apache/fulcrum/parser/DataStreamParser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DataStreamParser.java 29 Oct 2004 12:36:18 -0000 1.2
+++ DataStreamParser.java 30 Oct 2004 12:28:01 -0000 1.3
@@ -63,7 +63,9 @@
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
-import org.apache.log4j.Logger;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* DataStreamParser is used to parse a stream with a fixed format and
@@ -121,9 +123,9 @@
private String characterEncoding;
/**
- * Log4j category
+ * Logger to use
*/
- Logger LOG = Logger.getLogger(getClass().getName());
+ Log log = LogFactory.getLog(DataStreamParser.class);
/**
* Create a new DataStreamParser instance. Requires a Reader to read the
@@ -252,7 +254,7 @@
String colval = tokenizer.sval;
if (DEBUG)
{
- LOG.debug("DataStreamParser.nextRow(): " +
+ log.debug("DataStreamParser.nextRow(): " +
colname + '=' + colval);
}
lineValues.add(colname, colval);
@@ -278,7 +280,7 @@
}
catch (IOException e)
{
- LOG.error("IOException in CSVParser.hasNext", e);
+ log.error("IOException in CSVParser.hasNext", e);
}
return hasNext;
@@ -302,7 +304,7 @@
}
catch (IOException e)
{
- LOG.error("IOException in CSVParser.next", e);
+ log.error("IOException in CSVParser.next", e);
throw new NoSuchElementException();
}
1.4 +4 -0 jakarta-turbine-fulcrum/parser/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/parser/xdocs/changes.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- changes.xml 29 Oct 2004 12:36:18 -0000 1.3
+++ changes.xml 30 Oct 2004 12:28:01 -0000 1.4
@@ -8,6 +8,10 @@
<body>
<release version="1.0.2-dev" date="in CVS">
<action dev="epugh" type="add">
+ Change to commons-logger to be more friendly to who ever
+ uses this code.
+ </action>
+ <action dev="epugh" type="add">
Removed use of old Log4j Category in favor of Logger.
</action>
<action dev="epugh" type="add">
1.7 +6 -0 jakarta-turbine-fulcrum/parser/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/parser/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 29 Oct 2004 17:28:45 -0000 1.6
+++ project.xml 30 Oct 2004 12:28:01 -0000 1.7
@@ -17,6 +17,12 @@
<version>1.0</version>
<url>http://jakarta.apache.org/commons/fileupload/index.html</url>
</dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.3</version>
+ <url>http://jakarta.apache.org/commons/logging/index.html</url>
+ </dependency>
<dependency>
<groupId>fulcrum</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
