logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgo...@apache.org
Subject svn commit: r1465533 [2/2] - in /logging/log4j/log4j2/trunk: ./ api/ api/src/main/java/org/apache/logging/log4j/spi/ jcl-bridge/ log4j12-api/ samples/ samples/flume-common/ samples/flume-embedded/ samples/flume-remote/ src/changes/ src/site/ taglib/ ta...
Date Mon, 08 Apr 2013 04:08:11 GMT
Added: logging/log4j/log4j2/trunk/taglib/src/main/resources/META-INF/log.tld
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/taglib/src/main/resources/META-INF/log.tld?rev=1465533&view=auto
==============================================================================
--- logging/log4j/log4j2/trunk/taglib/src/main/resources/META-INF/log.tld (added)
+++ logging/log4j/log4j2/trunk/taglib/src/main/resources/META-INF/log.tld Mon Apr  8 04:08:10
2013
@@ -0,0 +1,634 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<taglib xmlns="http://java.sun.com/xml/ns/javaee"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+                            http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"
+        version="2.1">
+
+  <description><![CDATA[The Log4j Log Tag Library creates the capability of inserting
log
+statements in JSPs without the use of Java scripting. It uses the standard Log4j 2 API to
log
+messages according to your Log4j configuration. You can learn more about Log4j 2 on the
+<a href="http://logging.apache.org/log4j/2.x/">Log4j 2</a> website.
+
+This tag library is based on the Jakarta Commons Log Taglib by Joseph Ottinger and James
+Strachan. For the most part, logging tags written against Jakarta Commons Log Taglib should
+work against this library as well. However, the "category" attribute from Jakarta has become
+the "logger" attribute in this library.
+
+In accordance with the org.apache.logging.log4j.Logger API, this tag library has tags to
+support the following logging calls: "catching", "entry", "exit", "log", "trace", "debug",
+"info", "warn", "error", and "fatal". The "trace" tag was not supported in Jakarta Commons
Log
+Taglib. The "setLogger", "catching", "entry", and "trace" tags are new to this library. This
+tag library also supports the conditional tag "ifEnabled" (new) and troubleshooting tag "dump"
+(existed in Jakarta Commons Log Taglib).
+
+By default, this tag library uses a different Logger for each JSP named after the JSP ID.
+You can customize the Logger in any of the logging tags or the "ifEnabled" tag with the
+"logger" attribute. You can also use the "setLogger" tag to specify the Logger that should
apply
+for the rest of a JSP's execution. If the "setLogger" tag comes before any other logging
tags in
+a JSP, the default Logger for that JSP will not be created, but instead the specified logger
is
+the only one that will be used.
+
+Every effort was made to optimize these tags and ensure decent performance, but users of
+this library should keep in mind that the creation and execution of JSP tags adds significant
+overhead to the standard Log4j method calls. While the "trace", "debug", and "info" options
are
+available in this library, their uses are not nano-second order of magnitude with logging
off
+that users may be used to with standard Log4j method calls. Therefore, they should be used
+sparingly. Use of the "ifEnabled" tag does not improve this performance; this tag is available
+to conditionally evaluate other actions in addition to logging actions.]]></description>
+  <display-name>Log4j 2 Tag Library</display-name>
+  <tlib-version>1.0</tlib-version>
+  <short-name>log</short-name>
+  <uri>http://logging.apache.org/log4j/tld/log</uri>
+
+  <tag>
+    <description>Sets the default Logger to use for the rest of this JSP's execution
OR exports
+      an org.apache.logging.log4j.Logger instance as the specified EL variable. The "value"
+      attribute specifies either the String name of a Logger to create or an actual Logger
instance.
+      By default, Loggers are constructed and assigned the standard
+      org.apache.logging.log4j.message.ParameterizedMessageFactory. The optional "factory"
attribute
+      can be used to override the default message factory.</description>
+    <name>setLogger</name>
+    <tag-class>org.apache.logging.log4j.taglib.SetLoggerTag</tag-class>
+    <body-content>empty</body-content>
+    <attribute>
+      <description>The name or instance of the Logger to set as the JSP's default Logger
or
+        the name of the Logger to export as the specified EL variable.</description>
+      <name>value</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.Object</type>
+    </attribute>
+    <attribute>
+      <description>Specify this optional tag to provide a message factory other than
the default
+        ParameterizedMessageFactory message factory to use for the Logger. If the Logger
has already
+        been created with a different message factory, this will be ignored. Using this attribute
+        makes no sense if the "value" attribute's value is an actual Logger instance, since
its
+        message factory cannot be changed.</description>
+      <name>factory</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>org.apache.logging.log4j.message.MessageFactory</type>
+    </attribute>
+    <attribute>
+      <description>The optional name of the EL variable to export this Logger as. Using
this
+        attribute makes no sense if the "value" attribute's value is an actual Logger instance.
+        That would result in an existing Logger on the scope being re-added to the
+        scope.</description>
+      <name>var</name>
+      <required>false</required>
+      <rtexprvalue>false</rtexprvalue>
+      <type>java.lang.String</type>
+    </attribute>
+    <attribute>
+      <description>Either "page," "request," "session," or "application," the optional
scope that
+        the EL variable should be exported to (defaults to "page").</description>
+      <name>scope</name>
+      <required>false</required>
+      <rtexprvalue>false</rtexprvalue>
+      <type>java.lang.String</type>
+    </attribute>
+    <example><![CDATA[
+<log:logger value="com.foo.bar" />
+<log:logger value="com.bar.foo" var="myLogger" />
+<log:debug message="This should log with com.foo.bar." />
+<log:debug logger="${myLogger}" message="This should log with com.bar.foo." />
+    ]]></example>
+  </tag>
+
+  <tag>
+    <description>Conditional tag that evaluates its body only if the specified log
level and
+      marker are enabled.</description>
+    <name>ifEnabled</name>
+    <tag-class>org.apache.logging.log4j.taglib.IfEnabledTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+      <description>The name or instance of the Logger to use to override the default
Logger
+        for this JSP.</description>
+      <name>logger</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.Object</type>
+    </attribute>
+    <attribute>
+      <description>The name of any valid Level (TRACE, DEBUG, INFO, etc.) or an actual
Level
+        instance to check whether it is enabled. This value is case-insensitive.</description>
+      <name>level</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.Object</type>
+    </attribute>
+    <attribute>
+      <description>Marker data to include in the enabled check.</description>
+      <name>marker</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>org.apache.logging.log4j.Marker</type>
+    </attribute>
+    <example><![CDATA[
+<log:ifEnabled level="info">
+    Evaluate this content
+</log:ifEnabled>
+
+<log:ifEnabled logger="com.foo.bar" level="INFO" marker="${marker}">
+    Evaluate this content
+</log:ifEnabled>
+    ]]></example>
+  </tag>
+
+  <tag>
+    <description>Equivalent of org.apache.logging.log4j.Logger#catching().</description>
+    <name>catching</name>
+    <tag-class>org.apache.logging.log4j.taglib.CatchingTag</tag-class>
+    <body-content>empty</body-content>
+    <attribute>
+      <description>The name or instance of the Logger to use to override the default
Logger
+        for this JSP.</description>
+      <name>logger</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.Object</type>
+    </attribute>
+    <attribute>
+      <description>The name of any valid level (TRACE, DEBUG, INFO, etc.) or an actual
Level
+        instance to log this at. This value is case-insensitive and defaults to ERROR for
this
+        tag.</description>
+      <name>level</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.Object</type>
+    </attribute>
+    <attribute>
+      <description>The exception that should be logged.</description>
+      <name>exception</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.Throwable</type>
+    </attribute>
+    <example><![CDATA[
+<c:catch var="myException">
+    <%= 5 / 0 %>
+</c:catch>
+<c:if test="${myException != null}">
+    <log:catching exception="${myException}" />
+</c:if>
+    ]]></example>
+  </tag>
+
+  <tag>
+    <description>Equivalent of org.apache.logging.log4j.Logger#entry(). This tag has
dynamic
+      attributes enabled. You may specify any number of arbitrary attributes whose values
+      will be logged with this entry (TRACE) statement. The attribute names will be
+      ignored.</description>
+    <name>entry</name>
+    <tag-class>org.apache.logging.log4j.taglib.EntryTag</tag-class>
+    <body-content>empty</body-content>
+    <attribute>
+      <description>The name or instance of the Logger to use to override the default
Logger
+        for this JSP.</description>
+      <name>logger</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.Object</type>
+    </attribute>
+    <dynamic-attributes>true</dynamic-attributes>
+    <example><![CDATA[
+<log:entry />
+<log:entry logger="com.foo.bar" />
+<log:entry arg1="${value1}" arg2="${value2}" />
+<log:entry logger="${myLogger}" argA="${value1}" argB="${value2}" />
+    ]]></example>
+  </tag>
+
+  <tag>
+    <description>Equivalent of org.apache.logging.log4j.Logger#exit().</description>
+    <name>exit</name>
+    <tag-class>org.apache.logging.log4j.taglib.ExitTag</tag-class>
+    <body-content>empty</body-content>
+    <attribute>
+      <description>The name or instance of the Logger to use to override the default
Logger
+        for this JSP.</description>
+      <name>logger</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.Object</type>
+    </attribute>
+    <attribute>
+      <description>An optional object to log with the exit (TRACE) statement.</description>
+      <name>result</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.Object</type>
+    </attribute>
+    <example><![CDATA[
+<log:exit />
+<log:exit logger="com.foo.bar" />
+<log:exit result="${value}" />
+<log:exit logger="${myLogger}" result="${value}" />
+    ]]></example>
+  </tag>
+
+  <tag>
+    <description>Equivalent of org.apache.logging.log4j.Logger#log(). This tag has
dynamic
+      attributes enabled. You may specify any number of arbitrary attributes whose values
will be
+      substituted in the String message. The "message" must be a String for this to work
correctly.
+      See the Log4j 2 manual for more information about message parameters and substitution.
Only
+      attribute values are used; attribute names are ignored.</description>
+    <name>log</name>
+    <tag-class>org.apache.logging.log4j.taglib.LogTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+      <description>The name or instance of the Logger to use to override the default
Logger
+        for this JSP.</description>
+      <name>logger</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.Object</type>
+    </attribute>
+    <attribute>
+      <description>The name of any valid level (TRACE, DEBUG, INFO, etc.) or an actual
Level
+        instance to log this at. This value is case-insensitive.</description>
+      <name>level</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.Object</type>
+    </attribute>
+    <attribute>
+      <description>The message that should be logged. May be a String, Object, or
+        org.apache.logging.log4j.message.Message. Either this attribute or body content are
+        required.</description>
+      <name>message</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.Object</type>
+    </attribute>
+    <attribute>
+      <description>Optional marker data to include in this logging event.</description>
+      <name>marker</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>org.apache.logging.log4j.Marker</type>
+    </attribute>
+    <attribute>
+      <description>Optional exception that should be logged.</description>
+      <name>exception</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.Throwable</type>
+    </attribute>
+    <dynamic-attributes>true</dynamic-attributes>
+    <example><![CDATA[
+<log:log level="warn" message="Log this message." />
+<log:log logger="com.foo.bar" level="ERROR" message="${objectToLog}"
+         exception="${exception}" marker="${marker}" />
+<log:log logger="com.foo.bar" level="info" exception="${exception}" marker="${marker}">
+    Log this message
+</log:log>
+    ]]></example>
+  </tag>
+
+  <tag>
+    <description>Equivalent of org.apache.logging.log4j.Logger#trace(). This tag has
dynamic
+      attributes enabled. You may specify any number of arbitrary attributes whose values
will be
+      substituted in the String message. The "message" must be a String for this to work
correctly.
+      See the Log4j 2 manual for more information about message parameters and substitution.
Only
+      attribute values are used; attribute names are ignored.</description>
+    <name>trace</name>
+    <tag-class>org.apache.logging.log4j.taglib.TraceTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+      <description>The name or instance of the Logger to use to override the default
Logger
+        for this JSP.</description>
+      <name>logger</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.Object</type>
+    </attribute>
+    <attribute>
+      <description>The message that should be logged. May be a String, Object, or
+        org.apache.logging.log4j.message.Message. Either this attribute or body content are
+        required.</description>
+      <name>message</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.Object</type>
+    </attribute>
+    <attribute>
+      <description>Optional marker data to include in this logging event.</description>
+      <name>marker</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>org.apache.logging.log4j.Marker</type>
+    </attribute>
+    <attribute>
+      <description>Optional exception that should be logged.</description>
+      <name>exception</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.Throwable</type>
+    </attribute>
+    <dynamic-attributes>true</dynamic-attributes>
+    <example><![CDATA[
+<log:trace message="Log this message." />
+<log:trace logger="com.foo.bar" message="${objectToLog}" exception="${exception}"
+           marker="${marker}" />
+<log:trace logger="com.foo.bar" exception="${exception}" marker="${marker}">
+    Log this message
+</log:trace>
+    ]]></example>
+  </tag>
+
+  <tag>
+    <description>Equivalent of org.apache.logging.log4j.Logger#debug(). This tag has
dynamic
+      attributes enabled. You may specify any number of arbitrary attributes whose values
will be
+      substituted in the String message. The "message" must be a String for this to work
correctly.
+      See the Log4j 2 manual for more information about message parameters and substitution.
Only
+      attribute values are used; attribute names are ignored.</description>
+    <name>debug</name>
+    <tag-class>org.apache.logging.log4j.taglib.DebugTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+      <description>The name or instance of the Logger to use to override the default
Logger
+        for this JSP.</description>
+      <name>logger</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.Object</type>
+    </attribute>
+    <attribute>
+      <description>The message that should be logged. May be a String, Object, or
+        org.apache.logging.log4j.message.Message. Either this attribute or body content are
+        required.</description>
+      <name>message</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.Object</type>
+    </attribute>
+    <attribute>
+      <description>Optional marker data to include in this logging event.</description>
+      <name>marker</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>org.apache.logging.log4j.Marker</type>
+    </attribute>
+    <attribute>
+      <description>Optional exception that should be logged.</description>
+      <name>exception</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.Throwable</type>
+    </attribute>
+    <dynamic-attributes>true</dynamic-attributes>
+    <example><![CDATA[
+<log:debug message="Log this message." />
+<log:debug logger="com.foo.bar" message="${objectToLog}" exception="${exception}"
+           marker="${marker}" />
+<log:debug logger="com.foo.bar" exception="${exception}" marker="${marker}">
+    Log this message
+</log:debug>
+    ]]></example>
+  </tag>
+
+  <tag>
+    <description>Equivalent of org.apache.logging.log4j.Logger#info(). This tag has
dynamic
+      attributes enabled. You may specify any number of arbitrary attributes whose values
will be
+      substituted in the String message. The "message" must be a String for this to work
correctly.
+      See the Log4j 2 manual for more information about message parameters and substitution.
Only
+      attribute values are used; attribute names are ignored.</description>
+    <name>info</name>
+    <tag-class>org.apache.logging.log4j.taglib.InfoTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+      <description>The name or instance of the Logger to use to override the default
Logger
+        for this JSP.</description>
+      <name>logger</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.Object</type>
+    </attribute>
+    <attribute>
+      <description>The message that should be logged. May be a String, Object, or
+        org.apache.logging.log4j.message.Message. Either this attribute or body content are
+        required.</description>
+      <name>message</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.Object</type>
+    </attribute>
+    <attribute>
+      <description>Optional marker data to include in this logging event.</description>
+      <name>marker</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>org.apache.logging.log4j.Marker</type>
+    </attribute>
+    <attribute>
+      <description>Optional exception that should be logged.</description>
+      <name>exception</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.Throwable</type>
+    </attribute>
+    <dynamic-attributes>true</dynamic-attributes>
+    <example><![CDATA[
+<log:info message="Log this message." />
+<log:info logger="com.foo.bar" message="${objectToLog}" exception="${exception}"
+          marker="${marker}" />
+<log:info logger="com.foo.bar" exception="${exception}" marker="${marker}">
+    Log this message
+</log:info>
+    ]]></example>
+  </tag>
+
+  <tag>
+    <description>Equivalent of org.apache.logging.log4j.Logger#warn(). This tag has
dynamic
+      attributes enabled. You may specify any number of arbitrary attributes whose values
will be
+      substituted in the String message. The "message" must be a String for this to work
correctly.
+      See the Log4j 2 manual for more information about message parameters and substitution.
Only
+      attribute values are used; attribute names are ignored.</description>
+    <name>warn</name>
+    <tag-class>org.apache.logging.log4j.taglib.WarnTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+      <description>The name or instance of the Logger to use to override the default
Logger
+        for this JSP.</description>
+      <name>logger</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.Object</type>
+    </attribute>
+    <attribute>
+      <description>The message that should be logged. May be a String, Object, or
+        org.apache.logging.log4j.message.Message. Either this attribute or body content are
+        required.</description>
+      <name>message</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.Object</type>
+    </attribute>
+    <attribute>
+      <description>Optional marker data to include in this logging event.</description>
+      <name>marker</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>org.apache.logging.log4j.Marker</type>
+    </attribute>
+    <attribute>
+      <description>Optional exception that should be logged.</description>
+      <name>exception</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.Throwable</type>
+    </attribute>
+    <dynamic-attributes>true</dynamic-attributes>
+    <example><![CDATA[
+<log:warn message="Log this message." />
+<log:warn logger="com.foo.bar" message="${objectToLog}" exception="${exception}"
+          marker="${marker}" />
+<log:warn logger="com.foo.bar" exception="${exception}" marker="${marker}">
+    Log this message
+</log:warn>
+    ]]></example>
+  </tag>
+
+  <tag>
+    <description>Equivalent of org.apache.logging.log4j.Logger#error(). This tag has
dynamic
+      attributes enabled. You may specify any number of arbitrary attributes whose values
will be
+      substituted in the String message. The "message" must be a String for this to work
correctly.
+      See the Log4j 2 manual for more information about message parameters and substitution.
Only
+      attribute values are used; attribute names are ignored.</description>
+    <name>error</name>
+    <tag-class>org.apache.logging.log4j.taglib.ErrorTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+      <description>The name or instance of the Logger to use to override the default
Logger
+        for this JSP.</description>
+      <name>logger</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.Object</type>
+    </attribute>
+    <attribute>
+      <description>The message that should be logged. May be a String, Object, or
+        org.apache.logging.log4j.message.Message. Either this attribute or body content are
+        required.</description>
+      <name>message</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.Object</type>
+    </attribute>
+    <attribute>
+      <description>Optional marker data to include in this logging event.</description>
+      <name>marker</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>org.apache.logging.log4j.Marker</type>
+    </attribute>
+    <attribute>
+      <description>Optional exception that should be logged.</description>
+      <name>exception</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.Throwable</type>
+    </attribute>
+    <dynamic-attributes>true</dynamic-attributes>
+    <example><![CDATA[
+<log:error message="Log this message." />
+<log:error logger="com.foo.bar" message="${objectToLog}" exception="${exception}"
+           marker="${marker}" />
+<log:error logger="com.foo.bar" exception="${exception}" marker="${marker}">
+    Log this message
+</log:error>
+    ]]></example>
+  </tag>
+
+  <tag>
+    <description>Equivalent of org.apache.logging.log4j.Logger#fatal(). This tag has
dynamic
+      attributes enabled. You may specify any number of arbitrary attributes whose values
will be
+      substituted in the String message. The "message" must be a String for this to work
correctly.
+      See the Log4j 2 manual for more information about message parameters and substitution.
Only
+      attribute values are used; attribute names are ignored.</description>
+    <name>fatal</name>
+    <tag-class>org.apache.logging.log4j.taglib.FatalTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+      <description>The name or instance of the Logger to use to override the default
Logger
+        for this JSP.</description>
+      <name>logger</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.Object</type>
+    </attribute>
+    <attribute>
+      <description>The message that should be logged. May be a String, Object, or
+        org.apache.logging.log4j.message.Message. Either this attribute or body content are
+        required.</description>
+      <name>message</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.Object</type>
+    </attribute>
+    <attribute>
+      <description>Optional marker data to include in this logging event.</description>
+      <name>marker</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>org.apache.logging.log4j.Marker</type>
+    </attribute>
+    <attribute>
+      <description>Optional exception that should be logged.</description>
+      <name>exception</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.Throwable</type>
+    </attribute>
+    <dynamic-attributes>true</dynamic-attributes>
+    <example><![CDATA[
+<log:fatal message="Log this message." />
+<log:fatal logger="com.foo.bar" message="${objectToLog}" exception="${exception}"
+           marker="${marker}" />
+<log:fatal logger="com.foo.bar" exception="${exception}" marker="${marker}">
+    Log this message
+</log:fatal>
+    ]]></example>
+  </tag>
+
+  <tag>
+    <description>Displays all variables bound to the specified scope.</description>
+    <name>dump</name>
+    <tag-class>org.apache.logging.log4j.taglib.DumpTag</tag-class>
+    <body-content>empty</body-content>
+    <attribute>
+      <description>Either "page," "request," "session," or "application," the scope
whose bound
+        variables should be dumped onto the page inline.</description>
+      <name>scope</name>
+      <required>true</required>
+      <rtexprvalue>false</rtexprvalue>
+      <type>java.lang.String</type>
+    </attribute>
+    <example><![CDATA[
+<log:dump scope="page" />
+<log:dump scope="request" />
+<log:dump scope="session" />
+<log:dump scope="application" />
+    ]]></example>
+  </tag>
+
+</taglib>

