You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2014/07/28 19:54:17 UTC
svn commit: r1614093 - in /logging/log4j/log4j2/trunk/src:
changes/changes.xml site/xdoc/manual/configuration.xml.vm
site/xdoc/manual/extending.xml site/xdoc/manual/logsep.xml
site/xdoc/manual/webapp.xml
Author: ggregory
Date: Mon Jul 28 17:54:16 2014
New Revision: 1614093
URL: http://svn.apache.org/r1614093
Log:
[LOG4J2-750] Webapp configuration page has incorrect class name.
Modified:
logging/log4j/log4j2/trunk/src/changes/changes.xml
logging/log4j/log4j2/trunk/src/site/xdoc/manual/configuration.xml.vm
logging/log4j/log4j2/trunk/src/site/xdoc/manual/extending.xml
logging/log4j/log4j2/trunk/src/site/xdoc/manual/logsep.xml
logging/log4j/log4j2/trunk/src/site/xdoc/manual/webapp.xml
Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1614093&r1=1614092&r2=1614093&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/changes/changes.xml (original)
+++ logging/log4j/log4j2/trunk/src/changes/changes.xml Mon Jul 28 17:54:16 2014
@@ -22,6 +22,9 @@
</properties>
<body>
<release version="2.0.1" date="2014-mm-dd" description="?">
+ <action issue="LOG4J2-750" dev="ggregory" type="fix" due-to="Mike Calmus ">
+ Webapp configuration page has incorrect class name.
+ </action>
<action issue="LOG4J2-749" dev="rpopma" type="fix" due-to="Scott Harrington">
Retain the default date pattern after fixing the ISO8601 pattern.
</action>
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/configuration.xml.vm
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/configuration.xml.vm?rev=1614093&r1=1614092&r2=1614093&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/configuration.xml.vm (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/configuration.xml.vm Mon Jul 28 17:54:16 2014
@@ -1171,7 +1171,7 @@ StatusConsoleListener listener = new Sta
<tt>org.apache.logging.log4j.core.async.AsyncLoggerContextSelector</tt> - makes <a href="async.html">all loggers asynchronous</a>.<br />
<tt>org.apache.logging.log4j.core.selector.BasicContextSelector</tt> - creates a single shared LoggerContext.<br />
<tt>org.apache.logging.log4j.core.selector.ClassLoaderContextSelector</tt> - separate LoggerContexts for each web application.<br />
- <tt>org.apache.logging.log4j.core.selector.JNDIContextSelector</tt> - use JNDI to locate each web application's LoggerContext.
+ <tt>org.apache.logging.log4j.core.selector.JndiContextSelector</tt> - use JNDI to locate each web application's LoggerContext.
</td>
</tr>
<tr>
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/extending.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/extending.xml?rev=1614093&r1=1614092&r2=1614093&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/extending.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/extending.xml Mon Jul 28 17:54:16 2014
@@ -78,7 +78,7 @@
<dd>Uses either a LoggerContext that has been stored in a ThreadLocal or a common LoggerContext.</dd>
<dt>ClassLoaderContextSelector</dt>
<dd>Associates LoggerContexts with the ClassLoader that created the caller of the getLogger call.</dd>
- <dt>JNDIContextSelector</dt>
+ <dt>JndiContextSelector</dt>
<dd>Locates the LoggerContext by querying JNDI.</dd>
</dl>
</subsection>
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/logsep.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/logsep.xml?rev=1614093&r1=1614092&r2=1614093&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/logsep.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/logsep.xml Mon Jul 28 17:54:16 2014
@@ -96,7 +96,7 @@
<li>
Follow the <a href="webapp.html">instructions to initialize Log4j 2 in a web application</a> and set
the system property or servlet context parameter <code>Log4jContextSelector</code> to
- <kbd>org.apache.logging.log4j.core.selector.JNDIContextSelector</kbd>. This will cause the container
+ <kbd>org.apache.logging.log4j.core.selector.JndiContextSelector</kbd>. This will cause the container
to use JNDI to locate each web application's <code>LoggerContext</code>. Be sure to set the
<code>isLog4jContextSelectorNamed</code> context parameter to <kbd>true</kbd> and also set the
<code>log4jContextName</code> and <code>log4jConfiguration</code> context parameters.
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/webapp.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/webapp.xml?rev=1614093&r1=1614092&r2=1614093&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/webapp.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/webapp.xml Mon Jul 28 17:54:16 2014
@@ -172,8 +172,8 @@
and uses the standard pattern for locating the Log4j configuration file. There are three context parameters
that you can use to control this behavior. The first, <code>isLog4jContextSelectorNamed</code>, specifies
whether the context should be selected using the
- <a href="../log4j-core/apidocs/org/apache/logging/log4j/core/selector/JNDIContextSelector.html"
- >JNDIContextSelector</a>. If <code>isLog4jContextSelectorNamed</code> is not specified or is anything other
+ <a href="../log4j-core/apidocs/org/apache/logging/log4j/core/selector/JndiContextSelector.html"
+ >JndiContextSelector</a>. If <code>isLog4jContextSelectorNamed</code> is not specified or is anything other
than <code>true</code>, it is assumed to be <code>false</code>.
</p>
<p>
@@ -204,7 +204,7 @@
<param-name>log4jConfiguration</param-name>
<param-value>file:///etc/myApp/myLogging.xml</param-value>
</context-param>]]></pre>
- <h4>Use the <code>JNDIContextSelector</code></h4>
+ <h4>Use the <code>JndiContextSelector</code></h4>
<pre class="prettyprint linenums"><![CDATA[ <context-param>
<param-name>isLog4jContextSelectorNamed</param-name>
<param-value>true</param-value>
@@ -219,7 +219,7 @@
</context-param>]]></pre>
<p>
Note that in this case you must also set the "Log4jContextSelector" system property to
- "org.apache.logging.log4j.core.selector.JNDIContextSelector."
+ "org.apache.logging.log4j.core.selector.JndiContextSelector."
</p>
</subsection>
<subsection name="Using Web Application Information During the Configuration">