morgand 01/08/20 14:45:03
Modified: latka build.properties.sample
latka/src/java/org/apache/commons/latka
AbstractReporter.java Latka.java
latka/src/java/org/apache/commons/latka/http
RequestImpl.java
latka/src/java/org/apache/commons/latka/util/xml
BasicDelegateHandler.java
latka/src/java/org/apache/commons/latka/xml
RequestHandler.java RequestHeaderHandler.java
SuiteHandler.java ValidationReflectionHandler.java
Log:
converted from Logging component to Log4J
Revision Changes Path
1.5 +1 -1 jakarta-commons/latka/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-commons/latka/build.properties.sample,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.properties.sample 2001/08/20 17:08:35 1.4
+++ build.properties.sample 2001/08/20 21:45:02 1.5
@@ -7,4 +7,4 @@
jdom.jar=/java/lib/jdom.jar
regexp.jar=/java/lib/jakarta-regexp.jar
httpclient.jar=/java/lib/commons-httpclient.jar
-logging.jar=/java/lib/commons-logging.jar
+log4j.jar=/java/lib/log4j.jar
1.5 +4 -4
jakarta-commons/latka/src/java/org/apache/commons/latka/AbstractReporter.java
Index: AbstractReporter.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/latka/src/java/org/apache/commons/latka/AbstractReporter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractReporter.java 2001/08/20 17:08:36 1.4
+++ AbstractReporter.java 2001/08/20 21:45:02 1.5
@@ -8,9 +8,9 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.log4j.Category;
+
public abstract class AbstractReporter implements LatkaEventInfo {
protected Map _requestSucceeded = new HashMap();
@@ -18,8 +18,8 @@
protected boolean _suiteSucceeded = true;
- protected static final Log log =
- LogSource.getInstance(AbstractReporter.class);
+ protected static final Category log =
+ Category.getInstance(AbstractReporter.class);
public void requestSucceeded(RequestEvent event) {
recordSuccess(event, true);
1.5 +4 -4
jakarta-commons/latka/src/java/org/apache/commons/latka/Latka.java
Index: Latka.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/latka/src/java/org/apache/commons/latka/Latka.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Latka.java 2001/08/20 17:08:36 1.4
+++ Latka.java 2001/08/20 21:45:02 1.5
@@ -35,9 +35,9 @@
import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.log4j.Category;
+
import org.jdom.output.XMLOutputter;
import org.xml.sax.InputSource;
@@ -50,8 +50,8 @@
XMLReporter _listener = new XMLReporter();
- protected static Log log =
- LogSource.getInstance(Latka.class.getName());
+ protected static Category log =
+ Category.getInstance(Latka.class.getName());
public void runTests(Suite suite) {
1.6 +3 -3
jakarta-commons/latka/src/java/org/apache/commons/latka/http/RequestImpl.java
Index: RequestImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/latka/src/java/org/apache/commons/latka/http/RequestImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RequestImpl.java 2001/08/20 20:26:51 1.5
+++ RequestImpl.java 2001/08/20 21:45:03 1.6
@@ -12,9 +12,9 @@
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.log4j.Category;
+
/**
* An implementation of a Latka Request interface based on the Jakarta Commons
HttpClient package.
*
@@ -29,7 +29,7 @@
protected long _requestTiming = -1;
protected String _label = null;
- protected static final Log log = LogSource.getInstance(RequestImpl.class);
+ protected static final Category log = Category.getInstance(RequestImpl.class);
RequestImpl(URL url, int httpMethod, SessionImpl session) {
this(null,url,httpMethod,session,true);
1.6 +3 -3
jakarta-commons/latka/src/java/org/apache/commons/latka/util/xml/BasicDelegateHandler.java
Index: BasicDelegateHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/latka/src/java/org/apache/commons/latka/util/xml/BasicDelegateHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BasicDelegateHandler.java 2001/08/20 20:26:51 1.5
+++ BasicDelegateHandler.java 2001/08/20 21:45:03 1.6
@@ -1,8 +1,8 @@
package org.apache.commons.latka.util.xml;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.log4j.Category;
+
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.ContentHandler;
@@ -25,7 +25,7 @@
private String _delegatorClassName = null;
private String _delegateClassName = null;
- protected static final Log log =
LogSource.getInstance(BasicDelegateHandler.class);
+ protected static final Category log =
Category.getInstance(BasicDelegateHandler.class);
/**
* Create a DelegateHandler that releases to the
1.6 +4 -4
jakarta-commons/latka/src/java/org/apache/commons/latka/xml/RequestHandler.java
Index: RequestHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/latka/src/java/org/apache/commons/latka/xml/RequestHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RequestHandler.java 2001/08/20 20:26:51 1.5
+++ RequestHandler.java 2001/08/20 21:45:03 1.6
@@ -20,9 +20,9 @@
import java.net.MalformedURLException;
import java.net.URL;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.log4j.Category;
+
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
@@ -40,8 +40,8 @@
protected Response _response = null;
protected boolean _requestExecuted = false;
- protected static final Log log =
- LogSource.getInstance(RequestHandler.class);
+ protected static final Category log =
+ Category.getInstance(RequestHandler.class);
public RequestHandler(XMLReader reader, Session session,
String defaultHost,
1.2 +3 -3
jakarta-commons/latka/src/java/org/apache/commons/latka/xml/RequestHeaderHandler.java
Index: RequestHeaderHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/latka/src/java/org/apache/commons/latka/xml/RequestHeaderHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RequestHeaderHandler.java 2001/08/20 20:26:51 1.1
+++ RequestHeaderHandler.java 2001/08/20 21:45:03 1.2
@@ -2,9 +2,9 @@
import org.apache.commons.latka.http.Request;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.log4j.Category;
+
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
@@ -13,7 +13,7 @@
protected Request _request = null;
- protected static final Log log =
LogSource.getInstance(RequestHeaderHandler.class);
+ protected static final Category log =
Category.getInstance(RequestHeaderHandler.class);
public RequestHeaderHandler(XMLReader reader,
Request request) {
1.5 +4 -4
jakarta-commons/latka/src/java/org/apache/commons/latka/xml/Attic/SuiteHandler.java
Index: SuiteHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/latka/src/java/org/apache/commons/latka/xml/Attic/SuiteHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SuiteHandler.java 2001/08/20 17:08:38 1.4
+++ SuiteHandler.java 2001/08/20 21:45:03 1.5
@@ -5,9 +5,9 @@
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.log4j.Category;
+
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -19,8 +19,8 @@
protected String _defaultHost = null;
protected int _defaultPort = 80;
- protected static Log log =
- LogSource.getInstance(SuiteHandler.class);
+ protected static Category log =
+ Category.getInstance(SuiteHandler.class);
public SuiteHandler(XMLReader reader, LatkaEventInfo listener) {
super(reader);
1.5 +4 -4
jakarta-commons/latka/src/java/org/apache/commons/latka/xml/ValidationReflectionHandler.java
Index: ValidationReflectionHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/latka/src/java/org/apache/commons/latka/xml/ValidationReflectionHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ValidationReflectionHandler.java 2001/08/20 17:08:38 1.4
+++ ValidationReflectionHandler.java 2001/08/20 21:45:03 1.5
@@ -17,9 +17,9 @@
import java.util.Enumeration;
import java.util.Properties;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.log4j.Category;
+
public class ValidationReflectionHandler extends LatkaHandler {
protected Request _request = null;
@@ -27,8 +27,8 @@
protected LatkaEventInfo _listener = null;
protected static String _latkaPrefix = "latka.validator.";
- protected static final Log log =
- LogSource.getInstance(ValidationReflectionHandler.class);
+ protected static final Category log =
+ Category.getInstance(ValidationReflectionHandler.class);
public ValidationReflectionHandler(XMLReader reader, Response response,
LatkaEventInfo listener) {
