[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v0.9.18-68-g9a9462c
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 9a9462cf0af145a7c80fc655ff8298416393b3bd (commit) from a9729dc84972f7c16fd4b857d9c2b6372d9f4158 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=9a9462cf0af145a7c80fc655f... http://github.com/ceki/logback/commit/9a9462cf0af145a7c80fc655ff8298416393b3... commit 9a9462cf0af145a7c80fc655ff8298416393b3bd Author: Ceki Gulcu <ceki@qos.ch> Date: Sat Mar 6 00:16:39 2010 +0100 editing the manual diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/action/Action.java b/logback-core/src/main/java/ch/qos/logback/core/joran/action/Action.java index abbe4f6..ae25ca0 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/action/Action.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/action/Action.java @@ -50,10 +50,16 @@ public abstract class Action extends ContextAwareBase { * Called when the parser encounters an element matching a * {@link ch.qos.logback.core.joran.spi.Pattern Pattern}. */ - public abstract void begin(InterpretationContext ec, String name, + public abstract void begin(InterpretationContext ic, String name, Attributes attributes) throws ActionException; - public void body(InterpretationContext ec, String body) + /** + * Called to pass the body (as text) contained within an element. + * @param ic + * @param body + * @throws ActionException + */ + public void body(InterpretationContext ic, String body) throws ActionException { // NOP } @@ -62,34 +68,34 @@ public abstract class Action extends ContextAwareBase { * Called when the parser encounters an endElement event matching a * {@link ch.qos.logback.core.joran.spi.Pattern Pattern}. */ - public abstract void end(InterpretationContext ec, String name) + public abstract void end(InterpretationContext ic, String name) throws ActionException; public String toString() { return this.getClass().getName(); } - protected int getColumnNumber(InterpretationContext ec) { - Interpreter jp = ec.getJoranInterpreter(); - Locator locator = jp.getLocator(); + protected int getColumnNumber(InterpretationContext ic) { + Interpreter ji = ic.getJoranInterpreter(); + Locator locator = ji.getLocator(); if (locator != null) { return locator.getColumnNumber(); } return -1; } - protected int getLineNumber(InterpretationContext ec) { - Interpreter jp = ec.getJoranInterpreter(); - Locator locator = jp.getLocator(); + protected int getLineNumber(InterpretationContext ic) { + Interpreter ji = ic.getJoranInterpreter(); + Locator locator = ji.getLocator(); if (locator != null) { return locator.getLineNumber(); } return -1; } - protected String getLineColStr(InterpretationContext ec) { - String line = "line: " + getLineNumber(ec) + ", column: " - + getColumnNumber(ec); + protected String getLineColStr(InterpretationContext ic) { + String line = "line: " + getLineNumber(ic) + ", column: " + + getColumnNumber(ic); return line; } } diff --git a/logback-site/src/site/pages/manual/encoders.html b/logback-site/src/site/pages/manual/encoders.html new file mode 100644 index 0000000..9b2ccad --- /dev/null +++ b/logback-site/src/site/pages/manual/encoders.html @@ -0,0 +1,29 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> + <title>Chapter 4: Appenders</title> + <link rel="stylesheet" type="text/css" href="../css/common.css" /> + <link rel="stylesheet" type="text/css" href="../css/screen.css" media="screen" /> + <link rel="stylesheet" type="text/css" href="../css/_print.css" media="print" /> + <link rel="stylesheet" type="text/css" href="../css/prettify.css" media="screen" / + </head> + <body onload="prettyPrint()"> + <script type="text/javascript">prefix='../';</script> + <script type="text/javascript" src="../js/prettify.js"></script> + <script src="../templates/header.js" type="text/javascript"></script> + <div id="left"> + <noscript>Please turn on Javascript to view this menu</noscript> + <script src="../templates/left.js" type="text/javascript"></script> + </div> + <div id="right"> + <script src="menu.js" type="text/javascript"></script> + </div> + + <div id="content"> + + <h1>Chapter 6: Encoders</h1> + </div> + </body> +</html> diff --git a/logback-site/src/site/pages/manual/filters.html b/logback-site/src/site/pages/manual/filters.html index 716c3f2..4ca854c 100644 --- a/logback-site/src/site/pages/manual/filters.html +++ b/logback-site/src/site/pages/manual/filters.html @@ -24,7 +24,7 @@ </div> <div id="content"> - <h1>Chapter 6: Filters</h1> + <h1>Chapter 7: Filters</h1> <div class="quote"> <p><em>Have lots of ideas and throw away the bad ones. You aren't diff --git a/logback-site/src/site/pages/manual/index.html b/logback-site/src/site/pages/manual/index.html index f4ac339..e8d7e21 100644 --- a/logback-site/src/site/pages/manual/index.html +++ b/logback-site/src/site/pages/manual/index.html @@ -48,6 +48,7 @@ <li><p>logback configuration scripts in XML format</p></li> <li><p>appenders</p></li> <li><p>layouts</p></li> + <li><p>encoders</p></li> <li><p>filters</p></li> <li><p>mapped diagnostic contexts</p></li> <li><p>joran, logback's configuration system</p></li> @@ -89,28 +90,32 @@ <a href="layouts.html"><b>Chapter 5: Layouts</b></a> </p></li> + <li><p> + <a href="encoders.html"><b>Chapter 6: Encoders</b></a> + </p></li> + <li><p> - <a href="filters.html"><b>Chapter 6: Filters</b></a> + <a href="filters.html"><b>Chapter 7: Filters</b></a> </p></li> <li><p> - <a href="mdc.html"><b>Chapter 7: Mapped Diagnostic Context</b></a> + <a href="mdc.html"><b>Chapter 8: Mapped Diagnostic Contexts</b></a> </p></li> <li><p> - <a href="loggingSeparation.html"><b>Chapter 8: Logging Separation</b></a> + <a href="loggingSeparation.html"><b>Chapter 9: Logging Separation</b></a> </p></li> <li><p> - <a href="jmxConfig.html"><b>Chapter 9: JMX Configurator</b></a> + <a href="jmxConfig.html"><b>Chapter 10: JMX Configurator</b></a> </p></li> <li><p> - <a href="onJoran.html"><b>Chapter 10: Joran</b></a> + <a href="onJoran.html"><b>Chapter 11: Joran</b></a> </p></li> <li><p> - <a href="migrationFromLog4j.html"><b>Chapter 11: Migration from log4j</b></a> + <a href="migrationFromLog4j.html"><b>Chapter 12: Migration from log4j</b></a> </p></li> </ul> diff --git a/logback-site/src/site/pages/manual/jmxConfig.html b/logback-site/src/site/pages/manual/jmxConfig.html index 96eeb39..5481188 100644 --- a/logback-site/src/site/pages/manual/jmxConfig.html +++ b/logback-site/src/site/pages/manual/jmxConfig.html @@ -25,7 +25,7 @@ </div> <div id="content"> - <h2>JMX Configurator</h2> + <h2>Chapter 10: JMX Configurator</h2> <p>As its name indicates, <code>JMXConfigurator</code> allows configuration of logback via JMX. In a nutshell, it lets you diff --git a/logback-site/src/site/pages/manual/loggingSeparation.html b/logback-site/src/site/pages/manual/loggingSeparation.html index 4350841..ecea848 100644 --- a/logback-site/src/site/pages/manual/loggingSeparation.html +++ b/logback-site/src/site/pages/manual/loggingSeparation.html @@ -23,7 +23,7 @@ </div> <div id="content"> - <h2>Chapter 9: Context Selectors</h2> + <h2>Chapter 9: Logging separation</h2> <div class="quote"> <p><em>It is not knowledge, but the act of learning, not diff --git a/logback-site/src/site/pages/manual/mdc.html b/logback-site/src/site/pages/manual/mdc.html index 6529648..8b0bf37 100644 --- a/logback-site/src/site/pages/manual/mdc.html +++ b/logback-site/src/site/pages/manual/mdc.html @@ -23,7 +23,7 @@ </div> <div id="content"> - <h1>Chapter 7: Mapped Diagnostic Context</h1> + <h1>Chapter 8: Mapped Diagnostic Context</h1> <div class="quote"> <p><em>Lock the doors.</em></p> diff --git a/logback-site/src/site/pages/manual/menu.js b/logback-site/src/site/pages/manual/menu.js index 5459e11..c41b284 100644 --- a/logback-site/src/site/pages/manual/menu.js +++ b/logback-site/src/site/pages/manual/menu.js @@ -5,9 +5,10 @@ document.write('<p class="menu"><a href="architecture.html"><b>Ch2: Architecture document.write('<p class="menu"><a href="configuration.html"><b>Ch3: Configuration</b></a>'); document.write('<p class="menu"><a href="appenders.html"><b>Ch4: Appenders</b></a>'); document.write('<p class="menu"><a href="layouts.html"><b>Ch5: Layouts</b></a>'); -document.write('<p class="menu"><a href="filters.html"><b>Ch6: Filters</b></a>'); -document.write('<p class="menu"><a href="mdc.html"><b>Ch7: Mapped Diagnostic Contexts</b></a>'); -document.write('<p class="menu"><a href="loggingSeparation.html"><b>Ch8: Logging Separation</b></a>'); -document.write('<p class="menu"><a href="jmxConfig.html"><b>Ch9: JMX Configurator</b></a>'); -document.write('<p class="menu"><a href="onJoran.html"><b>Ch10: Joran</b></a>'); -document.write('<p class="menu"><a href="migrationFromLog4j.html"><b>Ch11: Migration from log4j</b></a>'); +document.write('<p class="menu"><a href="encoders.html"><b>Ch6: Encoders</b></a>'); +document.write('<p class="menu"><a href="filters.html"><b>Ch7: Filters</b></a>'); +document.write('<p class="menu"><a href="mdc.html"><b>Ch8: Mapped Diagnostic Contexts</b></a>'); +document.write('<p class="menu"><a href="loggingSeparation.html"><b>Ch9: Logging Separation</b></a>'); +document.write('<p class="menu"><a href="jmxConfig.html"><b>Ch10: JMX Configurator</b></a>'); +document.write('<p class="menu"><a href="onJoran.html"><b>Ch11: Joran</b></a>'); +document.write('<p class="menu"><a href="migrationFromLog4j.html"><b>Ch12: Migration from log4j</b></a>'); diff --git a/logback-site/src/site/pages/manual/migrationFromLog4j.html b/logback-site/src/site/pages/manual/migrationFromLog4j.html index b9b6e41..dd392cf 100644 --- a/logback-site/src/site/pages/manual/migrationFromLog4j.html +++ b/logback-site/src/site/pages/manual/migrationFromLog4j.html @@ -23,7 +23,7 @@ </div> <div id="content"> - <h2>Migration from log4j</h2> + <h2>Chapter 12: Migration from log4j</h2> <div class="quote"> <p><em>The more things change, the more they remain the diff --git a/logback-site/src/site/pages/manual/onJoran.html b/logback-site/src/site/pages/manual/onJoran.html index b44a270..9c6f259 100644 --- a/logback-site/src/site/pages/manual/onJoran.html +++ b/logback-site/src/site/pages/manual/onJoran.html @@ -23,7 +23,7 @@ </div> <div id="content"> - <h2>Joran in your own applications</h2> + <h2>Chapter 11: Joran</h2> <div class="quote"> <p><em>The answer, my friend, is blowin' in the wind, The answer @@ -176,24 +176,33 @@ import org.xml.sax.Attributes; import ch.qos.logback.core.joran.spi.ExecutionContext; public abstract class Action { - - /** * Called when the parser encounters an element matching a * {@link ch.qos.logback.core.joran.spi.Pattern Pattern}. */ - public abstract void begin(InterpretationContext ec, String name, + public abstract void begin(InterpretationContext ic, String name, Attributes attributes) throws ActionException; + /** + * Called to pass the body (as text) contained within an element. + */ + public void body(InterpretationContext ic, String body) + throws ActionException { + // NOP + } + /* * Called when the parser encounters an endElement event matching a * {@link ch.qos.logback.core.joran.spi.Pattern Pattern}. */ - public abstract void end(InterpretationContext ec, String name) + public abstract void end(InterpretationContext ic, String name) throws ActionException; }</pre> - <p>Thus, every action must implement the begin and end methods.</p> + <p>Thus, every action must implement the <code>begin()</code> and + <code>end()</code> methods. The implemetnation of the + <code>body()</code> method being optional on account of the + empty/nop implementation provided by <code>Action</code>.</p> <h3><a name="ruleStore" href="#ruleStore">RuleStore</a> </h3> ----------------------------------------------------------------------- Summary of changes: .../ch/qos/logback/core/joran/action/Action.java | 30 ++++++++++++-------- logback-site/src/site/pages/manual/encoders.html | 29 +++++++++++++++++++ logback-site/src/site/pages/manual/filters.html | 2 +- logback-site/src/site/pages/manual/index.html | 17 +++++++---- logback-site/src/site/pages/manual/jmxConfig.html | 2 +- .../src/site/pages/manual/loggingSeparation.html | 2 +- logback-site/src/site/pages/manual/mdc.html | 2 +- logback-site/src/site/pages/manual/menu.js | 13 ++++---- .../src/site/pages/manual/migrationFromLog4j.html | 2 +- logback-site/src/site/pages/manual/onJoran.html | 21 ++++++++++---- 10 files changed, 85 insertions(+), 35 deletions(-) create mode 100644 logback-site/src/site/pages/manual/encoders.html hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.
participants (1)
-
git-noreply＠pixie.qos.ch