You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2013/04/26 18:55:36 UTC
svn commit: r1476289 - in /logging/log4j/log4j2/trunk: ./
jcl-bridge/src/site/xdoc/ log4j-to-slf4j/src/site/xdoc/
log4j12-api/src/site/xdoc/ slf4j-impl/src/site/xdoc/ src/changes/ src/site/
src/site/xdoc/ src/site/xdoc/manual/
Author: rpopma
Date: Fri Apr 26 16:55:35 2013
New Revision: 1476289
URL: http://svn.apache.org/r1476289
Log:
LOG4J2-215 various doc fixes
Added:
logging/log4j/log4j2/trunk/.classpath (with props)
Modified:
logging/log4j/log4j2/trunk/jcl-bridge/src/site/xdoc/index.xml
logging/log4j/log4j2/trunk/log4j-to-slf4j/src/site/xdoc/index.xml
logging/log4j/log4j2/trunk/log4j12-api/src/site/xdoc/index.xml
logging/log4j/log4j2/trunk/pom.xml
logging/log4j/log4j2/trunk/slf4j-impl/src/site/xdoc/index.xml
logging/log4j/log4j2/trunk/src/changes/changes.xml
logging/log4j/log4j2/trunk/src/site/pdf.xml
logging/log4j/log4j2/trunk/src/site/xdoc/changelog.xml
logging/log4j/log4j2/trunk/src/site/xdoc/manual/async.xml
logging/log4j/log4j2/trunk/src/site/xdoc/manual/index.xml
Added: logging/log4j/log4j2/trunk/.classpath
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/.classpath?rev=1476289&view=auto
==============================================================================
--- logging/log4j/log4j2/trunk/.classpath (added)
+++ logging/log4j/log4j2/trunk/.classpath Fri Apr 26 16:55:35 2013
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="api/src/main/java"/>
+ <classpathentry kind="src" path="api/src/test/java"/>
+ <classpathentry kind="src" path="core/src/main/java"/>
+ <classpathentry kind="src" path="core/src/test/java"/>
+ <classpathentry kind="src" path="flume-ng/src/main/java"/>
+ <classpathentry kind="src" path="flume-ng/src/test/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+ <classpathentry kind="lib" path="C:/Users/remko/.m2/repository/com/lmax/disruptor/3.0.0.beta3/disruptor-3.0.0.beta3.jar"/>
+ <classpathentry kind="lib" path="C:/Users/remko/.m2/repository/org/codehaus/jackson/jackson-core-asl/1.9.2/jackson-core-asl-1.9.2.jar"/>
+ <classpathentry kind="lib" path="C:/Users/remko/.m2/repository/javax/mail/mail/1.4.5/mail-1.4.5.jar"/>
+ <classpathentry kind="lib" path="C:/Users/remko/.m2/repository/javax/activation/activation/1.1/activation-1.1.jar"/>
+ <classpathentry kind="lib" path="C:/Users/remko/.m2/repository/log4j/log4j/1.2.16/log4j-1.2.16.jar"/>
+ <classpathentry kind="lib" path="C:/Users/remko/.m2/repository/org/slf4j/slf4j-api/1.7.2/slf4j-api-1.7.2.jar"/>
+ <classpathentry kind="lib" path="C:/Users/remko/.m2/repository/org/slf4j/slf4j-ext/1.7.2/slf4j-ext-1.7.2.jar"/>
+ <classpathentry kind="lib" path="C:/Users/remko/.m2/repository/org/codehaus/jackson/jackson-mapper-asl/1.9.2/jackson-mapper-asl-1.9.2.jar"/>
+ <classpathentry kind="lib" path="C:/Users/remko/.m2/repository/org/easymock/easymock/2.4/easymock-2.4.jar"/>
+ <classpathentry kind="lib" path="C:/Users/remko/.m2/repository/org/mockejb/mockejb/0.6-beta2/mockejb-0.6-beta2.jar"/>
+ <classpathentry kind="lib" path="C:/Users/remko/.m2/repository/org/apache/apache-jar-resource-bundle/1.4/apache-jar-resource-bundle-1.4.jar"/>
+ <classpathentry kind="lib" path="C:/Users/remko/.m2/repository/org/osgi/core/4.3.0/core-4.3.0.jar"/>
+ <classpathentry kind="lib" path="C:/Users/remko/.m2/repository/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
+ <classpathentry kind="lib" path="C:/Users/remko/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
+ <classpathentry kind="lib" path="C:/Users/remko/.m2/repository/ch/qos/logback/logback-core/1.0.7/logback-core-1.0.7.jar"/>
+ <classpathentry kind="lib" path="C:/Users/remko/.m2/repository/ch/qos/logback/logback-classic/1.0.7/logback-classic-1.0.7.jar"/>
+ <classpathentry kind="lib" path="C:/Users/remko/.m2/repository/ch/qos/cal10n/cal10n-api/0.7.4/cal10n-api-0.7.4.jar"/>
+ <classpathentry kind="lib" path="C:/Users/remko/.m2/repository/org/apache/avro/avro/1.6.3/avro-1.6.3.jar"/>
+ <classpathentry kind="lib" path="C:/Users/remko/.m2/repository/org/apache/avro/avro-ipc/1.6.3/avro-ipc-1.6.3.jar"/>
+ <classpathentry kind="lib" path="C:/Users/remko/.m2/repository/org/apache/velocity/velocity/1.7/velocity-1.7.jar"/>
+ <classpathentry kind="lib" path="C:/Users/remko/.m2/repository/org/apache/geronimo/specs/geronimo-jms_1.1_spec/1.0/geronimo-jms_1.1_spec-1.0.jar"/>
+ <classpathentry kind="lib" path="C:/Users/remko/.m2/repository/oro/oro/2.0.8/oro-2.0.8.jar"/>
+ <classpathentry kind="lib" path="C:/Users/remko/.m2/repository/org/apache/flume/flume-ng-core/1.2.0/flume-ng-core-1.2.0.jar"/>
+ <classpathentry kind="lib" path="C:/Users/remko/.m2/repository/org/apache/flume/flume-ng-sdk/1.2.0/flume-ng-sdk-1.2.0.jar"/>
+ <classpathentry kind="lib" path="C:/Users/remko/.m2/repository/org/apache/flume/flume-ng-configuration/1.2.0/flume-ng-configuration-1.2.0.jar"/>
+ <classpathentry kind="lib" path="C:/Users/remko/.m2/repository/org/apache/flume/flume-ng-node/1.2.0/flume-ng-node-1.2.0.jar"/>
+ <classpathentry kind="lib" path="C:/Users/remko/.m2/repository/com/google/collections/google-collections/1.0/google-collections-1.0.jar"/>
+ <classpathentry kind="lib" path="C:/Users/remko/.m2/repository/com/sleepycat/je/5.0.73/je-5.0.73.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre6"/>
+ <classpathentry kind="lib" path="C:/apps/jdk1.7.0_11/lib/jconsole.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Propchange: logging/log4j/log4j2/trunk/.classpath
------------------------------------------------------------------------------
svn:eol-style = native
Modified: logging/log4j/log4j2/trunk/jcl-bridge/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/jcl-bridge/src/site/xdoc/index.xml?rev=1476289&r1=1476288&r2=1476289&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/jcl-bridge/src/site/xdoc/index.xml (original)
+++ logging/log4j/log4j2/trunk/jcl-bridge/src/site/xdoc/index.xml Fri Apr 26 16:55:35 2013
@@ -34,7 +34,7 @@
<section name="Requirements">
<p>
- The Commons Logging Bridge requires at least Java 5 and is dependent on the Log4j 2 API.
+ The Commons Logging Bridge requires at least Java 6 and is dependent on the Log4j 2 API.
</p>
</section>
Modified: logging/log4j/log4j2/trunk/log4j-to-slf4j/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-to-slf4j/src/site/xdoc/index.xml?rev=1476289&r1=1476288&r2=1476289&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-to-slf4j/src/site/xdoc/index.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-to-slf4j/src/site/xdoc/index.xml Fri Apr 26 16:55:35 2013
@@ -36,9 +36,7 @@
<section name="Requirements">
<p>
- The Log4j 2 to SLF4J adapter requires at least Java 5. Use of this adapter together with the
- SLF4J bridge should never be attempted as it will cause a events to endlessly be routed between
- SLF4J and Log4j 2.
+ The Log4j 2 to SLF4J adapter requires at least Java 6.
</p>
</section>
@@ -47,6 +45,12 @@
Include this jar, the SLF4J jar(s) and an SLF4J logging implementation jar together. Configure
the logging implementation as required.
</p>
+ <p>
+ <b><em>Use of the SLF4J adapter (log4j-to-slf4j-2.0.jar) together with
+ the SLF4J bridge (log4j-slf4j-impl-2.0.jar) should
+ never be attempted as it will cause events to endlessly be routed between
+ SLF4J and Log4j 2.</em></b>
+ </p>
</section>
</body>
Modified: logging/log4j/log4j2/trunk/log4j12-api/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/site/xdoc/index.xml?rev=1476289&r1=1476288&r2=1476289&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/site/xdoc/index.xml (original)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/site/xdoc/index.xml Fri Apr 26 16:55:35 2013
@@ -34,7 +34,7 @@
<section name="Requirements">
<p>
- The Log4j 1.2 bridge requires at least Java 5 and is dependent on the Log4j 2 API and implementation.
+ The Log4j 1.2 bridge requires at least Java 6 and is dependent on the Log4j 2 API and implementation.
</p>
</section>
Modified: logging/log4j/log4j2/trunk/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/pom.xml?rev=1476289&r1=1476288&r2=1476289&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/pom.xml (original)
+++ logging/log4j/log4j2/trunk/pom.xml Fri Apr 26 16:55:35 2013
@@ -116,7 +116,7 @@
<Log4jReleaseVersion>2.0-beta5</Log4jReleaseVersion>
<Log4jReleaseCount>seventh</Log4jReleaseCount>
<jackson.version>1.9.2</jackson.version>
- <disruptor.version>3.0.0</disruptor.version>
+ <disruptor.version>3.0.1</disruptor.version>
<!-- Configuration properties for the OSGi maven-bundle-plugin -->
<osgi.symbolicName>org.apache.logging.${project.artifactId}</osgi.symbolicName>
<osgi.export>org.apache.logging.log4j.*;version=${project.version};-noimport:=true</osgi.export>
Modified: logging/log4j/log4j2/trunk/slf4j-impl/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/slf4j-impl/src/site/xdoc/index.xml?rev=1476289&r1=1476288&r2=1476289&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/slf4j-impl/src/site/xdoc/index.xml (original)
+++ logging/log4j/log4j2/trunk/slf4j-impl/src/site/xdoc/index.xml Fri Apr 26 16:55:35 2013
@@ -34,7 +34,8 @@
<section name="Requirements">
<p>
- The SLF4J bridge requires at least Java 5 and has a dependency on the Log4j 2 API.
+ The SLF4J bridge requires at least Java 6 and has a dependency
+ on the Log4j 2 API.
</p>
</section>
@@ -44,6 +45,12 @@
include the SLF4J Bindings jar along with the Log4j 2 jars to cause all SLF4J logging to be handled
by Log4j 2.
</p>
+ <p>
+ <b><em>Use of the SLF4J bridge (log4j-slf4j-impl-2.0.jar) together with
+ the SLF4J adapter (log4j-to-slf4j-2.0.jar) should
+ never be attempted as it will cause events to endlessly be routed between
+ SLF4J and Log4j 2.</em></b>
+ </p>
</section>
</body>
Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1476289&r1=1476288&r2=1476289&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/changes/changes.xml (original)
+++ logging/log4j/log4j2/trunk/src/changes/changes.xml Fri Apr 26 16:55:35 2013
@@ -23,6 +23,9 @@
<body>
<release version="2.0-beta6" date="@TBD@" description="Bug fixes and enhancements">
+ <action issue="LOG4J2-215" dev="rpopma" type="fix">
+ Various small documentation fixes.
+ </action>
<action issue="LOG4J2-217" dev="rpopma" type="fix" due-to="Fabien Sanglard">
Ensure PluginManager streams are always closed.
</action>
Modified: logging/log4j/log4j2/trunk/src/site/pdf.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/pdf.xml?rev=1476289&r1=1476288&r2=1476289&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/pdf.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/pdf.xml Fri Apr 26 16:55:35 2013
@@ -37,7 +37,7 @@
<item name="Appenders" ref="/manual/appenders.html"/>
<item name="Layouts" ref="/manual/layouts.html"/>
<item name="Filters" ref="/manual/filters.html"/>
- <item name="Async" ref="/manual/async.html" />
+ <item name="Async Loggers" ref="/manual/async.html" />
<item name="JMX" ref="/manual/jmx.html"/>
<item name="Logging Separation" ref="/manual/logsep.html"/>
<item name="Extending Log4j" ref="/manual/extending.html"/>
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/changelog.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/changelog.xml?rev=1476289&r1=1476288&r2=1476289&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/changelog.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/changelog.xml Fri Apr 26 16:55:35 2013
@@ -32,7 +32,7 @@
when upgrading to Log4j 2 in your project:</p>
<ul>
- <li>Java 5 is required</li>
+ <li>Java 6 is required</li>
<li>The XML configuration has been simplified and is not compatible with Log4j 1.x</li>
<li>Configuration via property files is not supported.</li>
<li>Configuration via JSON is supported.</li>
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/async.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/async.xml?rev=1476289&r1=1476288&r2=1476289&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/async.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/async.xml Fri Apr 26 16:55:35 2013
@@ -60,7 +60,7 @@
</li>
<li><b>LMAX Disruptor technology</b>. The Asynchronous Loggers
internally
- use the <a href="#UnderTheHood">Disruptor</a> inter-thread
+ use the <a href="#UnderTheHood">Disruptor</a> lock-free inter-thread
communication library instead of queues, resulting in higher
throughput and lower latency.</li>
</ul>
@@ -126,7 +126,7 @@
<p>
This is simplest to configure and gives the best performance.
To make all loggers asynchronous,
- add disruptor-3.0.0.jar to the classpath
+ add disruptor-3.0.0.jar or higher to the classpath
and set the system property <tt>Log4jContextSelector</tt>
to
<tt>org.apache.logging.log4j.core.async.AsyncLoggerContextSelector</tt>.
@@ -302,7 +302,7 @@
</subsection>
<a name="MixedSync-Async" />
<subsection name="Mixing Synchronous and Asynchronous Loggers">
- <p><i>Requires disruptor-3.0.0.jar on the classpath.</i></p>
+ <p><i>Requires disruptor-3.0.0.jar or higher on the classpath.</i></p>
<p>
Synchronous and asynchronous loggers can be combined in
configuration. This gives you more flexibility at the cost
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/index.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/index.xml?rev=1476289&r1=1476288&r2=1476289&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/index.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/index.xml Fri Apr 26 16:55:35 2013
@@ -88,7 +88,7 @@
Logback exceptions in Appenders are never visible to the application. In
Log4j 2 Appenders can be configured to allow the exception to percolate
to the application</li>
- <li>Log4j 2 contains next-generation Asynchronous Loggers based
+ <li>Log4j 2 contains next-generation lock-free Asynchronous Loggers based
on the LMAX Disruptor library. In multi-threaded scenarios
Asynchronous Loggers have 10 times higher throughput and
orders of magnitude lower latency than Log4j 1.x and Logback.</li>