Added: logging/log4j/log4j2/trunk/taglib/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/taglib/src/site/site.xml?rev=1465533&view=auto
==============================================================================
--- logging/log4j/log4j2/trunk/taglib/src/site/site.xml (added)
+++ logging/log4j/log4j2/trunk/taglib/src/site/site.xml Mon Apr  8 04:08:10 2013
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<project name="Log4j Tag Library">
+  <bannerLeft>
+    <name>Logging Services</name>
+    <src>../images/ls-logo.jpg</src>
+    <href>../index.html</href>
+  </bannerLeft>
+  <bannerRight>
+    <src>../images/logo.jpg</src>
+  </bannerRight>
+  <body>
+    <links>
+      <item name="Apache" href="http://www.apache.org/" />
+      <item name="Logging Services" href="http://logging.apache.org/"/>
+      <item name="Log4j" href="../index.html"/>
+    </links>
+    <menu ref="reports"/>
+    <footer><div class="row span16">Apache Logging, Apache Log4j, Log4j, Apache,
the Apache feather logo, and the
+      Apache Logging project logo are trademarks of The Apache Software Foundation.</div>
+    </footer>
+  </body>
+</project>
\ No newline at end of file

Added: logging/log4j/log4j2/trunk/taglib/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/taglib/src/site/xdoc/index.xml?rev=1465533&view=auto
==============================================================================
--- logging/log4j/log4j2/trunk/taglib/src/site/xdoc/index.xml (added)
+++ logging/log4j/log4j2/trunk/taglib/src/site/xdoc/index.xml Mon Apr  8 04:08:10 2013
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<document>
+     <properties>
+     <title>Log4j Tag Library</title>
+     <author email="nicholas@nicholaswilliams.net">Nick Williams</author>
+   </properties>
+
+   <body>
+     <section name="Log4j Tag Library">
+
+       <p>The Log4j Log Tag Library creates the capability of inserting log
+         statements in JSPs without the use of Java scripting. It uses the standard Log4j
2 API to log
+         messages according to your Log4j configuration.</p>
+
+       <p>This tag library is based on the
+         <a href="http://jakarta.apache.org/taglibs/log/">Jakarta Commons Log Taglib</a>
by Joseph Ottinger and James
+         Strachan. For the most part, logging tags written against Jakarta Commons Log Taglib
should
+         work against this library as well. However, the "category" attribute from Jakarta
has become
+         the "logger" attribute in this library.</p>
+
+     </section>
+
+     <section name="Requirements">
+       <p>
+         The Log4j Tag Library requires at least Java 6, at least Servlet 2.5 (or Java EE
5), and at least
+         JSP 2.1 (or Java EE 5).
+       </p>
+     </section>
+
+     <section name="Usage">
+       <p>In accordance with the <a href="../log4j-api/apidocs/org/apache/logging/log4j/Logger.html">Logger</a>
+         API, this tag library has tags to
+         support the following logging calls: "catching", "entry", "exit", "log", "trace",
"debug",
+         "info", "warn", "error", and "fatal". The "trace" tag was not supported in Jakarta
Commons Log
+         Taglib. The "setLogger", "catching", "entry", and "trace" tags are new to this library.
This
+         tag library also supports the conditional tag "ifEnabled" (new) and troubleshooting
tag "dump"
+         (existed in Jakarta Commons Log Taglib).</p>
+
+       <p>By default, this tag library uses a different Logger for each JSP named after
the JSP ID.
+         You can customize the Logger in any of the logging tags or the "ifEnabled" tag with
the
+         "logger" attribute. You can also use the "setLogger" tag to specify the Logger that
should apply
+         for the rest of a JSP's execution. If the "setLogger" tag comes before any other
logging tags in
+         a JSP, the default Logger for that JSP will not be created, but instead the specified
logger is
+         the only one that will be used.</p>
+
+       <p>Every effort was made to optimize these tags and ensure decent performance,
but users of
+         this library should keep in mind that the creation and execution of JSP tags adds
significant
+         overhead to the standard Log4j method calls. While the "trace", "debug", and "info"
options are
+         available in this library, their uses are not nano-second order of magnitude with
logging off
+         that users may be used to with standard Log4j method calls. Therefore, they should
be used
+         sparingly. Use of the "ifEnabled" tag does not improve this performance; this tag
is available
+         to conditionally evaluate other actions in addition to logging actions.</p>
+
+       <p>For detailed documentation of each tag, see the <a href="tagreference.html">Tag
Library Reference</a> or the
+         <a href="tlddoc/index.html">TLDDoc Documentation</a>.</p>
+     </section>
+
+   </body>
+</document>
\ No newline at end of file

