You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2012/10/21 08:14:11 UTC
svn commit: r1400576 - in /logging/log4j/log4j2/trunk: ./ src/assembly/
src/site/ src/site/resources/ src/site/xdoc/ src/site/xdoc/manual/
Author: rgoers
Date: Sun Oct 21 06:14:10 2012
New Revision: 1400576
URL: http://svn.apache.org/viewvc?rev=1400576&view=rev
Log:
LOG4J2-87 - Create pdf of user's guide
Added:
logging/log4j/log4j2/trunk/src/assembly/
logging/log4j/log4j2/trunk/src/assembly/site.xml
logging/log4j/log4j2/trunk/src/site/pdf.xml
logging/log4j/log4j2/trunk/src/site/resources/pdf-config.xml
Modified:
logging/log4j/log4j2/trunk/pom.xml
logging/log4j/log4j2/trunk/src/site/xdoc/index.xml
logging/log4j/log4j2/trunk/src/site/xdoc/manual/api.xml
logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml
logging/log4j/log4j2/trunk/src/site/xdoc/manual/architecture.xml
logging/log4j/log4j2/trunk/src/site/xdoc/manual/configuration.xml
logging/log4j/log4j2/trunk/src/site/xdoc/manual/extending.xml
logging/log4j/log4j2/trunk/src/site/xdoc/manual/filters.xml
logging/log4j/log4j2/trunk/src/site/xdoc/manual/layouts.xml
logging/log4j/log4j2/trunk/src/site/xdoc/manual/plugins.xml
Modified: logging/log4j/log4j2/trunk/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/pom.xml?rev=1400576&r1=1400575&r2=1400576&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/pom.xml (original)
+++ logging/log4j/log4j2/trunk/pom.xml Sun Oct 21 06:14:10 2012
@@ -357,6 +357,23 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pdf-plugin</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>pdf</id>
+ <phase>site</phase>
+ <goals>
+ <goal>pdf</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<reporting>
@@ -474,10 +491,28 @@
</build>
</profile>
<profile>
- <id>include-flume-og</id>
- <modules>
- <module>flume-og</module>
- </modules>
+ <id>pdf</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pdf-plugin</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>pdf</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>pdf</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</profile>
<profile>
<id>release-notes</id>
Added: logging/log4j/log4j2/trunk/src/assembly/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/assembly/site.xml?rev=1400576&view=auto
==============================================================================
--- logging/log4j/log4j2/trunk/src/assembly/site.xml (added)
+++ logging/log4j/log4j2/trunk/src/assembly/site.xml Sun Oct 21 06:14:10 2012
@@ -0,0 +1,28 @@
+<!--
+ 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.
+-->
+<assembly>
+ <id>site</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>${stagingSiteURL}</directory>
+ <outputDirectory>${stagingSiteURL}</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Added: logging/log4j/log4j2/trunk/src/site/pdf.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/pdf.xml?rev=1400576&view=auto
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/pdf.xml (added)
+++ logging/log4j/log4j2/trunk/src/site/pdf.xml Sun Oct 21 06:14:10 2012
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+<!--
+ 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 xmlns="http://maven.apache.org/DOCUMENT/1.0.1"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DOCUMENT/1.0.1 http://maven.apache.org/xsd/document-1.0.1.xsd"
+ outputName="log4j-users-guide">
+
+ <meta>
+ <title>Apache Log4j 2</title>
+ <author>The Apache Logging Project</author>
+ </meta>
+
+ <toc name="Table of Contents">
+ <item name="Introduction" ref="/manual/index.html"/>
+ <item name="Architecture" ref="/manual/architecture.html"/>
+ <item name="Log4j 1.x Migration" ref="manual/migration.html"/>
+ <item name="API" ref="/manual/api.html"/>
+ <item name="Configuration" ref="/manual/configuration.html"/>
+ <item name="Plugins" ref="/manual/plugins.html"/>
+ <item name="Lookups" ref="/manual/lookups.html"/>
+ <item name="Appenders" ref="/manual/appenders.html"/>
+ <item name="Layouts" ref="/manual/layouts.html"/>
+ <item name="Filters" ref="/manual/filters.html"/>
+ <item name="JMX" ref="/manual/jmx.html"/>
+ <item name="Logging Separation" ref="/manual/logsep.html"/>
+ <item name="Extending Log4j" ref="/manual/extending.html"/>
+ </toc>
+
+ <cover>
+ <coverTitle>${project.name}</coverTitle>
+ <coverSubTitle>v. ${project.version}</coverSubTitle>
+ <coverType>User's Guide</coverType>
+ <projectName>${project.name}</projectName>
+ <projectLogo>http://logging.apache.org/log4j/2.x/images/logo.jpg</projectLogo>
+ <companyName>The Apache Software Foundation</companyName>
+ <companyLogo>http://www.apache.org/images/asf_logo_wide.png</companyLogo>
+ </cover>
+</document>
\ No newline at end of file
Added: logging/log4j/log4j2/trunk/src/site/resources/pdf-config.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/resources/pdf-config.xml?rev=1400576&view=auto
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/resources/pdf-config.xml (added)
+++ logging/log4j/log4j2/trunk/src/site/resources/pdf-config.xml Sun Oct 21 06:14:10 2012
@@ -0,0 +1,37 @@
+<?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.
+-->
+
+<!-- START SNIPPET: foConfig -->
+<xsl:stylesheet
+ version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:fo="http://www.w3.org/1999/XSL/Format">
+
+ <xsl:attribute-set name="body.pre" use-attribute-sets="base.pre.style">
+ <xsl:attribute name="font-size">8pt</xsl:attribute>
+ </xsl:attribute-set>
+ <xsl:attribute-set name="body.source" use-attribute-sets="body.pre">
+ <xsl:attribute name="color">black</xsl:attribute>
+ <xsl:attribute name="start-indent">inherited-property-value(start-indent) + 1.5em</xsl:attribute>
+ <xsl:attribute name="end-indent">inherited-property-value(end-indent) + 1.5em</xsl:attribute>
+ </xsl:attribute-set>
+</xsl:stylesheet>
+ <!-- END SNIPPET: foConfig -->
\ No newline at end of file
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=1400576&r1=1400575&r2=1400576&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/index.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/index.xml Sun Oct 21 06:14:10 2012
@@ -75,9 +75,13 @@
Map, and data present in the event. Users can further customize the property providers by
adding their own <a href="../lookups.html">Lookup</a> Plugin.
</p>
-
</section>
+ <section name="Documentation">
+ <p>The Log4j 2 User's Guide is available on this <a href="manual/index.html">site</a> or as a downloadable
+ <a href="log4j-users-guide.pdf">PDF</a>
+ </p>.
+ </section>
<section name="Requirements">
<p>
Log4j 2 requires Java 5 but will take advantage of enhancements in Java 6 to improve performance.
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/api.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/api.xml?rev=1400576&r1=1400575&r2=1400576&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/api.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/api.xml Sun Oct 21 06:14:10 2012
@@ -40,15 +40,15 @@
write the "Hello, World!" message, however the message will be written only if the Logger is
configured to allow informational messages.
</p>
- <source> import org.apache.logging.log4j.LogManager;
- import org.apache.logging.log4j.Logger;
+ <source>import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
- public class HelloWorld {
- private static Logger logger = LogManager.getLogger("HelloWorld");
- public static void main(String[] args) {
- logger.info("Hello, World!");
- }
- }</source>
+public class HelloWorld {
+ private static Logger logger = LogManager.getLogger("HelloWorld");
+ public static void main(String[] args) {
+ logger.info("Hello, World!");
+ }
+}</source>
<p>
The output from the call to logger.info() will vary significantly depending on the configuration
used. See the <a href="./configuration.html">Configuration</a> section for more details.
@@ -59,15 +59,15 @@
which requires including information about the objects being manipulated. In Log4j 1.x this could
be accomplished by doing:
</p>
- <source> if (logger.isDebugEnabled()) {
- logger.debug("Logging in user " + user.getName() + " with id " + user.getId());
- }</source>
+ <source>if (logger.isDebugEnabled()) {
+ logger.debug("Logging in user " + user.getName() + " with id " + user.getId());
+}</source>
<p>
Doing this repeatedly has the effect of making the code feel like it is more about logging than the
actual task at hand. In addition, it results in the logging level being checked twice; once on the
call to isDebugEnabled and once on the debug method. A better alternative would be:
</p>
- <source> logger.debug("Logging in user {} with id {}", user.getName(), user.getId());</source>
+ <source>logger.debug("Logging in user {} with id {}", user.getName(), user.getId());</source>
<p>
With the code above the logging level will only be checked once and the String construction will
only occur when debug logging is enabled.
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml?rev=1400576&r1=1400575&r2=1400576&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml Sun Oct 21 06:14:10 2012
@@ -235,7 +235,8 @@
<source><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<configuration status="warn" name="MyApp" packages="">
<appenders>
- <RollingFile name="RollingFile" fileName="logs/app.log" filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
+ <RollingFile name="RollingFile" fileName="logs/app.log"
+ filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
<PatternLayout>
<pattern>%d %p %C{1.} [%t] %m%n</pattern>
</PatternLayout>
@@ -684,7 +685,8 @@
<source><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<configuration status="warn" name="MyApp" packages="">
<appenders>
- <JMSQueue name="jmsQueue" queueBindingName="MyQueue" factoryBindingName="MyQueueConnectionFactory"/>
+ <JMSQueue name="jmsQueue" queueBindingName="MyQueue"
+ factoryBindingName="MyQueueConnectionFactory"/>
</appenders>
<loggers>
<root level="error">
@@ -793,7 +795,8 @@
<source><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<configuration status="warn" name="MyApp" packages="">
<appenders>
- <JMSTopic name="jmsTopic" topicBindingName="MyTopic" factoryBindingName="MyTopicConnectionFactory"/>
+ <JMSTopic name="jmsTopic" topicBindingName="MyTopic"
+ factoryBindingName="MyTopicConnectionFactory"/>
</appenders>
<loggers>
<root level="error">
@@ -1100,7 +1103,7 @@
<configuration status="warn" name="MyApp" packages="">
<appenders>
<RollingFile name="RollingFile" fileName="logs/app.log"
- filePattern="logs/$${date:yyyy-MM}/app-%d{MM-dd-yyyy}-%i.log.gz">
+ filePattern="logs/$${date:yyyy-MM}/app-%d{MM-dd-yyyy}-%i.log.gz">
<PatternLayout>
<pattern>%d %p %C{1.} [%t] %m%n</pattern>
</PatternLayout>
@@ -1124,7 +1127,7 @@
<configuration status="warn" name="MyApp" packages="">
<appenders>
<RollingFile name="RollingFile" fileName="logs/app.log"
- filePattern="logs/$${date:yyyy-MM}/app-%d{MM-dd-yyyy}-%i.log.gz">
+ filePattern="logs/$${date:yyyy-MM}/app-%d{MM-dd-yyyy}-%i.log.gz">
<PatternLayout>
<pattern>%d %p %C{1.} [%t] %m%n</pattern>
</PatternLayout>
@@ -1153,7 +1156,7 @@
<configuration status="warn" name="MyApp" packages="">
<appenders>
<RollingFile name="RollingFile" fileName="logs/app.log"
- filePattern="logs/$${date:yyyy-MM}/app-%d{yyyy-MM-dd-HH}-%i.log.gz">
+ filePattern="logs/$${date:yyyy-MM}/app-%d{yyyy-MM-dd-HH}-%i.log.gz">
<PatternLayout>
<pattern>%d %p %C{1.} [%t] %m%n</pattern>
</PatternLayout>
@@ -1502,8 +1505,10 @@
<configuration status="warn" name="MyApp" packages="">
<appenders>
<Syslog name="bsd" host="localhost" port="514" protocol="TCP"/>
- <Syslog name="RFC5424" format="RFC5424" host="localhost" port="8514" protocol="TCP" appName="MyApp" includeMDC="true"
- facility="LOCAL0" enterpriseNumber="18060" newLine="true" messageId="Audit" id="App"/>
+ <Syslog name="RFC5424" format="RFC5424" host="localhost" port="8514"
+ protocol="TCP" appName="MyApp" includeMDC="true"
+ facility="LOCAL0" enterpriseNumber="18060" newLine="true"
+ messageId="Audit" id="App"/>
</appenders>
<loggers>
<logger name="com.mycorp" level="error">
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/architecture.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/architecture.xml?rev=1400576&r1=1400575&r2=1400576&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/architecture.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/architecture.xml Sun Oct 21 06:14:10 2012
@@ -399,12 +399,12 @@
</p>
<table width="100%">
<tr>
- <th style="background-color:cyan; color:black" rowspan="2">Event Level</th>
+ <th style="background-color:cyan; color:black">Event Level</th>
<th style="background-color:cyan; color:black; border-top: 1px solid #DDDDDD;"
- align="center" colspan="6">LoggerConfig Level
- </th>
+ align="center" colspan="6">LoggerConfig Level</th>
</tr>
<tr align="left">
+ <th style="background-color:cyan; color:black"> </th>
<th style="background-color:cyan; color:black">TRACE</th>
<th style="background-color:cyan; color:black">DEBUG</th>
<th style="background-color:cyan; color:black">INFO</th>
@@ -628,9 +628,7 @@
<p>For example, the PatternLayout with the conversion pattern "%r [%t]
%-5p %c - %m%n" will output something akin to:<br />
- <source>
- 176 [main] INFO org.foo.Bar - Located nearest gas station.
- </source>
+ <source>176 [main] INFO org.foo.Bar - Located nearest gas station.</source>
</p>
<p>The first field is the number of milliseconds elapsed since the
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/configuration.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/configuration.xml?rev=1400576&r1=1400575&r2=1400576&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/configuration.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/configuration.xml Sun Oct 21 06:14:10 2012
@@ -393,7 +393,8 @@
Below is a sample configuration using the strict format.
</p>
<source><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="debug" strict="true" name="XMLConfigTest" packages="org.apache.logging.log4j.test">
+<configuration status="debug" strict="true" name="XMLConfigTest"
+ packages="org.apache.logging.log4j.test">
<properties>
<property name="filename">target/test.log</property>
</properties>
@@ -450,9 +451,11 @@
plugins while the Console plugin will be assigned a value of STDOUT for its name attribute and the
ThresholdFilter will be assigned a level of debug.
</p>
- <source>{ "configuration": { "status": "error", "name": "RoutingTest", "packages": "org.apache.logging.log4j.test",
+ <source>{ "configuration": { "status": "error", "name": "RoutingTest",
+ "packages": "org.apache.logging.log4j.test",
"properties": {
- "property": { "name": "filename", "value" : "target/rolling1/rollingtest-$${sd:type}.log" }
+ "property": { "name": "filename",
+ "value" : "target/rolling1/rollingtest-$${sd:type}.log" }
},
"ThresholdFilter": { "level": "debug" },
"appenders": {
@@ -480,7 +483,8 @@
}
},
"loggers": {
- "logger": { "name": "EventLogger", "level": "info", "additivity": "false", "appender-ref": { "ref": "Routing" }},
+ "logger": { "name": "EventLogger", "level": "info", "additivity": "false",
+ "appender-ref": { "ref": "Routing" }},
"root": { "level": "error", "appender-ref": { "ref": "STDOUT" }}
}
}
@@ -493,9 +497,11 @@
that contains the type of the appender. The following example illustrates this as well as how to
declare multiple loggers as an array.
</p>
- <source>{ "configuration": { "status": "debug", "name": "RoutingTest", "packages": "org.apache.logging.log4j.test",
+ <source>{ "configuration": { "status": "debug", "name": "RoutingTest",
+ "packages": "org.apache.logging.log4j.test",
"properties": {
- "property": { "name": "filename", "value" : "target/rolling1/rollingtest-$${sd:type}.log" }
+ "property": { "name": "filename",
+ "value" : "target/rolling1/rollingtest-$${sd:type}.log" }
},
"ThresholdFilter": { "level": "debug" },
"appenders": {
@@ -522,8 +528,10 @@
},
"loggers": {
"logger": [
- { "name": "EventLogger", "level": "info", "additivity": "false", "appender-ref": { "ref": "Routing" }},
- { "name": "com.foo.bar", "level": "error", "additivity": "false", "appender-ref": { "ref": "Console" }}
+ { "name": "EventLogger", "level": "info", "additivity": "false",
+ "appender-ref": { "ref": "Routing" }},
+ { "name": "com.foo.bar", "level": "error", "additivity": "false",
+ "appender-ref": { "ref": "Console" }}
],
"root": { "level": "error", "appender-ref": { "ref": "STDOUT" }}
}
@@ -604,7 +612,8 @@
shows how multiple filters can be configured on the ConsoleAppender.
</p>
<source><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="debug" name="XMLConfigTest" packages="org.apache.logging.log4j.test">
+<configuration status="debug" name="XMLConfigTest"
+ packages="org.apache.logging.log4j.test">
<properties>
<property name="filename">target/test.log</property>
</properties>
@@ -668,7 +677,8 @@
shows the filename for the rolling file appender being declared as a property.
</p>
<source><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="debug" name="RoutingTest" packages="org.apache.logging.log4j.test">
+<configuration status="debug" name="RoutingTest"
+ packages="org.apache.logging.log4j.test">
<properties>
<property name="filename">target/rolling1/rollingtest-$${sd:type}.log</property>
</properties>
@@ -800,7 +810,8 @@
configuration has the status attribute set to debug.
<source><![CDATA[<?xml version="1.0" encoding="UTF-8"?>;
-<configuration status="debug" name="RoutingTest" packages="org.apache.logging.log4j.test">
+<configuration status="debug" name="RoutingTest"
+ packages="org.apache.logging.log4j.test">
<properties>
<property name="filename">target/rolling1/rollingtest-$${sd:type}.log</property>
</properties>
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=1400576&r1=1400575&r2=1400576&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/extending.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/extending.xml Sun Oct 21 06:14:10 2012
@@ -290,7 +290,8 @@ public final class ThresholdFilter exten
@Plugin(name = "Stub", type = "Core", elementType = "appender", printObject = true)
public final class StubAppender extends OutputStreamAppender {
- private StubAppender(String name, Layout layout, Filter filter, StubManager manager, boolean handleExceptions) {
+ private StubAppender(String name, Layout layout, Filter filter, StubManager manager,
+ boolean handleExceptions) {
}
@PluginFactory
@@ -336,7 +337,8 @@ public final class StubAppender extends
@Plugin(name = "SampleLayout", type = "Core", elementType = "layout", printObject = true)
public class SampleLayout extends AbstractStringLayout {
- protected SampleLayout(boolean locationInfo, boolean properties, boolean complete, Charset charset) {
+ protected SampleLayout(boolean locationInfo, boolean properties, boolean complete,
+ Charset charset) {
}
@PluginFactory
@@ -344,12 +346,14 @@ public class SampleLayout extends Abstra
@PluginAttr("properties") String properties,
@PluginAttr("complete") String complete,
@PluginAttr("charset") String charset) {
- Charset c = Charset.isSupported("UTF-8") ? Charset.forName("UTF-8") : Charset.defaultCharset();
+ Charset c = Charset.isSupported("UTF-8") ?
+ Charset.forName("UTF-8") : Charset.defaultCharset();
if (charset != null) {
if (Charset.isSupported(charset)) {
c = Charset.forName(charset);
} else {
- LOGGER.error("Charset " + charset + " is not supported for layout, using " + c.displayName());
+ LOGGER.error("Charset " + charset + " is not supported for layout, using " +
+ c.displayName());
}
}
boolean info = locationInfo == null ? false : Boolean.valueOf(locationInfo);
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/filters.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/filters.xml?rev=1400576&r1=1400575&r2=1400576&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/filters.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/filters.xml Sun Oct 21 06:14:10 2012
@@ -98,7 +98,8 @@
<source><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<configuration status="warn" name="MyApp" packages="">
<appenders>
- <RollingFile name="RollingFile" fileName="logs/app.log" filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
+ <RollingFile name="RollingFile" fileName="logs/app.log"
+ filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
<BurstFilter level="INFO" rate="16" maxBurst="100"/>
<PatternLayout>
<pattern>%d %p %C{1.} [%t] %m%n</pattern>
@@ -129,7 +130,8 @@
<configuration status="warn" name="MyApp" packages="">
<filters>
<Marker marker="EVENT" onMatch="ACCEPT" onMismatch="NETURAL"/>
- <DynamicThresholdFilter key="loginId" defaultThreshold="ERROR" onMatch="ACCEPT" onMismatch="NEUTRAL">
+ <DynamicThresholdFilter key="loginId" defaultThreshold="ERROR"
+ onMatch="ACCEPT" onMismatch="NEUTRAL">
<KeyValuePair key="User1" value="DEBUG"/>
</DynamicThresholdFilter>
</filters>
@@ -139,7 +141,8 @@
<pattern>%d %p %C{1.} [%t] %m%n</pattern>
</PatternLayout>
</File>
- <RollingFile name="RollingFile" fileName="logs/app.log" filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
+ <RollingFile name="RollingFile" fileName="logs/app.log"
+ filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
<BurstFilter level="INFO" rate="16" maxBurst="100"/>
<PatternLayout>
<pattern>%d %p %C{1.} [%t] %m%n</pattern>
@@ -203,11 +206,13 @@
<source><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<configuration status="warn" name="MyApp" packages="">
- <DynamicThresholdFilter key="loginId" defaultThreshold="ERROR" onMatch="ACCEPT" onMismatch="NEUTRAL">
+ <DynamicThresholdFilter key="loginId" defaultThreshold="ERROR"
+ onMatch="ACCEPT" onMismatch="NEUTRAL">
<KeyValuePair key="User1" value="DEBUG"/>
</DynamicThresholdFilter>
<appenders>
- <RollingFile name="RollingFile" fileName="logs/app.log" filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
+ <RollingFile name="RollingFile" fileName="logs/app.log"
+ filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
<BurstFilter level="INFO" rate="16" maxBurst="100"/>
<PatternLayout>
<pattern>%d %p %C{1.} [%t] %m%n</pattern>
@@ -271,7 +276,8 @@
<KeyValuePari key="eventId" value="Logout"/>
</MapFilter>
<appenders>
- <RollingFile name="RollingFile" fileName="logs/app.log" filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
+ <RollingFile name="RollingFile" fileName="logs/app.log"
+ filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
<BurstFilter level="INFO" rate="16" maxBurst="100"/>
<PatternLayout>
<pattern>%d %p %C{1.} [%t] %m%n</pattern>
@@ -294,7 +300,8 @@
<source><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<configuration status="warn" name="MyApp" packages="">
<appenders>
- <RollingFile name="RollingFile" fileName="logs/app.log" filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
+ <RollingFile name="RollingFile" fileName="logs/app.log"
+ filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
<BurstFilter level="INFO" rate="16" maxBurst="100"/>
<PatternLayout>
<pattern>%d %p %C{1.} [%t] %m%n</pattern>
@@ -322,7 +329,8 @@
<source><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<configuration status="warn" name="MyApp" packages="">
<appenders>
- <RollingFile name="RollingFile" fileName="logs/app.log" filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
+ <RollingFile name="RollingFile" fileName="logs/app.log"
+ filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
<BurstFilter level="INFO" rate="16" maxBurst="100"/>
<PatternLayout>
<pattern>%d %p %C{1.} [%t] %m%n</pattern>
@@ -383,7 +391,8 @@
<source><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<configuration status="warn" name="MyApp" packages="">
<appenders>
- <RollingFile name="RollingFile" fileName="logs/app.log" filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
+ <RollingFile name="RollingFile" fileName="logs/app.log"
+ filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
<MarkerFilter marker="FLOW" onMatch="ACCEPT" onMismatch="DENY"/>
<PatternLayout>
<pattern>%d %p %C{1.} [%t] %m%n</pattern>
@@ -443,7 +452,8 @@
<source><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<configuration status="warn" name="MyApp" packages="">
<appenders>
- <RollingFile name="RollingFile" fileName="logs/app.log" filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
+ <RollingFile name="RollingFile" fileName="logs/app.log"
+ filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
<RegexFilter regex=".* test .*" onMatch="ACCEPT" onMismatch="DENY"/>
<PatternLayout>
<pattern>%d %p %C{1.} [%t] %m%n</pattern>
@@ -510,7 +520,8 @@
<KeyValuePari key="id" value="Logout"/>
</StructuredDataFilter>
<appenders>
- <RollingFile name="RollingFile" fileName="logs/app.log" filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
+ <RollingFile name="RollingFile" fileName="logs/app.log"
+ filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
<BurstFilter level="INFO" rate="16" maxBurst="100"/>
<PatternLayout>
<pattern>%d %p %C{1.} [%t] %m%n</pattern>
@@ -569,11 +580,13 @@
<source><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<configuration status="warn" name="MyApp" packages="">
- <DynamicThresholdFilter key="loginId" defaultThreshold="ERROR" onMatch="ACCEPT" onMismatch="NEUTRAL">
+ <DynamicThresholdFilter key="loginId" defaultThreshold="ERROR"
+ onMatch="ACCEPT" onMismatch="NEUTRAL">
<KeyValuePair key="User1" value="DEBUG"/>
</DynamicThresholdFilter>
<appenders>
- <RollingFile name="RollingFile" fileName="logs/app.log" filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
+ <RollingFile name="RollingFile" fileName="logs/app.log"
+ filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
<BurstFilter level="INFO" rate="16" maxBurst="100"/>
<PatternLayout>
<pattern>%d %p %C{1.} [%t] %m%n</pattern>
@@ -630,7 +643,8 @@
<source><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<configuration status="warn" name="MyApp" packages="">
<appenders>
- <RollingFile name="RollingFile" fileName="logs/app.log" filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
+ <RollingFile name="RollingFile" fileName="logs/app.log"
+ filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
<ThresholdFilter level="TRACE" onMatch="ACCEPT" onMismatch="DENY"/>
<PatternLayout>
<pattern>%d %p %C{1.} [%t] %m%n</pattern>
@@ -700,7 +714,8 @@
<source><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<configuration status="warn" name="MyApp" packages="">
<appenders>
- <RollingFile name="RollingFile" fileName="logs/app.log" filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
+ <RollingFile name="RollingFile" fileName="logs/app.log"
+ filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
<TiemFilter start="05:00:00" end="05:30:00" onMatch="ACCEPT" onMismatch="DENY"/>
<PatternLayout>
<pattern>%d %p %C{1.} [%t] %m%n</pattern>
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/layouts.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/layouts.xml?rev=1400576&r1=1400575&r2=1400576&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/layouts.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/layouts.xml Sun Oct 21 06:14:10 2012
@@ -731,28 +731,24 @@
<p>
This example shows how to filter out classes from unimportant packages in stack traces.
</p>
- <source><![CDATA[
- <properties>
- <property name="filters">org.junit,org.apache.maven,sun.reflect,java.lang.reflect</property>
- </properties>
+ <source><![CDATA[<properties>
+ <property name="filters">org.junit,org.apache.maven,sun.reflect,java.lang.reflect</property>
+</properties>
.
.
- <PatternLayout pattern="%m%xEx{filters(${filters})}%n"/>
+ <PatternLayout pattern="%m%xEx{filters(${filters})}%n"/>
]]></source>
<p>
The result printed to the console will appear similar to:
</p>
- <source>
- Exception java.lang.IllegalArgumentException: IllegalArgument
- at org.apache.logging.log4j.core.pattern.ExtendedThrowableTest.testException(ExtendedThrowableTest.java:72) [test-classes/:?]
- ... suppressed 26 lines
- at $Proxy0.invoke(Unknown Source) [?:?]
- ... suppressed 3 lines
- Caused by: java.lang.NullPointerException: null pointer
- at org.apache.logging.log4j.core.pattern.ExtendedThrowableTest.testException(ExtendedThrowableTest.java:71) ~[test-classes/:?]
- ... 30 more
-
- </source>
+ <source>Exception java.lang.IllegalArgumentException: IllegalArgument
+at org.apache.logging.log4j.core.pattern.ExtendedThrowableTest.testException(ExtendedThrowableTest.java:72) [test-classes/:?]
+... suppressed 26 lines
+at $Proxy0.invoke(Unknown Source) [?:?]
+... suppressed 3 lines
+Caused by: java.lang.NullPointerException: null pointer
+at org.apache.logging.log4j.core.pattern.ExtendedThrowableTest.testException(ExtendedThrowableTest.java:71) ~[test-classes/:?]
+... 30 more</source>
<h5>Ansi Styled</h5>
<p>The log level will be highlighted according to the event's log level. All the content that follows
the level will be bright green.</p>
@@ -929,7 +925,7 @@
<!DOCTYPE log4j:eventSet SYSTEM "log4j.dtd" [<!ENTITY data SYSTEM "abc">]>
*
<log4j:eventSet version="2.0" xmlns:log4j="http://logging.apache.org/log4j/">
- &data;
+
</log4j:eventSet>
</pre>
<p>
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/plugins.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/plugins.xml?rev=1400576&r1=1400575&r2=1400576&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/plugins.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/plugins.xml Sun Oct 21 06:14:10 2012
@@ -109,28 +109,26 @@
following plugin definition to your project's pom.xml will cause the plugin manager to be called during the
build. It will store the resulting file in the correct location under the directory specified in the first
argument after scanning all the components located under the package specified in the second argument.
- <source><![CDATA[
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <goals>
- <goal>java</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <mainClass>org.apache.logging.log4j.core.config.plugins.PluginManager</mainClass>
- <arguments>
- <argument>${project.build.outputDirectory}</argument>
- <argument>org.myorg.myproject.log4j</argument>
- </arguments>
- </configuration>
- </plugin>
- ]]></source>
+ <source><![CDATA[<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2.1</version>
+ <executions>
+ <execution>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <mainClass>org.apache.logging.log4j.core.config.plugins.PluginManager</mainClass>
+ <arguments>
+ <argument>${project.build.outputDirectory}</argument>
+ <argument>org.myorg.myproject.log4j</argument>
+ </arguments>
+ </configuration>
+</plugin>]]></source>
</subsection>
</section>
</body>