morgand 01/08/14 11:58:50
Modified: latka build.properties.sample build.xml
latka/src/java/org/apache/commons/latka
AbstractReporter.java Latka.java TestAll.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/validators
RegexpHandler.java
latka/src/java/org/apache/commons/latka/xml
RequestHandler.java SessionHandler.java
SuiteHandler.java ValidationHandler.java
ValidationReflectionHandler.java
Log:
converted to commons logging component from log4j
Revision Changes Path
1.2 +1 -1 jakarta-commons-sandbox/latka/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/latka/build.properties.sample,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.properties.sample 2001/08/13 19:42:49 1.1
+++ build.properties.sample 2001/08/14 18:58:49 1.2
@@ -5,6 +5,6 @@
jaxp.jar=/java/lib/jaxp.jar
jdom.jar=/java/lib/jdom.jar
-log4j.jar=/java/lib/log4j.jar
regexp.jar=/java/lib/jakarta-regexp.jar
httpclient.jar=/java/lib/commons-httpclient.jar
+logging.jar=/java/lib/commons-logging.jar
1.2 +2 -2 jakarta-commons-sandbox/latka/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/latka/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 2001/08/13 19:42:49 1.1
+++ build.xml 2001/08/14 18:58:49 1.2
@@ -1,4 +1,4 @@
-<!-- $Id: build.xml,v 1.1 2001/08/13 19:42:49 morgand Exp $ -->
+<!-- $Id: build.xml,v 1.2 2001/08/14 18:58:49 morgand Exp $ -->
<project name="commons-latka" default="test" basedir=".">
<!-- patternset describing files to be copied from the doc directory -->
@@ -42,7 +42,7 @@
<property name="cp" value=""/>
<!-- now combine the classpaths -->
- <property name="classpath"
value="${cp}:${regexp.jar}:${junit.jar}:${jaxp.jar}:${jdom.jar}:${log4j.jar}:${httpclient.jar}"/>
+ <property name="classpath"
value="${cp}:${regexp.jar}:${junit.jar}:${jaxp.jar}:${jdom.jar}:${logging.jar}:${httpclient.jar}"/>
<property name="name" value="commons-latka"/>
<property name="Name" value="Commons-Latka"/>
1.2 +5 -4
jakarta-commons-sandbox/latka/src/java/org/apache/commons/latka/AbstractReporter.java
Index: AbstractReporter.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/latka/src/java/org/apache/commons/latka/AbstractReporter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractReporter.java 2001/08/13 19:42:50 1.1
+++ AbstractReporter.java 2001/08/14 18:58:49 1.2
@@ -8,7 +8,8 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.log4j.Category;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogSource;
public abstract class AbstractReporter implements LatkaEventInfo {
@@ -17,8 +18,8 @@
protected boolean _suiteSucceeded = true;
- protected static final Category cat =
- Category.getInstance(AbstractReporter.class);
+ protected static final Log log =
+ LogSource.getInstance(AbstractReporter.class);
public void requestSucceeded(RequestEvent event) {
recordSuccess(event, true);
@@ -41,7 +42,7 @@
_suiteSucceeded = false;
_requestSucceeded.put(event.getRequest(),new Boolean(bool));
_sessionSucceeded.put(event.getSession(),new Boolean(bool));
- cat.info("request failed");
+ log.info("request failed");
}
}
1.2 +8 -7
jakarta-commons-sandbox/latka/src/java/org/apache/commons/latka/Latka.java
Index: Latka.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/latka/src/java/org/apache/commons/latka/Latka.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Latka.java 2001/08/13 19:42:50 1.1
+++ Latka.java 2001/08/14 18:58:49 1.2
@@ -35,7 +35,8 @@
import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.log4j.Category;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogSource;
import org.jdom.output.XMLOutputter;
@@ -49,8 +50,8 @@
XMLReporter _listener = new XMLReporter();
- protected static Category cat =
- Category.getInstance(Latka.class.getName());
+ protected static Log log =
+ LogSource.getInstance(Latka.class.getName());
public void runTests(Suite suite) {
@@ -204,11 +205,11 @@
* @return status code
public int getStatusCode(URL url) throws IOException {
- cat.info("Enter: Latka::getStatusCode(URL)");
+ log.info("Enter: Latka::getStatusCode(URL)");
HttpClient client = new HttpClient();
- cat.debug("Getting status code for " + url);
+ log.debug("Getting status code for " + url);
client.startSession(url);
@@ -224,7 +225,7 @@
client.endSession();
- cat.info("Exit: Latka::getStatusCode(url)");
+ log.info("Exit: Latka::getStatusCode(url)");
return statusCode;
}
@@ -259,7 +260,7 @@
while (e.hasMoreElements()) {
String name = (String) e.nextElement();
if (System.getProperty(name) == null) {
- cat.debug("setting property " + name + " to " +
properties.getProperty(name));
+ log.debug("setting property " + name + " to " +
properties.getProperty(name));
System.setProperty(name,properties.getProperty(name));
}
}
1.2 +1 -10
jakarta-commons-sandbox/latka/src/java/org/apache/commons/latka/TestAll.java
Index: TestAll.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/latka/src/java/org/apache/commons/latka/TestAll.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestAll.java 2001/08/13 19:42:50 1.1
+++ TestAll.java 2001/08/14 18:58:49 1.2
@@ -4,20 +4,11 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.log4j.BasicConfigurator;
-
/**
* @author Morgan Delagrange
- * @version $Id: TestAll.java,v 1.1 2001/08/13 19:42:50 morgand Exp $
+ * @version $Id: TestAll.java,v 1.2 2001/08/14 18:58:49 morgand Exp $
*/
public class TestAll extends TestCase {
-
- static {
-
- // Set up a simple configuration that logs on the console.
- BasicConfigurator.configure();
-
- }
public TestAll(String testName) {
super(testName);
1.2 +10 -9
jakarta-commons-sandbox/latka/src/java/org/apache/commons/latka/http/RequestImpl.java
Index: RequestImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/latka/src/java/org/apache/commons/latka/http/RequestImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RequestImpl.java 2001/08/13 19:43:22 1.1
+++ RequestImpl.java 2001/08/14 18:58:50 1.2
@@ -12,7 +12,8 @@
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.log4j.Category;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogSource;
/**
* An implementation of a Latka Request interface based on the Jakarta Commons
HttpClient package.
@@ -28,7 +29,7 @@
protected long _requestTiming = -1;
protected String _label = null;
- protected static final Category cat = Category.getInstance(RequestImpl.class);
+ protected static final Log log = LogSource.getInstance(RequestImpl.class);
RequestImpl(URL url, int httpMethod, SessionImpl session) {
this(null,url,httpMethod,session,true);
@@ -94,9 +95,9 @@
Response response = _session.execute(this);
_requestTiming = ((new java.util.Date()).getTime() - startDate.getTime());
- cat.info("request executed");
- cat.debug("response obtained:");
- cat.debug(response.getResource());
+ log.info("request executed");
+ log.debug("response obtained:");
+ log.debug(response.getResource());
return response;
}
@@ -121,10 +122,10 @@
*/
public void setParameter(String name, String value) {
- cat.info("adding parameter, name:");
- cat.info(name);
- cat.info("value:");
- cat.info(value);
+ log.info("adding parameter, name:");
+ log.info(name);
+ log.info("value:");
+ log.info(value);
try {
if (_httpMethod instanceof PostMethod) {
1.2 +7 -6
jakarta-commons-sandbox/latka/src/java/org/apache/commons/latka/util/xml/BasicDelegateHandler.java
Index: BasicDelegateHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/latka/src/java/org/apache/commons/latka/util/xml/BasicDelegateHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BasicDelegateHandler.java 2001/08/13 19:42:50 1.1
+++ BasicDelegateHandler.java 2001/08/14 18:58:50 1.2
@@ -1,6 +1,7 @@
package org.apache.commons.latka.util.xml;
-import org.apache.log4j.Category;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogSource;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
@@ -24,7 +25,7 @@
private String _delegatorClassName = null;
private String _delegateClassName = null;
- protected static final Category cat =
Category.getInstance(BasicDelegateHandler.class);
+ protected static final Log log =
LogSource.getInstance(BasicDelegateHandler.class);
/**
* Create a DelegateHandler that releases to the
@@ -58,22 +59,22 @@
// method call releases on the first element
delegate();
- cat.info("broadcasting first event to delegate");
+ log.info("broadcasting first event to delegate");
startElement(namespaceURI,localName,rawName,atts);
}
protected void delegate() {
- cat.info("beginning delegation");
+ log.info("beginning delegation");
//debug
_delegatorClassName = _handler.getClass().getName();
_delegateClassName = this.getClass().getName();
- cat.info("delegating from " + _delegatorClassName + " to " +
_delegateClassName);
+ log.info("delegating from " + _delegatorClassName + " to " +
_delegateClassName);
_reader.setContentHandler(this);
}
public void release() {
- cat.info("releasing from " + _delegateClassName + " to " +
_delegatorClassName);
+ log.info("releasing from " + _delegateClassName + " to " +
_delegatorClassName);
_reader.setContentHandler(_handler);
}
1.2 +1 -1
jakarta-commons-sandbox/latka/src/java/org/apache/commons/latka/validators/RegexpHandler.java
Index: RegexpHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/latka/src/java/org/apache/commons/latka/validators/RegexpHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RegexpHandler.java 2001/08/13 19:42:50 1.1
+++ RegexpHandler.java 2001/08/14 18:58:50 1.2
@@ -11,7 +11,7 @@
String qName, Attributes atts)
throws SAXException {
- cat.debug(localName);
+ log.debug(localName);
RegexpValidator validator =
new RegexpValidator(atts.getValue("label"));
1.2 +11 -10
jakarta-commons-sandbox/latka/src/java/org/apache/commons/latka/xml/RequestHandler.java
Index: RequestHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/latka/src/java/org/apache/commons/latka/xml/RequestHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RequestHandler.java 2001/08/13 19:42:51 1.1
+++ RequestHandler.java 2001/08/14 18:58:50 1.2
@@ -20,7 +20,8 @@
import java.net.MalformedURLException;
import java.net.URL;
-import org.apache.log4j.Category;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogSource;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
@@ -39,8 +40,8 @@
protected Response _response = null;
protected boolean _requestExecuted = false;
- protected static final Category cat =
- Category.getInstance(RequestHandler.class);
+ protected static final Log log =
+ LogSource.getInstance(RequestHandler.class);
public RequestHandler(XMLReader reader, Session session,
String defaultHost,
@@ -52,7 +53,7 @@
_defaultPort = defaultPort;
_listener = listener;
_skipped = false;
- cat.debug("request handler instantiated");
+ log.debug("request handler instantiated");
}
public RequestHandler(XMLReader reader,
@@ -70,7 +71,7 @@
String qName, Attributes atts)
throws SAXException {
- cat.debug("received start element event");
+ log.debug("received start element event");
if (_listener.didRequestSucceed(_request) == false) {
// if a test in this request has already failed,
@@ -89,16 +90,16 @@
if (_skipped) {
_listener.requestSkipped(new RequestSkippedEvent(_request,null));
- cat.info("request skipped");
+ log.info("request skipped");
}
} else if (localName.equals("param")) {
- cat.info("adding parameters: params should follow");
+ log.info("adding parameters: params should follow");
ParameterHandler paramHandler = new ParameterHandler(_reader,_request);
paramHandler.delegate(uri,localName,qName,atts);
return;
} else if (localName.equals("validate")) {
- cat.info("encountered validations");
+ log.info("encountered validations");
try {
_response = _request.execute();
@@ -175,8 +176,8 @@
}
String label = atts.getValue("label");
- cat.info("creating request with label:");
- cat.info(label);
+ log.info("creating request with label:");
+ log.info(label);
boolean followRedirects = true;
String followRedirectStr = atts.getValue("followRedirects");
1.2 +1 -1
jakarta-commons-sandbox/latka/src/java/org/apache/commons/latka/xml/SessionHandler.java
Index: SessionHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/latka/src/java/org/apache/commons/latka/xml/SessionHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SessionHandler.java 2001/08/13 19:42:51 1.1
+++ SessionHandler.java 2001/08/14 18:58:50 1.2
@@ -22,7 +22,7 @@
super(reader);
_handler = handler;
_listener = listener;
- cat.debug("session handler instantiated");
+ log.debug("session handler instantiated");
}
public void startElement(String uri, String localName,
1.2 +6 -5
jakarta-commons-sandbox/latka/src/java/org/apache/commons/latka/xml/SuiteHandler.java
Index: SuiteHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/latka/src/java/org/apache/commons/latka/xml/SuiteHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SuiteHandler.java 2001/08/13 19:42:51 1.1
+++ SuiteHandler.java 2001/08/14 18:58:50 1.2
@@ -5,7 +5,8 @@
import java.io.IOException;
-import org.apache.log4j.Category;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogSource;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
@@ -18,13 +19,13 @@
protected String _defaultHost = null;
protected int _defaultPort = 80;
- protected static Category cat =
- Category.getInstance(SuiteHandler.class);
+ protected static Log log =
+ LogSource.getInstance(SuiteHandler.class);
public SuiteHandler(XMLReader reader, LatkaEventInfo listener) {
super(reader);
_listener = listener;
- cat.debug("suite handler instantiated");
+ log.debug("suite handler instantiated");
}
public void startElement(String uri, String localName,
@@ -72,7 +73,7 @@
public InputSource resolveEntity(String publicId, String systemId)
throws SAXException {
- cat.debug("Resolving URI: " + systemId);
+ log.debug("Resolving URI: " + systemId);
XMLPreprocessor process = new XMLPreprocessor();
try {
1.2 +4 -4
jakarta-commons-sandbox/latka/src/java/org/apache/commons/latka/xml/ValidationHandler.java
Index: ValidationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/latka/src/java/org/apache/commons/latka/xml/ValidationHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ValidationHandler.java 2001/08/13 19:42:51 1.1
+++ ValidationHandler.java 2001/08/14 18:58:50 1.2
@@ -39,16 +39,16 @@
}
public void validate(Validator validator) {
- cat.debug("performing custom validation");
- cat.debug("validator = " + validator);
- cat.debug("response = " + _response);
+ log.debug("performing custom validation");
+ log.debug("validator = " + validator);
+ log.debug("response = " + _response);
try {
validator.validate(_response);
} catch (ValidationException e) {
_listener.requestFailed(new
RequestFailedEvent(_response.getRequest(),_response,e));
}
- cat.debug("custom validation complete");
+ log.debug("custom validation complete");
release();
}
1.2 +7 -6
jakarta-commons-sandbox/latka/src/java/org/apache/commons/latka/xml/ValidationReflectionHandler.java
Index: ValidationReflectionHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/latka/src/java/org/apache/commons/latka/xml/ValidationReflectionHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ValidationReflectionHandler.java 2001/08/13 19:42:51 1.1
+++ ValidationReflectionHandler.java 2001/08/14 18:58:50 1.2
@@ -17,7 +17,8 @@
import java.util.Enumeration;
import java.util.Properties;
-import org.apache.log4j.Category;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogSource;
public class ValidationReflectionHandler extends LatkaHandler {
@@ -26,8 +27,8 @@
protected LatkaEventInfo _listener = null;
protected static String _latkaPrefix = "latka.validator.";
- protected static final Category cat =
- Category.getInstance(ValidationReflectionHandler.class);
+ protected static final Log log =
+ LogSource.getInstance(ValidationReflectionHandler.class);
public ValidationReflectionHandler(XMLReader reader, Response response,
LatkaEventInfo listener) {
@@ -58,11 +59,11 @@
return;
}
- cat.info("Custom validator class: " + validatorName);
- cat.debug("response = " + _response);
+ log.info("Custom validator class: " + validatorName);
+ log.debug("response = " + _response);
ValidationHandler validator = handlerForClass(validatorName);
validator.init(_reader,_response,_listener, localName);
- cat.debug("delegating tag: " + localName);
+ log.debug("delegating tag: " + localName);
validator.delegate(uri,localName,qName,atts);
}