Modified: logging/log4j/log4j2/trunk/web/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/web/pom.xml?rev=1465533&r1=1465532&r2=1465533&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/web/pom.xml (original)
+++ logging/log4j/log4j2/trunk/web/pom.xml Mon Apr  8 04:08:10 2013
@@ -26,8 +26,8 @@
   <groupId>org.apache.logging.log4j.adapters</groupId>
   <artifactId>log4j-web</artifactId>
   <packaging>jar</packaging>
-  <name>Log4j Web Adapters</name>
-  <description>Log4j Adapters for Web Applications</description>
+  <name>Apache Log4j Web Adapters</name>
+  <description>Apache Log4j Adapters for Web Applications</description>
   <properties>
     <log4jParentDir>${basedir}/..</log4jParentDir>
     <docLabel>Log4j Web Application Documentation</docLabel>
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
+      <version>2.5</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: logging/log4j/log4j2/trunk/web/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/web/src/site/site.xml?rev=1465533&r1=1465532&r2=1465533&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/web/src/site/site.xml (original)
+++ logging/log4j/log4j2/trunk/web/src/site/site.xml Mon Apr  8 04:08:10 2013
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with

Modified: logging/log4j/log4j2/trunk/web/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/web/src/site/xdoc/index.xml?rev=1465533&r1=1465532&r2=1465533&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/web/src/site/xdoc/index.xml (original)
+++ logging/log4j/log4j2/trunk/web/src/site/xdoc/index.xml Mon Apr  8 04:08:10 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
@@ -55,7 +55,7 @@
 
         <section name="Requirements">
            <p>
-             The Log4j web components require at least Java 5.
+             The Log4j web components require at least Java 5 and at least Servlet 2.5 (or
Java EE 5).
           </p>
         </section>
 

Modified: logging/log4j/log4j2/trunk/web/src/test/java/org/apache/logging/log4j/core/web/Log4jContextListenerTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/web/src/test/java/org/apache/logging/log4j/core/web/Log4jContextListenerTest.java?rev=1465533&r1=1465532&r2=1465533&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/web/src/test/java/org/apache/logging/log4j/core/web/Log4jContextListenerTest.java
(original)
+++ logging/log4j/log4j2/trunk/web/src/test/java/org/apache/logging/log4j/core/web/Log4jContextListenerTest.java
Mon Apr  8 04:08:10 2013
@@ -225,5 +225,9 @@ public class Log4jContextListenerTest {
         public String getServletContextName() {
             return null;
         }
+
+        public String getContextPath() {
+            return null;
+        }
     }
 }



Mime
View raw message