Author: rgoers
Date: Fri Nov 2 19:38:44 2012
New Revision: 1405121
URL: http://svn.apache.org/viewvc?rev=1405121&view=rev
Log:
Fix broken links
Modified:
logging/log4j/log4j2/trunk/src/site/apt/download.apt.vm
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/eventlogging.xml
logging/log4j/log4j2/trunk/src/site/xdoc/manual/layouts.xml
logging/log4j/log4j2/trunk/src/site/xdoc/manual/lookups.xml
logging/log4j/log4j2/trunk/src/site/xdoc/manual/messages.xml
logging/log4j/log4j2/trunk/src/site/xdoc/manual/plugins.xml
logging/log4j/log4j2/trunk/src/site/xdoc/manual/thread-context.xml
Modified: logging/log4j/log4j2/trunk/src/site/apt/download.apt.vm
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/apt/download.apt.vm?rev=1405121&r1=1405120&r2=1405121&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/apt/download.apt.vm (original)
+++ logging/log4j/log4j2/trunk/src/site/apt/download.apt.vm Fri Nov 2 19:38:44
2012
@@ -49,7 +49,7 @@ Download Apache Log4j 2
---
% gpg --import KEYS
-% gpg --verify log4j2-1.0-alpha1.tar.gz.asc
+% gpg --verify apache-log4j-${Log4jReleaseVersion}-bin.tar.gz.asc
---
Apache Log4j 2 is signed by Ralph Goers B3D8E1BA
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=1405121&r1=1405120&r2=1405121&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml Fri Nov 2
19:38:44 2012
@@ -26,11 +26,11 @@
<section name="Appenders">
<p>
Appenders are the component responsible for delivering LogEvents to
their destination. Every Appender must
- implement the <a
href="../log4j2-core/apidocs/org/apache/logging/log4j/core/Appender.html">Appender</a>
+ implement the <a
href="../log4j-core/apidocs/org/apache/logging/log4j/core/Appender.html">Appender</a>
interface. Most Appenders will extend
- <a
href="../log4j2-core/apidocs/org/apache/logging/log4j/core/appender/AppenderBase.html">AppenderBase</a>
- which adds <a
href="../log4j2-core/apidocs/org/apache/logging/log4j/core/Lifecycle.html">Lifecycle</a>
- and <a
href="../log4j2-core/apidocs/org/apache/logging/log4j/core/filter/Filterable">Filterable</a>
+ <a
href="../log4j-core/apidocs/org/apache/logging/log4j/core/appender/AppenderBase.html">AppenderBase</a>
+ which adds <a
href="../log4j-core/apidocs/org/apache/logging/log4j/core/Lifecycle.html">Lifecycle</a>
+ and <a
href="../log4j-core/apidocs/org/apache/logging/log4j/core/filter/Filterable.html">Filterable</a>
support. Lifecycle allows components to finish initialization after
configuration has completed and to
perform cleanup during shutdown. Filterable allows the component to
have Filters attached to it which are
evaluated during event processing.
@@ -357,7 +357,7 @@
<a name="FlumeAppender"/>
<subsection name="FlumeAppender">
<p><i>This is an optional component supplied in a separate
jar.</i></p>
- <p><a href="http://incubator.apache.org/projects/flume.html";>Apache
Flume</a> is a distributed, reliable,
+ <p><a href="http://flume.apache.org/index.html";>Apache Flume</a> is
a distributed, reliable,
and available system for efficiently collecting, aggregating, and
moving large amounts of log data
from many different sources to a centralized data store. The
FlumeAppender takes LogEvents and sends
them to a Flume agent as serialized Avro events for
consumption.</p>
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=1405121&r1=1405120&r2=1405121&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/architecture.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/architecture.xml Fri Nov 2
19:38:44 2012
@@ -96,23 +96,23 @@
that is directly linked to the root LoggerConfig can be obtained as
follows:
<source>Logger logger =
LogManager.getLogger(LogManager.ROOT_LOGGER_NAME);</source>
All other Loggers can be retrieved using the
- <a
href="../log4j2-api/apidocs/org/apache/logging/log4j/LogManager.html#getLogger(java.lang.String)">
+ <a
href="../log4j-api/apidocs/org/apache/logging/log4j/LogManager.html#getLogger(java.lang.String)">
LogManager.getLogger
</a>
static method and passing the name of the desired Logger. Further
informaiton on the Logging
- API can be found at<a href="../log4j2-api/api.html">Log4j 2 API</a>.
+ API can be found at<a href="../log4j-api/api.html">Log4j 2 API</a>.
</p>
<h4>LoggerContext</h4>
<p>
The
- <a
href="../log4j2-core/apidocs/org/apache/logging/log4j/core/LoggerContext.html">LoggerContext</a>
+ <a
href="../log4j-core/apidocs/org/apache/logging/log4j/core/LoggerContext.html">LoggerContext</a>
acts as the anchor point for the Logging system. However, it is
possible to have multiple active
LoggerContexts in an application depending on the circumstances.
- More details on the LoggerContext are at<a href="logsep.html">Log
Separation</a>.
+ More details on the LoggerContext are at <a href="logsep.html">Log
Separation</a>.
</p>
<h4>Configuration</h4>
<p>Every LoggerContext has an active
- <a
href="../log4j/log4j2-core/apidocs/org/apache/logging/log4j/core/config/Configuration.html">
+ <a
href="../log4j-core/apidocs/org/apache/logging/log4j/core/config/Configuration.html">
Configuration</a>.
The Configuration contains all the Appenders,
context-wide Filtes, LoggerConfigs and contains the reference to the
StrSubstitutor. During
@@ -121,10 +121,10 @@
</p>
<h4>Logger</h4>
<p>As stated previously, Loggers are created by calling
- <a
href="../log4j2-api/apidocs/org/apache/logging/log4j/LogManager.html#getLogger(java.lang.String)">LogManager.getLogger</a>.
+ <a
href="../log4j-api/apidocs/org/apache/logging/log4j/LogManager.html#getLogger(java.lang.String)">LogManager.getLogger</a>.
The Logger itself performs no direct actions. It simply has a name
and is associated with a LoggerConfig.
It extends
- <a
href="file:///Users/rgoers/log4j/log4j2-api/apidocs/org/apache/logging/log4j/spi/AbstractLogger.html">
+ <a
href="../log4j-api/apidocs/org/apache/logging/log4j/spi/AbstractLogger.html">
AbstractLogger
</a>
and implements the required methods. As the configuration is
modified Loggers may become associated
@@ -170,7 +170,7 @@
</p>
<h4>LoggerConfig</h4>
<p>
- <a
href="../log4j2-core/apidocs/org/apache/logging/log4j/core/config/LoggerConfig.html">LoggerConfig</a>
+ <a
href="../log4j-core/apidocs/org/apache/logging/log4j/core/config/LoggerConfig.html">LoggerConfig</a>
objects are created when Loggers are declared in the logging
configuration.
The LoggerConfig contains a set of Filters that must allow the
LogEvent to pass before it will be
passed to any Appenders. It contains references to the set of
Appenders that should be used to
@@ -182,10 +182,10 @@
</tr>
</table>
<p>LoggerConfigs will be assigned a Log
- <a
href="../log4j2-api/apidocs/org/apache/logging/log4j/Level.html">Level</a>. The
set of possible
+ <a
href="../log4j-api/apidocs/org/apache/logging/log4j/Level.html">Level</a>. The
set of possible
levels includes (TRACE, DEBUG, INFO, WARN, ERROR and FATAL). Note
that in Log4j 2, the Level is
an Enum and cannot be sub-classed. Users who desire more granularity
are encouraged to use
- <a href="../log4j2-api/api.html#Markers">Markers</a>
+ <a href="../log4j-api/api.html#Markers">Markers</a>
instead.
</p>
<p>
@@ -489,7 +489,7 @@
<h4>Filter</h4>
<p>In addition to the automatic log Level filtering that takes place
as described in the previous
section, Log4j provides
- <a
href="../log4j2-core/apidocs/org/apache/logging/log4j/core/Filter.html">Filter</a>s
that can
+ <a
href="../log4j-core/apidocs/org/apache/logging/log4j/core/Filter.html">Filter</a>s
that can
be applied before control is passed to any LoggerConfig, after
control is passed to a LoggerConfig
but before calling any Appenders, after control is passed to a
LoggerConfig but before calling a
specific Appender, and on each Appender. In a manner very similar
to firewall filters,
@@ -508,12 +508,12 @@
on their logger is only part of the picture. Log4j allows logging
requests to print to multiple destinations. In log4j speak, an
output
destination is called an
- <a
href="../log4j2-core/apidocs/org/apache/logging/log4j/core/Appender.html">Appender</a>.
+ <a
href="../log4j-core/apidocs/org/apache/logging/log4j/core/Appender.html">Appender</a>.
Currently, appenders exist for the console, files, remote socket
servers, Apache Flume,
JMS, and remote UNIX Syslog daemons. More than one Appender can be
attached to a Logger.
</p>
<p>An Appender can be added to a Logger by calling the
- <a
href="../log4j2-core/apidocs/org/apache/logging/log4j/core/config/Configuration.html#addLoggerAppender(org.apache.logging.log4j.core.Logger,
org.apache.logging.log4j.core.Appender)">addLoggerAppender</a>
+ <a
href="../log4j-core/apidocs/org/apache/logging/log4j/core/config/Configuration.html#addLoggerAppender(org.apache.logging.log4j.core.Logger,
org.apache.logging.log4j.core.Appender)">addLoggerAppender</a>
method of the current Configuration. If a LoggerConfig matching
the name of the Logger does
not exist, one will be created, the Appender will be attached to
it and then all Loggers
will be notified to update their LoggerConfig references.
@@ -618,10 +618,10 @@
<h4>Layout</h4>
<p>More often than not, users wish to customize not only the output
destination but also the output format.
This is accomplished by associating a
- <a
href="../log4j2-core/apidocs/org/apache/logging/log4j/core/Layout.html">Layout</a>
+ <a
href="../log4j-core/apidocs/org/apache/logging/log4j/core/Layout.html">Layout</a>
with an Appender. The Layout is responsible for formatting the
LogEvent according to the user's
wishes, whereas an appender takes care of sending the formatted
output to its destination.
- The <a
href="../log4j2-core/apidocs/org/apache/logging/log4j/core/layout/PatternLayout.html">PatternLayout</a>,
+ The <a
href="../log4j-core/apidocs/org/apache/logging/log4j/core/layout/PatternLayout.html">PatternLayout</a>,
part of the standard log4j distribution, lets the user specify the
output
format according to conversion patterns similar to the C language
<code>printf</code> function.
</p>
@@ -648,14 +648,14 @@
<h4>StrSubstitutor and StrLookup</h4>
<p>The
- <a
href="../log4j/log4j2-core/apidocs/org/apache/logging/log4j/core/lookup/StrSubstitutor.html">
+ <a
href="../log4j-core/apidocs/org/apache/logging/log4j/core/lookup/StrSubstitutor.html">
StrSubstitutor
</a>
class and
- <a
href="../log4j/log4j2-core/apidocs/org/apache/logging/log4j/core/lookup/StrLookup.html">StrLookup</a>
+ <a
href="../log4j-core/apidocs/org/apache/logging/log4j/core/lookup/StrLookup.html">StrLookup</a>
interface were borrowed from Apache Commons Lang and then modified
to support evaluating LogEvents. In
addition the
- <a
href="../log4j/log4j2-core/apidocs/org/apache/logging/log4j/core/lookup/Interpolator.html">Interpolator</a>
+ <a
href="../log4j-core/apidocs/org/apache/logging/log4j/core/lookup/Interpolator.html">Interpolator</a>
class was borrowed from Apache Commons Configuration to allow the
StrSubstitutor to evaluate variables
that from multiple StrLookups. It too was modified to support
evaluating LogEvents. Together these
provide a mechanism to allow the configuration to reference
variables coming from System Properties,
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=1405121&r1=1405120&r2=1405121&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/configuration.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/configuration.xml Fri Nov
2 19:38:44 2012
@@ -124,9 +124,9 @@
<p>
If no configuration files are present logback will default to the
DefaultConfiguration which
will set up a minimal logging environment consisting of a
- <a
href="../log4j2-core/apidocs/org/apache/logging/log4j/core/appender/ConsoleAppender.html">ConsoleAppender</a>
+ <a
href="../log4j-core/apidocs/org/apache/logging/log4j/core/appender/ConsoleAppender.html">ConsoleAppender</a>
attached to the root logger. The output will be formatted using a
- <a
href="../log4j2-core/apidocs/org/apache/logging/log4j/core/layout/PatternLayout.html">PatternLayout</a>
+ <a
href="../log4j-core/apidocs/org/apache/logging/log4j/core/layout/PatternLayout.html">PatternLayout</a>
set to the pattern "%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} -
%msg%n".
</p>
<p>
@@ -679,8 +679,8 @@
elsewhere. Some of these properties will be resolved when the
configuration file is interpreted while
others may be passed to components where they will be evaluated at
runtime. To accomplish this, Log4j
uses variations Apache Commons Lang's
- <a
href="../log4j2-core/apidocs/org/apache/logging/log4j/core/lookup/StrSubstitutor">StrSubstitutor</a>
- and <a
href="../log4j2-core/apidocs/org/apache/logging/log4j/core/lookup/StrLookup">StrLookup</a>
+ <a
href="../log4j-core/apidocs/org/apache/logging/log4j/core/lookup/StrSubstitutor">StrSubstitutor</a>
+ and <a
href="../log4j-core/apidocs/org/apache/logging/log4j/core/lookup/StrLookup">StrLookup</a>
classes. In a manner similar to Ant or Maven, this allows
variables declared as <code>${name}</code>
to be resolved using properties declared in the configuration
itself. For example, the following example
shows the filename for the rolling file appender being declared as
a property.
@@ -805,7 +805,7 @@
logging has not been configured, "normal" logging cannot be used
during initialization. In addition,
normal logging within appenders could create infinite recursion
which Log4j will detect and cause
the recursive events to be ignored. To accomodate this need, the
Log4j 2 API includes a
- <a
href="../log4j2-api/apidocs/org/apache/logging/log4j/status/StatusLogger.html">StatusLogger</a>.
+ <a
href="../log4j-api/apidocs/org/apache/logging/log4j/status/StatusLogger.html">StatusLogger</a>.
Components declare an instance of the StatusLogger similar to</p>
<source>
protected final static Logger logger = StatusLogger.getLogger();</source>
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/eventlogging.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/eventlogging.xml?rev=1405121&r1=1405120&r2=1405121&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/eventlogging.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/eventlogging.xml Fri Nov 2
19:38:44 2012
@@ -133,7 +133,7 @@
<p>The EventLogger class uses a Logger named "EventLogger".
EventLogger uses a logging level
of OFF as the default to indicate that it cannot be filtered.
These events can be
formatted for printing using the
- <a
href="../log4j2-core/apidocs/org/apache/logging/log4j/core/layout/StructuredDataLayout.html">StructuredDataLayout</a>.
+ <a
href="../log4j-core/apidocs/org/apache/logging/log4j/core/layout/StructuredDataLayout.html">StructuredDataLayout</a>.
</p>
</subsection>
</section>
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=1405121&r1=1405120&r2=1405121&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/layouts.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/layouts.xml Fri Nov 2
19:38:44 2012
@@ -336,9 +336,9 @@ WARN [main]: Message 2</pre>
<td>TRACE</td>
<td>Black (looks dark grey)</td>
</tr>
- </table>
+ </table>
</p>
- <p>The color names are ANSI names defined in the <a
href="../log4j2-core/apidocs/index.html">AnsiEscape</a> class.
+ <p>The color names are ANSI names defined in the <a
href="../log4j-core/apidocs/index.html">AnsiEscape</a> class.
</p>
<p>The color and attribute names and are standard, but the
exact shade, hue, or value.
</p>
@@ -379,7 +379,7 @@ WARN [main]: Message 2</pre>
<td style="background: white;color:black">White</td>
</tr>
</tbody>
- </table>
+ </table>
<p>The default colors can be overridden in the optional style
option. For example:
<pre>%highlight{%d{ISO8601} [%t] %-5level:
%msg%n%throwable}{FATAL=white, ERROR=red, WARN=blue, INFO=black, DEBUG=green,
TRACE=blue}</pre>
</p>
@@ -427,10 +427,10 @@ WARN [main]: Message 2</pre>
<td>TRACE</td>
<td>Normal</td>
</tr>
- </table>
+ </table>
</td>
</tr>
- </table>
+ </table>
</p>
</td>
</tr>
@@ -441,7 +441,8 @@ WARN [main]: Message 2</pre>
<b>MAP</b>{key}
</td>
<td>
- <p>Used to output the entries in a <a
href="../log4j2-api/apidocs/index.html">MapMessage</a>,
+ <p>Used to output the entries in a
+ <a
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
@@ -727,7 +728,7 @@ WARN [main]: Message 2</pre>
is output using a format {{key1,val1},{key2,val2}}
</p>
<p>See the
- <a
href="../../log4j2-api/apidocs/org/apache/logging/log4j/ThreadContext.html">ThreadContext</a>
+ <a
href="../log4j-api/apidocs/org/apache/logging/log4j/ThreadContext.html">ThreadContext</a>
class for more details.
</p>
</td>
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/lookups.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/lookups.xml?rev=1405121&r1=1405120&r2=1405121&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/lookups.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/lookups.xml Fri Nov 2
19:38:44 2012
@@ -27,7 +27,7 @@
<p>
Lookups provide a way to add values to the Log4j configuration at
arbitrary places. They are
a particular type of Plugin that implements the
- <a
href="../log4j2-core/apidocs/org/apache/logging/log4j/core/lookup/StrLookup.html">StrLookup</a>
interface.
+ <a
href="../log4j-core/apidocs/org/apache/logging/log4j/core/lookup/StrLookup.html">StrLookup</a>
interface.
Information on how to use Lookups in configuration files can be
found in the
<a href="./configuration.html#PropertySubstitution">Property
Substitution</a> section of the
<a href="./configuration.html">Configuration</a> page.
@@ -89,7 +89,7 @@
The first item simply means that the MapLookup is used to
substitute properties that are defined
in the configuration file. These variables are specified without a
prefix - e.g. <code>${name}</code>.
The second usage allows a value from the current
- <a
href="../log4j2-api/apidocs/org/apache/logging/log4j/message/MapMessage.html">MapMessage</a>,
+ <a
href="../log4j-api/apidocs/org/apache/logging/log4j/message/MapMessage.html">MapMessage</a>,
if one is part of the current log event, to be substituted. In the
example below the RoutingAppender will
use a different RollingFileAppender for each unique value of the
key named "type" in the MapMessage. Note
that when used this way a value for "type" should be declared in
the properties declaration to provide
@@ -119,7 +119,7 @@
StructuredDataMessages. In addition to the Map values it will also
return the name portion of the
id (not including the enterprise number) and the type field. The
main difference between the
example below and the example for MapMessage is that the "type" is
an attribute of the
- <a
href="../log4j2-api/apidocs/org/apache/logging/log4j/message/StructuredDataMessage.html">StructuredDataMessage</a>
+ <a
href="../log4j-api/apidocs/org/apache/logging/log4j/message/StructuredDataMessage.html">StructuredDataMessage</a>
while "type" would have to be an item in the Map in a MapMessage.
</p>
<source><