Author: rgoers
Date: Sun Apr 29 19:25:29 2012
New Revision: 1331980

URL: http://svn.apache.org/viewvc?rev=1331980&view=rev
Log:
change all Log4j2 instances to Log4j 2

Modified:
    logging/log4j/log4j2/trunk/src/site/xdoc/build.xml
    logging/log4j/log4j2/trunk/src/site/xdoc/changelog.xml
    logging/log4j/log4j2/trunk/src/site/xdoc/index.xml
    logging/log4j/log4j2/trunk/src/site/xdoc/performance.xml

Modified: logging/log4j/log4j2/trunk/src/site/xdoc/build.xml
URL: 
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/build.xml?rev=1331980&r1=1331979&r2=1331980&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/build.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/build.xml Sun Apr 29 19:25:29 2012
@@ -28,4 +28,4 @@
 
                </section>
        </body>
-</document>
\ No newline at end of file
+</document>

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=1331980&r1=1331979&r2=1331980&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/changelog.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/changelog.xml Sun Apr 29 19:25:29 
2012
@@ -29,20 +29,20 @@
                                <param name="fromDepth" value="2"/>
                        </macro>
 
-                       <subsection name="Apache Log4j2" id="Apache_Log4j2">
+                       <subsection name="Apache Log4j 2" id="Apache_Log4j 2">
 
                                <p>Release date: TBA</p>
                                <p><a 
href="changes-report.html#a1.0-alpha1">JIRA change log</a></p>
 
-                               <p>Apache Log4j2 is not compatible with the 
previous versions. Please have the following in mind
-                               when upgrading to Log4j2 in your project:</p>
+                               <p>Apache Log4j 2 is not compatible with the 
previous versions. Please have the following in mind
+                               when upgrading to Log4j 2 in your project:</p>
 
                                <ul>
                                        <li>Java 5 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>
-          <li>Although Log4j2 is not directly compatible with Log4j 1.x and 
compatibility bridge
+          <li>Although Log4j 2 is not directly compatible with Log4j 1.x and 
compatibility bridge
             has been provided to reduce the need to make coding changes.</li>
                                </ul>
                        </subsection>

Modified: logging/log4j/log4j2/trunk/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/index.xml?rev=1331980&r1=1331979&r2=1331980&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/index.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/index.xml Sun Apr 29 19:25:29 2012
@@ -23,15 +23,15 @@
     </properties>
 
     <body>
-        <section name="About Log4j2">
+        <section name="About Log4j 2">
 
             <p>
-              Log4j2 is an upgrade to Log4j that provides significant 
improvements over its predecessor, Log4j
+              Log4j 2 is an upgrade to Log4j that provides significant 
improvements over its predecessor, Log4j
               1.x, and provides many of the improvements available in Logback 
while fixing some inherent problems in
               Logback's architecture.
             </p>
 
-            <p>Some of the features and improvements in Log4j2 are:</p>
+            <p>Some of the features and improvements in Log4j 2 are:</p>
 
             <h3>API Separation</h3>
             <p>
@@ -46,17 +46,17 @@
             </p>
             <h3>Support for multiple APIs</h3>
             <p>
-              While the Log4j2 API will provide the best performance, support 
for the SL4J and Commons Logging
+              While the Log4j 2 API will provide the best performance, support 
for the SL4J and Commons Logging
               APIs are provided.
             </p>
             <h3>Automatic Reloading of Configurations</h3>
             <p>
-              Like Logback, Log4j2 can automatically reload its configuration 
upon modification. Unlike Logback,
+              Like Logback, Log4j 2 can automatically reload its configuration 
upon modification. Unlike Logback,
               it will do so without losing log events while reconfiguration is 
taking place.
             </p>
             <h3>Advanced Filtering</h3>
             <p>
-              Like Logback, Log4j2 supports filtering based on context data, 
markers, regular expressions and
+              Like Logback, Log4j 2 supports filtering based on context data, 
markers, regular expressions and
               other components in the Log event and can be specified to apply 
to all events before being passed
               to Loggers or as they pass through appenders. In addition, 
filters can also be associated with
               Loggers. Unlike Logback, a common Filter class can be used in 
any of these circumstances.
@@ -80,7 +80,7 @@
 
         <section name="Requirements">
            <p>
-             Log4j2 requires Java 5 but has will take advantage of 
enhancements in Java 6 to improve performance.
+             Log4j 2 requires Java 5 but has will take advantage of 
enhancements in Java 6 to improve performance.
              Some features may require optional dependencies. These 
dependencies are
              specified in the documentation for those features.
           </p>
@@ -88,7 +88,7 @@
 
         <section name="News">
           <p>
-            Log4j2 is now available for testing. The API for Log4j2 is not 
compatible with Log4j 1.x, however an adapter
+            Log4j 2 is now available for testing. The API for Log4j 2 is not 
compatible with Log4j 1.x, however an adapter
             is available to allow applications to continue to use the Log4j 
1.x API. Adapters are also available for
             Commons Logging and SLF4J.
           </p>

Modified: logging/log4j/log4j2/trunk/src/site/xdoc/performance.xml
URL: 
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/performance.xml?rev=1331980&r1=1331979&r2=1331980&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/performance.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/performance.xml Sun Apr 29 
19:25:29 2012
@@ -41,7 +41,7 @@
             <pre>
             Log4j: 4
             Logback: 5
-            Log4j2: 3
+            Log4j 2: 3
             </pre>
             The numbers above will vary slightly from run to run so the only 
conclusion that should be
             drawn is that all 3 frameworks perform similarly on this task.
@@ -63,7 +63,7 @@
             <pre>
             Log4j: 188
             Logback: 183
-            Log4j2: 188
+            Log4j 2: 188
             </pre>
 
             Again, no conclusion should be drawn regarding relative 
differences between the frameworks on
@@ -71,7 +71,7 @@
             the level.
           </p>
           <p>
-            The best approach to avoid the cost of parameter construction is 
to use Log4j2's formatting
+            The best approach to avoid the cost of parameter construction is 
to use Log4j 2's formatting
             capabilities. For example, instead of the above write:
             <pre>
             logger.debug("Entry number: {} is {}", i, entry[i]);
@@ -80,7 +80,7 @@
             <pre>
             Log4j: Not supported
             Logback: 9
-            Log4j2: 4
+            Log4j 2: 4
             </pre>
             These results show that the difference in performance between the 
call to isDebugEnabled and
             logger.debug is barely discernable.
@@ -122,14 +122,14 @@
           <br/>
           <p>This is the cost of formatting the log output and sending it to 
its target destination. Here again,
             a serious effort was made to make layouts (formatters) perform as 
quickly as possible. The same
-            is true for appenders. One of the fundamental tenants of Log4j2 is 
to use immutable objects whenever
+            is true for appenders. One of the fundamental tenants of Log4j 2 
is to use immutable objects whenever
             possible and to lock at the lowest granularity possible. However, 
the cost of actually formatting and
             delivering log events will never be insignificant. For example, 
the results of writing to a simple log
             file using the same format using Log4j, Logback and Log4j 2 are:
             <pre>
             Log4j: 4220
             Logback: 9671
-            Log4j2: 4615
+            Log4j 2: 4615
             </pre>
           </p>
           <p>
@@ -206,4 +206,4 @@
       </p>
     </section>
   </body>
-</document>
\ No newline at end of file
+</document>


Reply via email to