You are viewing a plain text version of this content. The canonical link for it is here.
Posted to taglibs-dev@jakarta.apache.org by js...@apache.org on 2001/05/07 14:13:48 UTC
cvs commit: jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/util StringHelper.java LogHelper.java
jstrachan 01/05/07 05:13:47
Modified: xtags build.xml
xtags/doc/web xtags.html
xtags/examples/conf web.xml
xtags/src/org/apache/taglibs/xtags/cache Cache.java
CacheHelper.java CacheManager.java
DependencyTracker.java TimeoutTracker.java
xtags/src/org/apache/taglibs/xtags/tags
AbstractXPathTag.java ApplyTemplatesTag.java
CopyOfTag.java ElementTag.java ForEachTag.java
JspAction.java JspCopyOfAction.java
JspValueOfAction.java ParseTag.java
ReflectionAction.java StylesheetTag.java
TagHelper.java TemplateTag.java ValueOfTag.java
VariableTag.java WhenTag.java
xtags/src/org/apache/taglibs/xtags/util StringHelper.java
Added: xtags/lib log4j-core.jar
xtags/src/org/apache/taglibs/xtags/servlet Log4jServlet.java
Removed: xtags/lib log4j-full.jar
xtags/src/org/apache/taglibs/xtags/util LogHelper.java
Log:
Ported xtags over to latest Apache Log4j package from old org.logj4 distribution
Revision Changes Path
1.2 +1 -1 jakarta-taglibs/xtags/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/xtags/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 2001/05/05 18:06:18 1.1
+++ build.xml 2001/05/07 12:12:13 1.2
@@ -7,7 +7,7 @@
<project name="xtags" default="mymain">
<property environment="env"/>
- <property name="classpath" value="${env.SERVLET_JAR}:lib/dom4j-all.jar:lib/log4j-full.jar" />
+ <property name="classpath" value="${env.SERVLET_JAR}:lib/dom4j-all.jar:lib/log4j-core.jar" />
<target name="mymain" depends="gen-docs,main,compile-examples.pre"/>
1.4 +1 -1 jakarta-taglibs/xtags/doc/web/xtags.html
Index: xtags.html
===================================================================
RCS file: /home/cvs/jakarta-taglibs/xtags/doc/web/xtags.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xtags.html 2001/05/07 11:37:37 1.3
+++ xtags.html 2001/05/07 12:12:19 1.4
@@ -268,7 +268,7 @@
<td width="20%"><span class="scriptvar">Script Variable</span></td><td width="80%">No</td>
</tr>
<tr>
-<td width="20%"><span class="restrictions">Restrictions</span></td><td width="80%">Should be used within an XML context such as an <xtag:documents> or s<xtags:forEachs> tag</td>
+<td width="20%"><span class="restrictions">Restrictions</span></td><td width="80%"></td>
</tr>
<tr>
<td width="20%"><span class="attributes">Attributes</span></td><td width="80%"> </td>
1.3 +11 -0 jakarta-taglibs/xtags/examples/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/xtags/examples/conf/web.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web.xml 2001/05/07 11:12:07 1.2
+++ web.xml 2001/05/07 12:12:23 1.3
@@ -11,9 +11,20 @@
<load-on-startup>1</load-on-startup>
</servlet>
+ <servlet>
+ <servlet-name>Log4jServlet</servlet-name>
+ <servlet-class>org.apache.taglibs.xtags.servlet.Log4jServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
<servlet-mapping>
<servlet-name>XPathServlet</servlet-name>
<url-pattern>/xpath.xml</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Logj4Servlet</servlet-name>
+ <url-pattern>/admin/log4j</url-pattern>
</servlet-mapping>
<welcome-file-list>
1.1 jakarta-taglibs/xtags/lib/log4j-core.jar
<<Binary file>>
1.2 +3 -3 jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/cache/Cache.java
Index: Cache.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/cache/Cache.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Cache.java 2001/05/05 18:06:29 1.1
+++ Cache.java 2001/05/07 12:12:36 1.2
@@ -59,7 +59,7 @@
package org.apache.taglibs.xtags.cache;
import org.apache.taglibs.xtags.util.Interrogable;
-import org.apache.taglibs.xtags.util.LogHelper;
+
import org.apache.taglibs.xtags.util.RefHashMap;
import java.net.URL;
@@ -68,7 +68,7 @@
import org.dom4j.Element;
import org.dom4j.DocumentFactory;
-import org.log4j.Category;
+import org.apache.log4j.Category;
/** Represents the behaviour of the cache
*
@@ -81,7 +81,7 @@
protected static final DocumentFactory factory = DocumentFactory.getInstance();
/** Logger */
- private static final Category log = LogHelper.get( Cache.class );
+ private static final Category log = Category.getInstance( Cache.class );
private Map map = new RefHashMap();
private TimeoutTracker timeoutTracker;
1.2 +3 -3 jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/cache/CacheHelper.java
Index: CacheHelper.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/cache/CacheHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CacheHelper.java 2001/05/05 18:06:29 1.1
+++ CacheHelper.java 2001/05/07 12:12:38 1.2
@@ -58,7 +58,7 @@
package org.apache.taglibs.xtags.cache;
-import org.apache.taglibs.xtags.util.LogHelper;
+
import org.apache.taglibs.xtags.util.NestedRuntimeException;
import java.io.InputStream;
@@ -67,7 +67,7 @@
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
-import org.log4j.Category;
+import org.apache.log4j.Category;
/** A helper class for using Cache objects, locating them from Servlets and JSP tags etc.
*
@@ -77,7 +77,7 @@
public class CacheHelper {
private static final String KEY_CACHE_MANAGER = CacheManager.class.getName();
- private static final Category log = LogHelper.get( CacheHelper.class );
+ private static final Category log = Category.getInstance( CacheHelper.class );
//-------------------------------------------------------------------------
public static CacheManager getCacheManager( ServletContext context ) {
1.2 +3 -3 jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/cache/CacheManager.java
Index: CacheManager.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/cache/CacheManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CacheManager.java 2001/05/05 18:06:29 1.1
+++ CacheManager.java 2001/05/07 12:12:39 1.2
@@ -59,8 +59,8 @@
package org.apache.taglibs.xtags.cache;
import org.apache.taglibs.xtags.util.Interrogable;
-import org.apache.taglibs.xtags.util.LogHelper;
+
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
@@ -69,7 +69,7 @@
import org.dom4j.Element;
import org.dom4j.DocumentFactory;
-import org.log4j.Category;
+import org.apache.log4j.Category;
/** Manager of cache instances
*
@@ -82,7 +82,7 @@
protected static final DocumentFactory factory = DocumentFactory.getInstance();
/** Logger */
- private static final Category log = LogHelper.get( CacheManager.class );
+ private static final Category log = Category.getInstance( CacheManager.class );
private Map map;
1.2 +3 -3 jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/cache/DependencyTracker.java
Index: DependencyTracker.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/cache/DependencyTracker.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DependencyTracker.java 2001/05/05 18:06:29 1.1
+++ DependencyTracker.java 2001/05/07 12:12:40 1.2
@@ -59,7 +59,7 @@
package org.apache.taglibs.xtags.cache;
import org.apache.taglibs.xtags.util.Interrogable;
-import org.apache.taglibs.xtags.util.LogHelper;
+
import org.apache.taglibs.xtags.util.RefHashMap;
import java.net.URL;
@@ -68,7 +68,7 @@
import org.dom4j.Element;
import org.dom4j.DocumentFactory;
-import org.log4j.Category;
+import org.apache.log4j.Category;
/** Maintains dependency information
*
@@ -78,7 +78,7 @@
public class DependencyTracker {
/** Logger */
- private static final Category log = LogHelper.get( DependencyTracker.class );
+ private static final Category log = Category.getInstance( DependencyTracker.class );
private Cache cache;
private SortedMap dependsMap = new TreeMap();
1.2 +3 -3 jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/cache/TimeoutTracker.java
Index: TimeoutTracker.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/cache/TimeoutTracker.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TimeoutTracker.java 2001/05/05 18:06:29 1.1
+++ TimeoutTracker.java 2001/05/07 12:12:42 1.2
@@ -59,7 +59,7 @@
package org.apache.taglibs.xtags.cache;
import org.apache.taglibs.xtags.util.Interrogable;
-import org.apache.taglibs.xtags.util.LogHelper;
+
import org.apache.taglibs.xtags.util.RefHashMap;
import java.net.URL;
@@ -68,7 +68,7 @@
import org.dom4j.Element;
import org.dom4j.DocumentFactory;
-import org.log4j.Category;
+import org.apache.log4j.Category;
/** Maintains timeout information
*
@@ -78,7 +78,7 @@
public class TimeoutTracker {
/** Logger */
- private static final Category log = LogHelper.get( TimeoutTracker.class );
+ private static final Category log = Category.getInstance( TimeoutTracker.class );
private Cache cache;
private SortedMap expiresMap = new TreeMap();
1.1 jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/servlet/Log4jServlet.java
Index: Log4jServlet.java
===================================================================
/*
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
*/
package org.apache.taglibs.xtags.servlet;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.log4j.BasicConfigurator;
/** A Servlet for initialising log4j. I'm sure there must be a better way...
*
* @author James Strachan
*/
public class Log4jServlet extends HttpServlet {
public Log4jServlet() {
}
public void init() throws ServletException {
BasicConfigurator.configure();
}
}
1.3 +3 -3 jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/tags/AbstractXPathTag.java
Index: AbstractXPathTag.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/tags/AbstractXPathTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractXPathTag.java 2001/05/07 11:38:00 1.2
+++ AbstractXPathTag.java 2001/05/07 12:12:56 1.3
@@ -78,12 +78,12 @@
import org.dom4j.XPath;
import org.dom4j.rule.Stylesheet;
-import org.log4j.Category;
+import org.apache.log4j.Category;
import org.apache.taglibs.xtags.util.JspVariableContext;
-import org.apache.taglibs.xtags.util.LogHelper;
+
/** A tag which performs an XPath expression on the current context Node
*
* @author James Strachan
@@ -107,7 +107,7 @@
/** Logger */
- private static final Category log = LogHelper.get( AbstractXPathTag.class );
+ private static final Category log = Category.getInstance( AbstractXPathTag.class );
public AbstractXPathTag() {
1.2 +3 -3 jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/tags/ApplyTemplatesTag.java
Index: ApplyTemplatesTag.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/tags/ApplyTemplatesTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApplyTemplatesTag.java 2001/05/05 18:06:31 1.1
+++ ApplyTemplatesTag.java 2001/05/07 12:12:57 1.2
@@ -58,8 +58,8 @@
package org.apache.taglibs.xtags.tags;
-import org.apache.taglibs.xtags.util.LogHelper;
+
import java.util.Iterator;
import java.util.List;
@@ -74,7 +74,7 @@
import org.dom4j.DocumentHelper;
import org.dom4j.rule.Stylesheet;
-import org.log4j.Category;
+import org.apache.log4j.Category;
/** The body of this tag defines a stylesheet which is implemented via calling
* a JSP include.
@@ -84,7 +84,7 @@
public class ApplyTemplatesTag extends AbstractXPathTag {
/** Logger */
- private static final Category log = LogHelper.get( ApplyTemplatesTag.class );
+ private static final Category log = Category.getInstance( ApplyTemplatesTag.class );
/** Holds value of property mode. */
private String mode;
1.2 +3 -3 jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/tags/CopyOfTag.java
Index: CopyOfTag.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/tags/CopyOfTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CopyOfTag.java 2001/05/05 18:06:31 1.1
+++ CopyOfTag.java 2001/05/07 12:12:58 1.2
@@ -58,8 +58,8 @@
package org.apache.taglibs.xtags.tags;
-import org.apache.taglibs.xtags.util.LogHelper;
+
import java.io.IOException;
import java.util.Iterator;
import java.util.List;
@@ -76,7 +76,7 @@
import org.dom4j.DocumentHelper;
import org.dom4j.io.XMLWriter;
-import org.log4j.Category;
+import org.apache.log4j.Category;
/** A tag which performs a copy-of operation like the XSLT tag
*
@@ -85,7 +85,7 @@
public class CopyOfTag extends AbstractXPathTag {
/** Logger */
- private static final Category log = LogHelper.get( CopyOfTag.class );
+ private static final Category log = Category.getInstance( CopyOfTag.class );
/** Holds value of property xpath. */
private XPath xpath;
1.2 +4 -4 jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/tags/ElementTag.java
Index: ElementTag.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/tags/ElementTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ElementTag.java 2001/05/05 18:06:31 1.1
+++ ElementTag.java 2001/05/07 12:12:59 1.2
@@ -58,8 +58,8 @@
package org.apache.taglibs.xtags.tags;
-import org.apache.taglibs.xtags.util.LogHelper;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
@@ -73,14 +73,14 @@
import javax.servlet.jsp.tagext.Tag;
import javax.servlet.jsp.tagext.BodyTagSupport;
-import org.log4j.Category;
+import org.apache.log4j.Category;
/** A tag to produce an XML element which can contain other attributes
* or elements like the <code><xsl:element></code> tag.
*
* @author James Strachan
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class ElementTag extends BodyTagSupport {
@@ -88,7 +88,7 @@
protected static final boolean TRIM_VALUES = true;
/** Logger */
- private static final Category log = LogHelper.get( ElementTag.class );
+ private static final Category log = Category.getInstance( ElementTag.class );
/** Holds value of property name. */
private String name;
1.3 +3 -3 jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/tags/ForEachTag.java
Index: ForEachTag.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/tags/ForEachTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ForEachTag.java 2001/05/07 11:38:03 1.2
+++ ForEachTag.java 2001/05/07 12:13:01 1.3
@@ -74,11 +74,11 @@
import org.dom4j.Node;
import org.dom4j.XPath;
-import org.log4j.Category;
+import org.apache.log4j.Category;
import org.apache.taglibs.xtags.util.JspVariableContext;
-import org.apache.taglibs.xtags.util.LogHelper;
+
/** A tag which performs an iteration over the results of an XPath expression on an XML document
*
* @author James Strachan
@@ -86,7 +86,7 @@
public class ForEachTag extends BodyTagSupport implements ContextNodeTag {
/** Logger */
- private static final Category log = LogHelper.get( ForEachTag.class );
+ private static final Category log = Category.getInstance( ForEachTag.class );
/** Holds the XPath selection instance. */
1.2 +3 -3 jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/tags/JspAction.java
Index: JspAction.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/tags/JspAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JspAction.java 2001/05/05 18:06:31 1.1
+++ JspAction.java 2001/05/07 12:13:02 1.2
@@ -58,8 +58,8 @@
package org.apache.taglibs.xtags.tags;
-import org.apache.taglibs.xtags.util.LogHelper;
+
import java.io.IOException;
import java.util.Iterator;
import java.util.List;
@@ -79,7 +79,7 @@
import org.dom4j.rule.RuleManager;
import org.dom4j.rule.pattern.DefaultPattern;
-import org.log4j.Category;
+import org.apache.log4j.Category;
/** An Action which includes a piece of JSP
*
@@ -88,7 +88,7 @@
public class JspAction implements Action {
/** Logger */
- private static final Category log = LogHelper.get( JspAction.class );
+ private static final Category log = Category.getInstance( JspAction.class );
/** Holds value of property jsp. */
private String jsp;
1.2 +3 -3 jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/tags/JspCopyOfAction.java
Index: JspCopyOfAction.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/tags/JspCopyOfAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JspCopyOfAction.java 2001/05/05 18:06:31 1.1
+++ JspCopyOfAction.java 2001/05/07 12:13:03 1.2
@@ -58,8 +58,8 @@
package org.apache.taglibs.xtags.tags;
-import org.apache.taglibs.xtags.util.LogHelper;
+
import java.io.IOException;
import javax.servlet.jsp.PageContext;
@@ -68,7 +68,7 @@
import org.dom4j.io.XMLWriter;
import org.dom4j.rule.Action;
-import org.log4j.Category;
+import org.apache.log4j.Category;
/** Outputs the given Node to the current JSP output
*
@@ -77,7 +77,7 @@
public class JspCopyOfAction implements Action {
/** Logger */
- private static final Category log = LogHelper.get( JspCopyOfAction.class );
+ private static final Category log = Category.getInstance( JspCopyOfAction.class );
/** Holds value of property pageContext. */
private PageContext pageContext;
1.2 +3 -3 jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/tags/JspValueOfAction.java
Index: JspValueOfAction.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/tags/JspValueOfAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JspValueOfAction.java 2001/05/05 18:06:31 1.1
+++ JspValueOfAction.java 2001/05/07 12:13:05 1.2
@@ -58,8 +58,8 @@
package org.apache.taglibs.xtags.tags;
-import org.apache.taglibs.xtags.util.LogHelper;
+
import java.io.IOException;
import javax.servlet.jsp.PageContext;
@@ -67,7 +67,7 @@
import org.dom4j.Node;
import org.dom4j.rule.Action;
-import org.log4j.Category;
+import org.apache.log4j.Category;
/** Outputs the string-value of the given Node (as defined by the XPath
* specification) to the current JSP output
@@ -77,7 +77,7 @@
public class JspValueOfAction implements Action {
/** Logger */
- private static final Category log = LogHelper.get( JspValueOfAction.class );
+ private static final Category log = Category.getInstance( JspValueOfAction.class );
/** Holds value of property pageContext. */
private PageContext pageContext;
1.4 +3 -3 jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/tags/ParseTag.java
Index: ParseTag.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/tags/ParseTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ParseTag.java 2001/05/07 11:38:06 1.3
+++ ParseTag.java 2001/05/07 12:13:06 1.4
@@ -58,8 +58,8 @@
package org.apache.taglibs.xtags.tags;
-import org.apache.taglibs.xtags.util.LogHelper;
+
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
@@ -78,7 +78,7 @@
import org.dom4j.Document;
import org.dom4j.io.SAXReader;
-import org.log4j.Category;
+import org.apache.log4j.Category;
/** A tag which parses its body as an XML Document and defines a variable
*
@@ -87,7 +87,7 @@
public class ParseTag extends BodyTagSupport {
/** Logger */
- private static final Category log = LogHelper.get( ParseTag.class );
+ private static final Category log = Category.getInstance( ParseTag.class );
/** Holds value of property id. */
private String id;
1.2 +3 -3 jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/tags/ReflectionAction.java
Index: ReflectionAction.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/tags/ReflectionAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ReflectionAction.java 2001/05/05 18:06:32 1.1
+++ ReflectionAction.java 2001/05/07 12:13:08 1.2
@@ -58,14 +58,14 @@
package org.apache.taglibs.xtags.tags;
-import org.apache.taglibs.xtags.util.LogHelper;
+
import java.lang.reflect.Method;
import org.dom4j.Node;
import org.dom4j.rule.Action;
-import org.log4j.Category;
+import org.apache.log4j.Category;
/** Calls a void method on an instance when the action is fired.
*
@@ -74,7 +74,7 @@
public class ReflectionAction implements Action {
/** Logger */
- private static final Category log = LogHelper.get( ReflectionAction.class );
+ private static final Category log = Category.getInstance( ReflectionAction.class );
protected static final Object[] NULL_ARGS = {};
1.2 +3 -3 jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/tags/StylesheetTag.java
Index: StylesheetTag.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/tags/StylesheetTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StylesheetTag.java 2001/05/05 18:06:32 1.1
+++ StylesheetTag.java 2001/05/07 12:13:09 1.2
@@ -58,8 +58,8 @@
package org.apache.taglibs.xtags.tags;
-import org.apache.taglibs.xtags.util.LogHelper;
+
import java.io.IOException;
import java.util.Iterator;
import java.util.List;
@@ -77,7 +77,7 @@
import org.dom4j.rule.Rule;
import org.dom4j.rule.Stylesheet;
-import org.log4j.Category;
+import org.apache.log4j.Category;
/** The body of this tag defines a stylesheet which is implemented via calling
* a JSP include.
@@ -90,7 +90,7 @@
private Stylesheet stylesheet = new Stylesheet();
/** Logger */
- private static final Category log = LogHelper.get( StylesheetTag.class );
+ private static final Category log = Category.getInstance( StylesheetTag.class );
/** Holds value of property mode. */
private String mode;
1.2 +3 -3 jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/tags/TagHelper.java
Index: TagHelper.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/tags/TagHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TagHelper.java 2001/05/05 18:06:32 1.1
+++ TagHelper.java 2001/05/07 12:13:10 1.2
@@ -58,8 +58,8 @@
package org.apache.taglibs.xtags.tags;
-import org.apache.taglibs.xtags.util.LogHelper;
+
import java.io.IOException;
import java.util.Iterator;
import java.util.List;
@@ -70,7 +70,7 @@
import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
-import org.log4j.Category;
+import org.apache.log4j.Category;
/** A number of helper methods
*
@@ -86,7 +86,7 @@
public static final String REQUEST_KEY_XML_WRITER = "org.apache.taglibs.xtags.XMLWriter";
/** Logger */
- private static final Category log = LogHelper.get( TagHelper.class );
+ private static final Category log = Category.getInstance( TagHelper.class );
public static XMLWriter getXMLWriter( PageContext pageContext ) {
XMLWriter xmlWriter = (XMLWriter) pageContext.getAttribute(
1.2 +3 -3 jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/tags/TemplateTag.java
Index: TemplateTag.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/tags/TemplateTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TemplateTag.java 2001/05/05 18:06:32 1.1
+++ TemplateTag.java 2001/05/07 12:13:11 1.2
@@ -58,8 +58,8 @@
package org.apache.taglibs.xtags.tags;
-import org.apache.taglibs.xtags.util.LogHelper;
+
import java.io.IOException;
import java.util.Iterator;
import java.util.List;
@@ -78,7 +78,7 @@
import org.dom4j.rule.Rule;
import org.dom4j.rule.RuleManager;
-import org.log4j.Category;
+import org.apache.log4j.Category;
/** The body of this tag defines a stylesheet which is implemented via calling
* a JSP include.
@@ -88,7 +88,7 @@
public class TemplateTag extends TagSupport {
/** Logger */
- private static final Category log = LogHelper.get( TemplateTag.class );
+ private static final Category log = Category.getInstance( TemplateTag.class );
/** Holds value of property name. */
private String name;
1.2 +3 -3 jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/tags/ValueOfTag.java
Index: ValueOfTag.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/tags/ValueOfTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ValueOfTag.java 2001/05/05 18:06:32 1.1
+++ ValueOfTag.java 2001/05/07 12:13:13 1.2
@@ -58,8 +58,8 @@
package org.apache.taglibs.xtags.tags;
-import org.apache.taglibs.xtags.util.LogHelper;
+
import java.io.IOException;
import java.util.Iterator;
import java.util.List;
@@ -74,7 +74,7 @@
import org.dom4j.Node;
import org.dom4j.XPath;
-import org.log4j.Category;
+import org.apache.log4j.Category;
/** A tag which performs an XPath expression on the current context Node
*
@@ -86,7 +86,7 @@
private XPath xpath;
/** Logger */
- private static final Category log = LogHelper.get( ValueOfTag.class );
+ private static final Category log = Category.getInstance( ValueOfTag.class );
//-------------------------------------------------------------------------
1.3 +3 -3 jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/tags/VariableTag.java
Index: VariableTag.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/tags/VariableTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VariableTag.java 2001/05/07 11:38:09 1.2
+++ VariableTag.java 2001/05/07 12:13:14 1.3
@@ -58,8 +58,8 @@
package org.apache.taglibs.xtags.tags;
-import org.apache.taglibs.xtags.util.LogHelper;
+
import java.util.Iterator;
import java.util.List;
@@ -72,7 +72,7 @@
import org.dom4j.Node;
import org.dom4j.XPath;
-import org.log4j.Category;
+import org.apache.log4j.Category;
/** A tag which defines a variable from an XPath expression
*
@@ -81,7 +81,7 @@
public class VariableTag extends AbstractXPathTag {
/** Logger */
- private static final Category log = LogHelper.get( VariableTag.class );
+ private static final Category log = Category.getInstance( VariableTag.class );
/** Holds the XPath selection instance. */
private XPath xpath;
1.2 +4 -4 jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/tags/WhenTag.java
Index: WhenTag.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/tags/WhenTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WhenTag.java 2001/05/05 18:06:32 1.1
+++ WhenTag.java 2001/05/07 12:13:15 1.2
@@ -58,8 +58,8 @@
package org.apache.taglibs.xtags.tags;
-import org.apache.taglibs.xtags.util.LogHelper;
+
import java.util.List;
import javax.servlet.jsp.JspException;
@@ -68,17 +68,17 @@
import org.dom4j.NodeFilter;
import org.dom4j.DocumentHelper;
-import org.log4j.Category;
+import org.apache.log4j.Category;
/** Behaves like the equivalent XSLT tag.
*
* @author James Strachan
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class WhenTag extends AbstractXPathTag {
/** Logger */
- private static final Category log = LogHelper.get( WhenTag.class );
+ private static final Category log = Category.getInstance( WhenTag.class );
/** Stores the XPath filter to evaluate */
private NodeFilter nodeFilter;
1.2 +3 -3 jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/util/StringHelper.java
Index: StringHelper.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/xtags/src/org/apache/taglibs/xtags/util/StringHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StringHelper.java 2001/05/05 18:06:33 1.1
+++ StringHelper.java 2001/05/07 12:13:43 1.2
@@ -58,13 +58,13 @@
package org.apache.taglibs.xtags.util;
-import org.apache.taglibs.xtags.util.LogHelper;
+
import org.dom4j.Attribute;
import org.dom4j.Element;
import org.dom4j.io.SAXReader;
-import org.log4j.Category;
+import org.apache.log4j.Category;
/** A Helper class of useful String methods.
*
@@ -73,7 +73,7 @@
public class StringHelper {
/** Logger */
- private static final Category log = LogHelper.get( StringHelper.class );
+ private static final Category log = Category.getInstance( StringHelper.class );
//-------------------------------------------------------------------------