jstrachan 02/02/19 07:40:58
Modified: jelly build.properties.sample
jelly/src/java/org/apache/commons/jelly Jelly.java
jelly/src/java/org/apache/commons/jelly/expression/beanshell
BeanShellExpression.java
jelly/src/java/org/apache/commons/jelly/impl TagScript.java
jelly/src/java/org/apache/commons/jelly/parser
XMLParser.java
jelly/src/java/org/apache/commons/jelly/tags/core
ExprTag.java ForEachTag.java JellyTag.java
jelly/src/java/org/apache/commons/jelly/tags/xml
ParseTag.java
jelly/src/test/org/apache/commons/jelly TestCoreTags.java
TestXMLTags.java
jelly/src/test/org/apache/commons/jelly/beanshell
TestBeanShellEL.java
Log:
Changes to mirgrate to the latest CVS HEAD of commons-logging.
Revision Changes Path
1.3 +3 -0 jakarta-commons-sandbox/jelly/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/build.properties.sample,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.properties.sample 13 Feb 2002 16:00:39 -0000 1.2
+++ build.properties.sample 19 Feb 2002 15:40:58 -0000 1.3
@@ -7,6 +7,9 @@
# jakarta-commons-logging.jar
logging.jar=../../jakarta-commons/logging/dist/commons-logging.jar
+# jakarta-commons-httpclient.jar
+httpclient.jar=../../jakarta-commons/httpclient/dist/commons-httpclient.jar
+
# you can change this property to point at a local copy of the java 2 platform api
jdk-doc-url=http://java.sun.com/products/jdk/1.3/docs/api
1.3 +7 -7
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/Jelly.java
Index: Jelly.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/Jelly.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Jelly.java 13 Feb 2002 16:00:39 -0000 1.2
+++ Jelly.java 19 Feb 2002 15:40:58 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/Jelly.java,v
1.2 2002/02/13 16:00:39 jstrachan Exp $
- * $Revision: 1.2 $
- * $Date: 2002/02/13 16:00:39 $
+ * $Header:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/Jelly.java,v
1.3 2002/02/19 15:40:58 jstrachan Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/19 15:40:58 $
*
* ====================================================================
*
@@ -57,7 +57,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id: Jelly.java,v 1.2 2002/02/13 16:00:39 jstrachan Exp $
+ * $Id: Jelly.java,v 1.3 2002/02/19 15:40:58 jstrachan Exp $
*/
package org.apache.commons.jelly;
@@ -69,17 +69,17 @@
import org.apache.commons.jelly.parser.XMLParser;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/** <p><code>Jelly</code> an application which runs a Jelly script.</p>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>James Strachan</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class Jelly {
/** The Log to which logging calls will be made. */
- private static final Log log = LogSource.getInstance( Jelly.class );
+ private static final Log log = LogFactory.getLog( Jelly.class );
public static void main(String[] args) throws Exception {
1.3 +7 -7
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/expression/beanshell/BeanShellExpression.java
Index: BeanShellExpression.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/expression/beanshell/BeanShellExpression.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BeanShellExpression.java 13 Feb 2002 16:00:39 -0000 1.2
+++ BeanShellExpression.java 19 Feb 2002 15:40:58 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/expression/beanshell/BeanShellExpression.java,v
1.2 2002/02/13 16:00:39 jstrachan Exp $
- * $Revision: 1.2 $
- * $Date: 2002/02/13 16:00:39 $
+ * $Header:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/expression/beanshell/BeanShellExpression.java,v
1.3 2002/02/19 15:40:58 jstrachan Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/19 15:40:58 $
*
* ====================================================================
*
@@ -57,7 +57,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id: BeanShellExpression.java,v 1.2 2002/02/13 16:00:39 jstrachan Exp $
+ * $Id: BeanShellExpression.java,v 1.3 2002/02/19 15:40:58 jstrachan Exp $
*/
package org.apache.commons.jelly.expression.beanshell;
@@ -65,18 +65,18 @@
import org.apache.commons.jelly.expression.ExpressionSupport;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/** Represents a <a href="http://www.beanshell.org";>beanshell</a> expression
*
* @author <a href="mailto:[EMAIL PROTECTED]";>James Strachan</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class BeanShellExpression extends ExpressionSupport {
/** The Log to which logging calls will be made. */
- private static final Log log = LogSource.getInstance( BeanShellExpression.class
);
+ private static final Log log = LogFactory.getLog( BeanShellExpression.class );
/** The expression */
private String text;
1.5 +7 -7
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/TagScript.java
Index: TagScript.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/TagScript.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TagScript.java 15 Feb 2002 18:25:06 -0000 1.4
+++ TagScript.java 19 Feb 2002 15:40:58 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/TagScript.java,v
1.4 2002/02/15 18:25:06 jstrachan Exp $
- * $Revision: 1.4 $
- * $Date: 2002/02/15 18:25:06 $
+ * $Header:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/TagScript.java,v
1.5 2002/02/19 15:40:58 jstrachan Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/02/19 15:40:58 $
*
* ====================================================================
*
@@ -57,7 +57,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id: TagScript.java,v 1.4 2002/02/15 18:25:06 jstrachan Exp $
+ * $Id: TagScript.java,v 1.5 2002/02/19 15:40:58 jstrachan Exp $
*/
package org.apache.commons.jelly.impl;
@@ -81,17 +81,17 @@
import org.apache.commons.jelly.expression.Expression;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/** <p><code>TagScript</code> evaluates a custom tag.</p>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>James Strachan</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class TagScript implements Script {
/** The Log to which logging calls will be made. */
- private static final Log log = LogSource.getInstance( TagScript.class );
+ private static final Log log = LogFactory.getLog( TagScript.class );
/** the tag to be evaluated */
private Tag tag;
1.6 +7 -7
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/parser/XMLParser.java
Index: XMLParser.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/parser/XMLParser.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLParser.java 13 Feb 2002 17:03:09 -0000 1.5
+++ XMLParser.java 19 Feb 2002 15:40:58 -0000 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/parser/XMLParser.java,v
1.5 2002/02/13 17:03:09 jstrachan Exp $
- * $Revision: 1.5 $
- * $Date: 2002/02/13 17:03:09 $
+ * $Header:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/parser/XMLParser.java,v
1.6 2002/02/19 15:40:58 jstrachan Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/02/19 15:40:58 $
*
* ====================================================================
*
@@ -57,7 +57,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id: XMLParser.java,v 1.5 2002/02/13 17:03:09 jstrachan Exp $
+ * $Id: XMLParser.java,v 1.6 2002/02/19 15:40:58 jstrachan Exp $
*/
package org.apache.commons.jelly.parser;
@@ -97,7 +97,7 @@
import org.apache.commons.jelly.tags.xml.XMLTagLibrary;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
@@ -115,7 +115,7 @@
* The SAXParser and XMLReader portions of this code come from Digester.</p>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>James Strachan</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class XMLParser extends DefaultHandler {
@@ -212,7 +212,7 @@
/**
* The Log to which most logging calls will be made.
*/
- private Log log =
LogSource.getInstance("org.apache.commons.digester.XMLParser");
+ private Log log = LogFactory.getLog("org.apache.commons.digester.XMLParser");
/**
1.3 +7 -7
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/ExprTag.java
Index: ExprTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/ExprTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ExprTag.java 13 Feb 2002 16:00:39 -0000 1.2
+++ ExprTag.java 19 Feb 2002 15:40:58 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/ExprTag.java,v
1.2 2002/02/13 16:00:39 jstrachan Exp $
- * $Revision: 1.2 $
- * $Date: 2002/02/13 16:00:39 $
+ * $Header:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/ExprTag.java,v
1.3 2002/02/19 15:40:58 jstrachan Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/19 15:40:58 $
*
* ====================================================================
*
@@ -57,7 +57,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id: ExprTag.java,v 1.2 2002/02/13 16:00:39 jstrachan Exp $
+ * $Id: ExprTag.java,v 1.3 2002/02/19 15:40:58 jstrachan Exp $
*/
package org.apache.commons.jelly.tags.core;
@@ -70,17 +70,17 @@
import org.apache.commons.jelly.expression.Expression;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/** A tag which evaluates an expression
*
* @author <a href="mailto:[EMAIL PROTECTED]";>James Strachan</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class ExprTag extends TagSupport {
/** The Log to which logging calls will be made. */
- private static final Log log = LogSource.getInstance( ExprTag.class );
+ private static final Log log = LogFactory.getLog( ExprTag.class );
/** The expression to evaluate. */
private Expression value;
1.3 +7 -7
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/ForEachTag.java
Index: ForEachTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/ForEachTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ForEachTag.java 13 Feb 2002 16:00:39 -0000 1.2
+++ ForEachTag.java 19 Feb 2002 15:40:58 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/ForEachTag.java,v
1.2 2002/02/13 16:00:39 jstrachan Exp $
- * $Revision: 1.2 $
- * $Date: 2002/02/13 16:00:39 $
+ * $Header:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/ForEachTag.java,v
1.3 2002/02/19 15:40:58 jstrachan Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/19 15:40:58 $
*
* ====================================================================
*
@@ -57,7 +57,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id: ForEachTag.java,v 1.2 2002/02/13 16:00:39 jstrachan Exp $
+ * $Id: ForEachTag.java,v 1.3 2002/02/19 15:40:58 jstrachan Exp $
*/
package org.apache.commons.jelly.tags.core;
@@ -72,18 +72,18 @@
import org.apache.commons.jelly.expression.Expression;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/** A tag which performs an iteration over the results of an XPath expression
*
* @author <a href="mailto:[EMAIL PROTECTED]";>James Strachan</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class ForEachTag extends TagSupport {
/** The Log to which logging calls will be made. */
- private static final Log log = LogSource.getInstance( ForEachTag.class );
+ private static final Log log = LogFactory.getLog( ForEachTag.class );
/** Holds the variable name to export for the item being iterated over. */
private Expression items;
1.2 +5 -5
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/JellyTag.java
Index: JellyTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/JellyTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JellyTag.java 12 Feb 2002 21:34:34 -0000 1.1
+++ JellyTag.java 19 Feb 2002 15:40:58 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/JellyTag.java,v
1.1 2002/02/12 21:34:34 jstrachan Exp $
- * $Revision: 1.1 $
- * $Date: 2002/02/12 21:34:34 $
+ * $Header:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/JellyTag.java,v
1.2 2002/02/19 15:40:58 jstrachan Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/02/19 15:40:58 $
*
* ====================================================================
*
@@ -57,7 +57,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id: JellyTag.java,v 1.1 2002/02/12 21:34:34 jstrachan Exp $
+ * $Id: JellyTag.java,v 1.2 2002/02/19 15:40:58 jstrachan Exp $
*/
package org.apache.commons.jelly.tags.core;
@@ -73,18 +73,18 @@
import org.apache.commons.jelly.impl.TextScript;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/** The root Jelly tag which should be evaluated first
*
* @author <a href="mailto:[EMAIL PROTECTED]";>James Strachan</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class JellyTag extends TagSupport {
/** The Log to which logging calls will be made. */
- private static final Log log = LogSource.getInstance( JellyTag.class );
+ private static final Log log = LogFactory.getLog( JellyTag.class );
/** whether whitespace should be trimmed or not. */
private boolean trim = false;
1.3 +7 -7
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/ParseTag.java
Index: ParseTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/ParseTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ParseTag.java 12 Feb 2002 21:34:34 -0000 1.2
+++ ParseTag.java 19 Feb 2002 15:40:58 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/ParseTag.java,v
1.2 2002/02/12 21:34:34 jstrachan Exp $
- * $Revision: 1.2 $
- * $Date: 2002/02/12 21:34:34 $
+ * $Header:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/ParseTag.java,v
1.3 2002/02/19 15:40:58 jstrachan Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/19 15:40:58 $
*
* ====================================================================
*
@@ -57,7 +57,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id: ParseTag.java,v 1.2 2002/02/12 21:34:34 jstrachan Exp $
+ * $Id: ParseTag.java,v 1.3 2002/02/19 15:40:58 jstrachan Exp $
*/
package org.apache.commons.jelly.tags.xml;
@@ -75,7 +75,7 @@
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
import org.dom4j.Document;
import org.dom4j.DocumentException;
@@ -88,12 +88,12 @@
* source property which can be a Reader, InputStream, URL or String URI.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>James Strachan</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class ParseTag extends TagSupport {
/** The Log to which logging calls will be made. */
- private static final Log log = LogSource.getInstance( ParseTag.class );
+ private static final Log log = LogFactory.getLog( ParseTag.class );
/** The variable that will be generated for the document */
private String var;
1.2 +7 -7
jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/TestCoreTags.java
Index: TestCoreTags.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/TestCoreTags.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestCoreTags.java 13 Feb 2002 16:00:39 -0000 1.1
+++ TestCoreTags.java 19 Feb 2002 15:40:58 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/TestCoreTags.java,v
1.1 2002/02/13 16:00:39 jstrachan Exp $
- * $Revision: 1.1 $
- * $Date: 2002/02/13 16:00:39 $
+ * $Header:
/home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/TestCoreTags.java,v
1.2 2002/02/19 15:40:58 jstrachan Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/02/19 15:40:58 $
*
* ====================================================================
*
@@ -57,7 +57,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id: TestCoreTags.java,v 1.1 2002/02/13 16:00:39 jstrachan Exp $
+ * $Id: TestCoreTags.java,v 1.2 2002/02/19 15:40:58 jstrachan Exp $
*/
package org.apache.commons.jelly;
@@ -76,18 +76,18 @@
import org.apache.commons.jelly.parser.XMLParser;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/** Tests the core tags
*
* @author <a href="mailto:[EMAIL PROTECTED]";>James Strachan</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class TestCoreTags extends TestCase {
/** The Log to which logging calls will be made. */
- private static final Log log = LogSource.getInstance( TestXMLTags.class );
+ private static final Log log = LogFactory.getLog( TestXMLTags.class );
public static void main( String[] args ) {
TestRunner.run( suite() );
1.3 +7 -7
jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/TestXMLTags.java
Index: TestXMLTags.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/TestXMLTags.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestXMLTags.java 12 Feb 2002 21:34:35 -0000 1.2
+++ TestXMLTags.java 19 Feb 2002 15:40:58 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/TestXMLTags.java,v
1.2 2002/02/12 21:34:35 jstrachan Exp $
- * $Revision: 1.2 $
- * $Date: 2002/02/12 21:34:35 $
+ * $Header:
/home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/TestXMLTags.java,v
1.3 2002/02/19 15:40:58 jstrachan Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/19 15:40:58 $
*
* ====================================================================
*
@@ -57,7 +57,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id: TestXMLTags.java,v 1.2 2002/02/12 21:34:35 jstrachan Exp $
+ * $Id: TestXMLTags.java,v 1.3 2002/02/19 15:40:58 jstrachan Exp $
*/
package org.apache.commons.jelly;
@@ -76,18 +76,18 @@
import org.apache.commons.jelly.parser.XMLParser;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/** Tests the parser, the engine and the XML tags
*
* @author <a href="mailto:[EMAIL PROTECTED]";>James Strachan</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class TestXMLTags extends TestCase {
/** The Log to which logging calls will be made. */
- private static final Log log = LogSource.getInstance( TestXMLTags.class );
+ private static final Log log = LogFactory.getLog( TestXMLTags.class );
public static void main( String[] args ) {
TestRunner.run( suite() );
1.4 +7 -7
jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/beanshell/TestBeanShellEL.java
Index: TestBeanShellEL.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/beanshell/TestBeanShellEL.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestBeanShellEL.java 15 Feb 2002 18:25:06 -0000 1.3
+++ TestBeanShellEL.java 19 Feb 2002 15:40:58 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/beanshell/TestBeanShellEL.java,v
1.3 2002/02/15 18:25:06 jstrachan Exp $
- * $Revision: 1.3 $
- * $Date: 2002/02/15 18:25:06 $
+ * $Header:
/home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/beanshell/TestBeanShellEL.java,v
1.4 2002/02/19 15:40:58 jstrachan Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/02/19 15:40:58 $
*
* ====================================================================
*
@@ -57,7 +57,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id: TestBeanShellEL.java,v 1.3 2002/02/15 18:25:06 jstrachan Exp $
+ * $Id: TestBeanShellEL.java,v 1.4 2002/02/19 15:40:58 jstrachan Exp $
*/
package org.apache.commons.jelly.beanshell;
@@ -72,18 +72,18 @@
import org.apache.commons.jelly.expression.beanshell.BeanShellExpressionFactory;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/** Tests the BeanShell EL
*
* @author <a href="mailto:[EMAIL PROTECTED]";>James Strachan</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class TestBeanShellEL extends TestCase {
/** The Log to which logging calls will be made. */
- private static final Log log = LogSource.getInstance( TestBeanShellEL.class );
+ private static final Log log = LogFactory.getLog( TestBeanShellEL.class );
/** Jelly context */
protected Context context;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
