You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2014/10/05 04:37:05 UTC
[1/6] git commit: Rename library version properties for use in
Velocity.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 3b7e3b52c -> 8ada03b73
Rename library version properties for use in Velocity.
- Since Velocity can't use variables with dots, these library
version properties should not use them so we can use them in .vm
manual pages.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/fa806deb
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/fa806deb
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/fa806deb
Branch: refs/heads/master
Commit: fa806debaebea9e2f023f2030561b9680d5d132e
Parents: 3b7e3b5
Author: Matt Sicker <ma...@apache.org>
Authored: Sat Oct 4 20:50:16 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Sat Oct 4 20:50:16 2014 -0500
----------------------------------------------------------------------
log4j-samples/pom.xml | 6 ++---
pom.xml | 62 +++++++++++++++++++++++-----------------------
2 files changed, 34 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/fa806deb/log4j-samples/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-samples/pom.xml b/log4j-samples/pom.xml
index e3af67a..3065723 100644
--- a/log4j-samples/pom.xml
+++ b/log4j-samples/pom.xml
@@ -46,17 +46,17 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
+ <version>${springVersion}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
+ <version>${springVersion}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
- <version>${spring.version}</version>
+ <version>${springVersion}</version>
</dependency>
<dependency>
<groupId>org.springframework.ws</groupId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/fa806deb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 82250a8..a4a255a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,13 +159,13 @@
<Log4jReleaseManager>Matt Sicker</Log4jReleaseManager>
<Log4jReleaseKey>FA1C814D</Log4jReleaseKey>
<!-- note that any properties you want available in velocity templates must not use periods! -->
- <slf4j.version>1.7.7</slf4j.version>
- <logback.version>1.1.2</logback.version>
- <jackson1.version>1.9.13</jackson1.version>
- <jackson2.version>2.4.2</jackson2.version>
- <spring.version>3.2.11.RELEASE</spring.version>
+ <slf4jVersion>1.7.7</slf4jVersion>
+ <logbackVersion>1.1.2</logbackVersion>
+ <jackson1Version>1.9.13</jackson1Version>
+ <jackson2Version>2.4.2</jackson2Version>
+ <springVersion>3.2.11.RELEASE</springVersion>
<flumeVersion>1.5.0.1</flumeVersion>
- <disruptor.version>3.3.0</disruptor.version>
+ <disruptorVersion>3.3.0</disruptorVersion>
<pmd.plugin.version>3.2</pmd.plugin.version>
<findbugs.plugin.version>2.5.5</findbugs.plugin.version>
<changes.plugin.version>2.11</changes.plugin.version>
@@ -184,7 +184,7 @@
<maven.compile.target>1.6</maven.compile.target>
<docLabel>Site Documentation</docLabel>
<projectDir />
- <commons.logging.version>1.2</commons.logging.version>
+ <commonsLoggingVersion>1.2</commonsLoggingVersion>
<osgi.api.version>4.3.1</osgi.api.version>
<activemq.version>5.10.0</activemq.version>
<!-- Allow Clirr severity to be overriden by the command-line option -DminSeverity=level -->
@@ -201,24 +201,24 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
+ <version>${slf4jVersion}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-ext</artifactId>
- <version>${slf4j.version}</version>
+ <version>${slf4jVersion}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
- <version>${logback.version}</version>
+ <version>${logbackVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<type>test-jar</type>
- <version>${logback.version}</version>
+ <version>${logbackVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -249,13 +249,13 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
+ <version>${logbackVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
+ <version>${logbackVersion}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -296,7 +296,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
+ <version>${commonsLoggingVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -475,13 +475,13 @@
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
- <version>${jackson1.version}</version>
+ <version>${jackson1Version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
- <version>${jackson1.version}</version>
+ <version>${jackson1Version}</version>
<scope>runtime</scope>
</dependency>
<!-- Jackson 1 end -->
@@ -489,31 +489,31 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>${jackson2.version}</version>
+ <version>${jackson2Version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson2.version}</version>
+ <version>${jackson2Version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
- <version>${jackson2.version}</version>
+ <version>${jackson2Version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
- <version>${jackson2.version}</version>
+ <version>${jackson2Version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
- <version>${jackson2.version}</version>
+ <version>${jackson2Version}</version>
<optional>true</optional>
</dependency>
<!-- Jackson 2 end -->
@@ -554,7 +554,7 @@
<dependency>
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
- <version>${disruptor.version}</version>
+ <version>${disruptorVersion}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -577,47 +577,47 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
- <version>${spring.version}</version>
+ <version>${springVersion}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
+ <version>${springVersion}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
+ <version>${springVersion}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
+ <version>${springVersion}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
- <version>${spring.version}</version>
+ <version>${springVersion}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-oxm</artifactId>
- <version>${spring.version}</version>
+ <version>${springVersion}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>${spring.version}</version>
+ <version>${springVersion}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
+ <version>${springVersion}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
- <version>${spring.version}</version>
+ <version>${springVersion}</version>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
[4/6] git commit: Fix link and invalid Velocity variable.
Posted by ma...@apache.org.
Fix link and invalid Velocity variable.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/01f97a38
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/01f97a38
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/01f97a38
Branch: refs/heads/master
Commit: 01f97a38ad7ff85f1f93788f987471cda551bac6
Parents: 6efeeed
Author: Matt Sicker <ma...@apache.org>
Authored: Sat Oct 4 20:58:41 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Sat Oct 4 20:58:41 2014 -0500
----------------------------------------------------------------------
src/site/xdoc/build.xml.vm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/01f97a38/src/site/xdoc/build.xml.vm
----------------------------------------------------------------------
diff --git a/src/site/xdoc/build.xml.vm b/src/site/xdoc/build.xml.vm
index 16fdb96..db93302 100644
--- a/src/site/xdoc/build.xml.vm
+++ b/src/site/xdoc/build.xml.vm
@@ -15,6 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+#set($dollar = '$')
<document xmlns="http://maven.apache.org/XDOC/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
@@ -25,7 +26,7 @@
<body>
<section name="Building and Installing Log4j">
- <p>
+ <p class="text-info">
<i>The information below is for developers who want to modify Log4j or
contribute to Log4j. If your goal is to add logging to your application
you don't need to build from the source code,
@@ -52,7 +53,7 @@
</p>
<pre>mvn site
[Windows] mvn site:stage-deploy -DstagingSiteURL=file:///%HOME%/log4j
-[Unix] mvn site:stage-deploy -DstagingSiteURL=file:///$HOME/log4j</pre>
+[Unix] mvn site:stage-deploy -DstagingSiteURL=file:///${dollar}HOME/log4j</pre>
<p>
To rebuild only what's changed and execute the tests, run: <kbd>mvn test</kbd>
</p>
@@ -63,7 +64,7 @@
</section>
<section name="Releasing Log4j">
<p>
- Please see the wiki <a href="http://jira.codehaus.org/browse/MSITE-695">https://wiki.apache.org/logging/Log4j2ReleaseGuide</a>.
+ Please see the wiki <a href="https://wiki.apache.org/logging/Log4j2ReleaseGuide">Log4j2ReleaseGuide</a>.
</p>
</section>
</body>
[6/6] git commit: Update layouts manual page with updated javadoc
links.
Posted by ma...@apache.org.
Update layouts manual page with updated javadoc links.
- Added javadoc macro for JavaSE links.
- Updated downloads.oracle.com links to docs.oracle.com.
- Added link to AnsiEscape.
- Added ${Charset} variable for frequently repeated javadoc link.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8ada03b7
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8ada03b7
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8ada03b7
Branch: refs/heads/master
Commit: 8ada03b73dae828aebd239e789a166a2a32f46af
Parents: cf97c0f
Author: Matt Sicker <ma...@apache.org>
Authored: Sat Oct 4 21:36:53 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Sat Oct 4 21:36:53 2014 -0500
----------------------------------------------------------------------
src/site/xdoc/manual/layouts.xml.vm | 56 +++++++++++++++-----------------
1 file changed, 27 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8ada03b7/src/site/xdoc/manual/layouts.xml.vm
----------------------------------------------------------------------
diff --git a/src/site/xdoc/manual/layouts.xml.vm b/src/site/xdoc/manual/layouts.xml.vm
index fdce49f..e34c657 100644
--- a/src/site/xdoc/manual/layouts.xml.vm
+++ b/src/site/xdoc/manual/layouts.xml.vm
@@ -23,6 +23,12 @@
<author email="ggregory@apache.org">Gary Gregory</author>
</properties>
#set($dollar = '$')
+ #set($sharp = '#')
+ #set($javadocRoot = 'http://docs.oracle.com/javase/6/docs/api')
+ #macro(javadoc $path $class)
+ <a class="javadoc" href="${javadocRoot}/${path}/${class}.html">${class}</a>
+ #end
+ #set($Charset = "<a class='javadoc' href='${javadocRoot}/java/nio/charset/Charset.html'>Charset</a>")
#if (!$alignedFileName)
#set ($isPDF = true)
#set ($break = '<br />')
@@ -35,15 +41,14 @@
<p>An Appender uses a Layout to format a LogEvent into a form that meets the needs of whatever will be
consuming the log event. In Log4j 1.x and Logback Layouts were expected to transform an event into a
String. In Log4j 2 Layouts return a byte array. This allows the result of the Layout to be useful in
- many more types of Appenders. However, this means you need to configure most Layouts with a
- <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Charset</a> to
- insure the byte array contains correct values.
+ many more types of Appenders. However, this means you need to configure most Layouts with a ${Charset} to
+ ensure the byte array contains correct values.
</p>
<a name="JSONLayout"/>
<subsection name="JSONLayout">
<!-- From Javadoc of org.apache.logging.log4j.core.layout.JSONLayout -->
<p>
- Appends a series of JSON events as strings serialized as bytes. This layout requires Jackson jar files
+ Appends a series of JSON events as strings serialized as bytes. This layout requires Jackson jar files
(see pom.xml for details).
</p>
<h4>Complete well-formed JSON vs. fragment JSON</h4>
@@ -103,8 +108,7 @@
<td>charset</td>
<td>String</td>
<td>The character set to use when converting the HTML String to a byte array. The value must be
- a valid <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Charset</a>.
- If not specified, UTF-8 will be used.</td>
+ a valid ${Charset}. If not specified, UTF-8 will be used.</td>
</tr>
<tr>
<td>compact</td>
@@ -147,8 +151,7 @@
<td>charset</td>
<td>String</td>
<td>The character set to use when converting the HTML String to a byte array. The value must be
- a valid <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Charset</a>.
- If not specified, the default system Charset will be used.</td>
+ a valid ${Charset}. If not specified, the default system Charset will be used.</td>
</tr>
<tr>
<td>contentType</td>
@@ -221,8 +224,7 @@ WARN [main]: Message 2</pre>
<td>charset</td>
<td>String</td>
<td>The character set to use when converting the syslog String to a byte array. The String must be
- a valid <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Charset</a>.
- If not specified, the default system Charset will be used.
+ a valid ${Charset}. If not specified, the default system Charset will be used.
</td>
</tr>
<tr>
@@ -275,8 +277,7 @@ WARN [main]: Message 2</pre>
<td>regex</td>
<td>String</td>
<td>A Java-compliant regular expression to match in the resulting string. See
- <a href="http://docs.oracle.com/javase/6/docs/api/java/util/regex/Pattern.html"
- target="_blank">java.util.regex.Pattern</a>.</td>
+ #javadoc('java/util/regex', 'Pattern').</td>
</tr>
<tr>
<td>replacement</td>
@@ -366,8 +367,7 @@ WARN [main]: Message 2</pre>
<td>
<p>Outputs the date of the logging event. The date conversion specifier may be
followed by a set of braces containing a date and time pattern string per
- <a href="http://docs.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html">
- SimpleDateFormat</a>.
+ #javadoc('java/text', 'SimpleDateFormat').
</p>
<p>The predefined formats are
<code>DEFAULT</code>,
@@ -379,7 +379,7 @@ WARN [main]: Message 2</pre>
<code>ISO8601_BASIC</code>.
</p>
<p>You can also use a set of braces containing a time zone id per
- <a href="http://docs.oracle.com/javase/6/docs/api/java/util/TimeZone.html#getTimeZone(java.lang.String)">
+ <a class="javadoc" href="${javadocRoot}/java/util/TimeZone.html${sharp}getTimeZone(java.lang.String)">
java.util.TimeZone.getTimeZone</a>. If no date format specifier is given then ISO8601 format is assumed.
<table>
<tr>
@@ -461,9 +461,9 @@ WARN [main]: Message 2</pre>
</td>
<td>
<p>
- Encodes special characters such as '\n' and HTML characters to help prevent log forging
- and some XSS attacks that could occur when displaying logs in a web browser. Anytime
- user provided data is logged, this can provide a safeguard.
+ Encodes special characters such as '\n' and HTML characters to help prevent log forging
+ and some XSS attacks that could occur when displaying logs in a web browser. Anytime
+ user provided data is logged, this can provide a safeguard.
</p>
<p>
A typical usage would encode the message
@@ -590,7 +590,8 @@ WARN [main]: Message 2</pre>
</tr>
</table>
</p>
- <p>The color names are ANSI names defined in the <a href="../log4j-core/apidocs/index.html">AnsiEscape</a> class.
+ <p>The color names are ANSI names defined in the
+ <a class="javadoc" href="../log4j-core/apidocs/org/apache/logging/log4j/core/pattern/AnsiEscape.html">AnsiEscape</a> class.
</p>
<p>The color and attribute names and are standard, but the exact shade, hue, or value.
</p>
@@ -723,7 +724,7 @@ WARN [main]: Message 2</pre>
</td>
<td>
<p>Outputs the entries in a
- <a href="../log4j-api/apidocs/org/apache/logging/log4j/message/MapMessage.html">MapMessage</a>,
+ <a class="javadoc" href="../log4j-api/apidocs/org/apache/logging/log4j/message/MapMessage.html">MapMessage</a>,
if one is present in the event. The <b>K</b> conversion character can be followed by the key
for the map placed between braces, as in
<b>%K{clientNumber}</b> where <code>clientNumber</code> is the key. The value in the Map
@@ -1049,7 +1050,7 @@ WARN [main]: Message 2</pre>
is output using a format {{key1,val1},{key2,val2}}
</p>
<p>See the
- <a href="../log4j-api/apidocs/org/apache/logging/log4j/ThreadContext.html">ThreadContext</a>
+ <a class="javadoc" href="../log4j-api/apidocs/org/apache/logging/log4j/ThreadContext.html">ThreadContext</a>
class for more details.
</p>
</td>
@@ -1161,9 +1162,7 @@ WARN [main]: Message 2</pre>
<tr>
<td align="center">%-20c</td>
<td align="center">true</td>
- <td
- align="center">20
- </td>
+ <td align="center">20</td>
<td align="center">none</td>
<td>Right pad with
spaces if the category name is less than 20 characters long.
@@ -1228,7 +1227,7 @@ WARN [main]: Message 2</pre>
testException(ExtendedThrowableTest.java:71) ~[test-classes/:?]
... 30 more</pre>
#else
- <pre class="prettyprint linenums">Exception java.lang.IllegalArgumentException: IllegalArgument
+ <pre>Exception java.lang.IllegalArgumentException: IllegalArgument
at org.apache.logging.log4j.core.pattern.ExtendedThrowableTest.testException(ExtendedThrowableTest.java:72) [test-classes/:?]
... suppressed 26 lines
at ${dollar}Proxy0.invoke(Unknown Source)} [?:?]
@@ -1266,8 +1265,7 @@ at org.apache.logging.log4j.core.pattern.ExtendedThrowableTest.testException(Ext
<td>charset</td>
<td>String</td>
<td>The character set to use when converting the syslog String to a byte array. The String must be
- a valid <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Charset</a>.
- If not specified, the default system Charset will be used.</td>
+ a valid ${Charset}. If not specified, the default system Charset will be used.</td>
</tr>
<tr>
<td>enterpriseNumber</td>
@@ -1390,8 +1388,7 @@ at org.apache.logging.log4j.core.pattern.ExtendedThrowableTest.testException(Ext
<td>charset</td>
<td>String</td>
<td>The character set to use when converting the syslog String to a byte array. The String must be
- a valid <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Charset</a>.
- If not specified, the default system Charset will be used.</td>
+ a valid ${Charset}. If not specified, the default system Charset will be used.</td>
</tr>
<tr>
<td>facility</td>
@@ -1418,6 +1415,7 @@ at org.apache.logging.log4j.core.pattern.ExtendedThrowableTest.testException(Ext
<subsection name="XMLLayout">
<!-- From Javadoc of org.apache.logging.log4j.core.layout.XMLLayout -->
<p>
+ <!-- FIXME: log4j.dtd link is broken -->
Appends a series of <code>Event</code> elements as defined in the <a href="log4j.dtd">log4j.dtd</a>.
</p>
<h4>Complete well-formed XML vs. fragment XML</h4>
[3/6] git commit: Use Log4jReleaseVersion variable.
Posted by ma...@apache.org.
Use Log4jReleaseVersion variable.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6efeeed3
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6efeeed3
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6efeeed3
Branch: refs/heads/master
Commit: 6efeeed3dc19ccaae0491c368350ab32fc2251ec
Parents: 13abc79
Author: Matt Sicker <ma...@apache.org>
Authored: Sat Oct 4 20:55:37 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Sat Oct 4 20:55:37 2014 -0500
----------------------------------------------------------------------
src/site/xdoc/manual/customloglevels.xml.vm | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6efeeed3/src/site/xdoc/manual/customloglevels.xml.vm
----------------------------------------------------------------------
diff --git a/src/site/xdoc/manual/customloglevels.xml.vm b/src/site/xdoc/manual/customloglevels.xml.vm
index 09c1121..a08ca3e 100644
--- a/src/site/xdoc/manual/customloglevels.xml.vm
+++ b/src/site/xdoc/manual/customloglevels.xml.vm
@@ -15,6 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+#set($dollar = '$')
<document xmlns="http://maven.apache.org/XDOC/2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -145,7 +146,7 @@ logger.log(Level.getLevel("FORGOT_TO_DEFINE"), "some message"); // throws except
<CustomLevel name="NOTICE" intLevel="450" />
<CustomLevel name="VERBOSE" intLevel="550" />
</CustomLevels>
-
+
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="%d %-7level %logger{36} - %msg%n"/>
@@ -218,7 +219,7 @@ logger.diag("another message");</pre>
</p>
<p>
For example, for medical devices we could have only <tt>critical()</tt>, <tt>warning()</tt>,
- and <tt>advisory()</tt> methods.
+ and <tt>advisory()</tt> methods.
Another example could be a game that has only <tt>defcon1()</tt>, <tt>defcon2()</tt>,
and <tt>defcon3()</tt> levels.
</p>
@@ -273,7 +274,7 @@ import com.mycompany.myproject.ExtLogger;
public class MyService {
// instead of Logger logger = LogManager.getLogger(MyService.class):
private static final ExtLogger logger = ExtLogger.create(MyService.class);
-
+
public void someMethod() {
// ...
logger.trace("the built-in TRACE level");
@@ -296,7 +297,7 @@ public class MyService {
Use the following command to generate a logger wrapper that adds methods to the built-in ones:
</p>
<pre class="prettyprint">
-java -cp log4j-core-${project.version}.jar org.apache.logging.log4j.core.tools.Generate$ExtendedLogger \
+java -cp log4j-core-${Log4jReleaseVersion}.jar org.apache.logging.log4j.core.tools.Generate${dollar}ExtendedLogger} \
com.mycomp.ExtLogger DIAG=350 NOTICE=450 VERBOSE=550 > com/mycomp/ExtLogger.java</pre>
<p>
This will generate source code for a logger wrapper that has the convenience methods
@@ -310,7 +311,7 @@ java -cp log4j-core-${project.version}.jar org.apache.logging.log4j.core.tools.G
Use the following command to generate a logger wrapper that hides the built-in levels and has only custom levels:
</p>
<pre class="prettyprint">
-java -cp log4j-core-${project.version}.jar org.apache.logging.log4j.core.tools.Generate$CustomLogger \
+java -cp log4j-core-${Log4jReleaseVersion}.jar org.apache.logging.log4j.core.tools.Generate${dollar}CustomLogger \
com.mycomp.MyLogger DEFCON1=350 DEFCON2=450 DEFCON3=550 > com/mycomp/MyLogger.java</pre>
<p>
This will generate source code for a logger wrapper that <em>only</em> has convenience
[5/6] git commit: Use Log4jReleaseVersion variable and fix $dollar
stuff.
Posted by ma...@apache.org.
Use Log4jReleaseVersion variable and fix $dollar stuff.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/cf97c0f0
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/cf97c0f0
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/cf97c0f0
Branch: refs/heads/master
Commit: cf97c0f07ca03b80a9673c09b6914bf089d429da
Parents: 01f97a3
Author: Matt Sicker <ma...@apache.org>
Authored: Sat Oct 4 21:04:24 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Sat Oct 4 21:04:24 2014 -0500
----------------------------------------------------------------------
src/site/xdoc/manual/jmx.xml.vm | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cf97c0f0/src/site/xdoc/manual/jmx.xml.vm
----------------------------------------------------------------------
diff --git a/src/site/xdoc/manual/jmx.xml.vm b/src/site/xdoc/manual/jmx.xml.vm
index b4d9428..3a6498c 100644
--- a/src/site/xdoc/manual/jmx.xml.vm
+++ b/src/site/xdoc/manual/jmx.xml.vm
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
+#set($dollar = '$')
<document xmlns="http://maven.apache.org/XDOC/2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
@@ -52,7 +52,7 @@
<p>To perform local monitoring you don't need to specify any system
properties. The JConsole tool that is included in the Java JDK can be
used to monitor your application. Start JConsole by typing
- <code>$JAVA_HOME/bin/jconsole</code> in a command shell.
+ <code>${dollar}JAVA_HOME/bin/jconsole</code> in a command shell.
For more details, see Oracle's documentation on
<a href="http://docs.oracle.com/javase/7/docs/technotes/guides/management/jconsole.html">how to use JConsole</a>.</p>
</subsection>
@@ -89,9 +89,9 @@
<p>To run the Log4j JMX Client GUI as a JConsole Plug-in,
start JConsole with the following command:
</p>
- <p><code>$JAVA_HOME/bin/jconsole -pluginpath /path/to/log4j-api-${project.version}.jar:/path/to/log4j-core-${project.version}.jar:/path/to/log4j-jmx-gui-${project.version}.jar</code></p>
+ <p><code>${dollar}JAVA_HOME/bin/jconsole -pluginpath /path/to/log4j-api-${Log4jReleaseVersion}.jar:/path/to/log4j-core-${Log4jReleaseVersion}.jar:/path/to/log4j-jmx-gui-${Log4jReleaseVersion}.jar</code></p>
<p>or on Windows:</p>
- <p><code>%JAVA_HOME%\bin\jconsole -pluginpath \path\to\log4j-api-${project.version}.jar;\path\to\log4j-core-${project.version}.jar;\path\to\log4j-jmx-gui-${project.version}.jar</code></p>
+ <p><code>%JAVA_HOME%\bin\jconsole -pluginpath \path\to\log4j-api-${Log4jReleaseVersion}.jar;\path\to\log4j-core-${Log4jReleaseVersion}.jar;\path\to\log4j-jmx-gui-${Log4jReleaseVersion}.jar</code></p>
<p>If you execute the above command and connect to your application,
you will see an extra "Log4j 2" tab in the JConsole window.
This tab contains the client GUI, with the StatusLogger selected.
@@ -132,9 +132,9 @@
<p>To run the Log4j JMX Client GUI as a stand-alone application,
run the following command:
</p>
- <p><code>$JAVA_HOME/bin/java -cp /path/to/log4j-api-${project.version}.jar:/path/to/log4j-core-${project.version}.jar:/path/to/log4j-jmx-gui-${project.version}.jar org.apache.logging.log4j.jmx.gui.ClientGui <options></code></p>
+ <p><code>${dollar}JAVA_HOME/bin/java -cp /path/to/log4j-api-${Log4jReleaseVersion}.jar:/path/to/log4j-core-${Log4jReleaseVersion}.jar:/path/to/log4j-jmx-gui-${Log4jReleaseVersion}.jar org.apache.logging.log4j.jmx.gui.ClientGui <options></code></p>
<p>or on Windows:</p>
- <p><code>%JAVA_HOME%\bin\java -cp \path\to\log4j-api-${project.version}.jar;\path\to\log4j-core-${project.version}.jar;\path\to\log4j-jmx-gui-${project.version}.jar org.apache.logging.log4j.jmx.gui.ClientGui <options></code></p>
+ <p><code>%JAVA_HOME%\bin\java -cp \path\to\log4j-api-${Log4jReleaseVersion}.jar;\path\to\log4j-core-${Log4jReleaseVersion}.jar;\path\to\log4j-jmx-gui-${Log4jReleaseVersion}.jar org.apache.logging.log4j.jmx.gui.ClientGui <options></code></p>
<p>Where <code>options</code> are one of the following:</p>
<ul>
<li><code><host>:<port></code></li>
@@ -155,9 +155,9 @@ com.sun.management.jmxremote.ssl=false</pre>
Monitoring and Management</a> provides details on how to configure
JMX more securely with password authentication and SSL.)</b></p>
<p>Then you can run the client with this command:</p>
- <p><code>$JAVA_HOME/bin/java -cp /path/to/log4j-api-${project.version}.jar:/path/to/log4j-core-${project.version}.jar:/path/to/log4j-jmx-gui-${project.version}.jar org.apache.logging.log4j.jmx.gui.ClientGui localhost:33445</code></p>
+ <p><code>${dollar}JAVA_HOME/bin/java -cp /path/to/log4j-api-${Log4jReleaseVersion}.jar:/path/to/log4j-core-${Log4jReleaseVersion}.jar:/path/to/log4j-jmx-gui-${Log4jReleaseVersion}.jar org.apache.logging.log4j.jmx.gui.ClientGui localhost:33445</code></p>
<p>or on Windows:</p>
- <p><code>%JAVA_HOME%\bin\java -cp \path\to\log4j-api-${project.version}.jar;\path\to\log4j-core-${project.version}.jar;\path\to\log4j-jmx-gui-${project.version}.jar org.apache.logging.log4j.jmx.gui.ClientGui localhost:33445</code></p>
+ <p><code>%JAVA_HOME%\bin\java -cp \path\to\log4j-api-${Log4jReleaseVersion}.jar;\path\to\log4j-core-${Log4jReleaseVersion}.jar;\path\to\log4j-jmx-gui-${Log4jReleaseVersion}.jar org.apache.logging.log4j.jmx.gui.ClientGui localhost:33445</code></p>
<p>The screenshot below shows the StatusLogger panel of the client
GUI when running as a stand-alone application.</p>
<p><img src="../images/jmx-standalone-statuslogger.png" alt="JMX GUI screenshot of StatusLogger display" /></p>
[2/6] git commit: Use jackson2Version property.
Posted by ma...@apache.org.
Use jackson2Version property.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/13abc792
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/13abc792
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/13abc792
Branch: refs/heads/master
Commit: 13abc7929427d8e661f9fcc9aeadecffeb3b1098
Parents: fa806de
Author: Matt Sicker <ma...@apache.org>
Authored: Sat Oct 4 20:52:04 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Sat Oct 4 20:52:04 2014 -0500
----------------------------------------------------------------------
src/site/xdoc/manual/configuration.xml.vm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/13abc792/src/site/xdoc/manual/configuration.xml.vm
----------------------------------------------------------------------
diff --git a/src/site/xdoc/manual/configuration.xml.vm b/src/site/xdoc/manual/configuration.xml.vm
index fd2b483..aae09df 100644
--- a/src/site/xdoc/manual/configuration.xml.vm
+++ b/src/site/xdoc/manual/configuration.xml.vm
@@ -667,19 +667,19 @@ public class Bar {
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.4.2</version>
+ <version>${jackson2Version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.4.2</version>
+ <version>${jackson2Version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.4.2</version>
+ <version>${jackson2Version}</version>
</dependency>
]]></pre>
<a name="Loggers"/>