Author: ceki Date: Tue Oct 28 16:57:42 2008 New Revision: 1893 Modified: logback/trunk/logback-site/src/site/pages/bugreport.html logback/trunk/logback-site/src/site/pages/download.html logback/trunk/logback-site/src/site/pages/license.html logback/trunk/logback-site/src/site/pages/mailinglist.html logback/trunk/logback-site/src/site/pages/manual/joran.html logback/trunk/logback-site/src/site/pages/news.html logback/trunk/logback-site/src/site/pages/repos.html logback/trunk/logback-site/src/site/pages/support.html logback/trunk/logback-site/src/site/pages/team.html Log: - remove right menu Modified: logback/trunk/logback-site/src/site/pages/bugreport.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/bugreport.html (original) +++ logback/trunk/logback-site/src/site/pages/bugreport.html Tue Oct 28 16:57:42 2008 @@ -14,9 +14,6 @@ <div id="left"> <script src="templates/left.js"></script> </div> -<div id="right"> - <script src="templates/right.js"></script> -</div> <div id="content"> Modified: logback/trunk/logback-site/src/site/pages/download.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/download.html (original) +++ logback/trunk/logback-site/src/site/pages/download.html Tue Oct 28 16:57:42 2008 @@ -14,9 +14,6 @@ <div id="left"> <script src="templates/left.js"></script> </div> -<div id="right"> - <script src="templates/right.js"></script> -</div> <div id="content"> Modified: logback/trunk/logback-site/src/site/pages/license.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/license.html (original) +++ logback/trunk/logback-site/src/site/pages/license.html Tue Oct 28 16:57:42 2008 @@ -14,9 +14,6 @@ <div id="left"> <script src="templates/left.js"></script> </div> -<div id="right"> - <script src="templates/right.js"></script> -</div> <div id="content"> <div class="section"> Modified: logback/trunk/logback-site/src/site/pages/mailinglist.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/mailinglist.html (original) +++ logback/trunk/logback-site/src/site/pages/mailinglist.html Tue Oct 28 16:57:42 2008 @@ -14,9 +14,6 @@ <div id="left"> <script src="templates/left.js"></script> </div> -<div id="right"> - <script src="templates/right.js"></script> -</div> <div id="content"> Modified: logback/trunk/logback-site/src/site/pages/manual/joran.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/manual/joran.html (original) +++ logback/trunk/logback-site/src/site/pages/manual/joran.html Tue Oct 28 16:57:42 2008 @@ -918,7 +918,7 @@ <div class="source"><pre><configuration> - <b><substitutionProperty name="USER_HOME" value="/home/sebastien" /></b> + <b><property name="USER_HOME" value="/home/sebastien" /></b> <appender name="FILE" class="ch.qos.logback.core.FileAppender"> @@ -976,20 +976,19 @@ <div class="source"><pre><configuration> - <b><substitutionProperty file="variables1.properties" /></b> + <b><property file="src/main/java/chapter3/variables1.properties" /></b> - <appender name="FILE" - class="ch.qos.logback.core.FileAppender"> - <b><file>${USER_HOME}/myApp.log</file></b> - <layout class="ch.qos.logback.classic.PatternLayout"> - <Pattern>%msg%n</Pattern> - </layout> - </appender> - - <root> - <level value="debug" /> - <appender-ref ref="FILE" /> - </root> + <appender name="FILE" + class="ch.qos.logback.core.FileAppender"> + <b><file>${USER_HOME}/myApp.log</file></b> + <layout class="ch.qos.logback.classic.PatternLayout"> + <Pattern>%msg%n</Pattern> + </layout> + </appender> + + <root level="debug"> + <appender-ref ref="FILE" /> + </root> </configuration></pre></div> <p>This configuration file contains a reference to a file named @@ -1004,6 +1003,31 @@ <div class="source"><pre>USER_HOME=/home/sebastien</pre></div> + <p>You may also reference a resource on the class path instead of a + file.</p> + + <div class="source"><pre><configuration> + + <b><property resource="resource1.properties" /></b> + + <appender name="FILE" + class="ch.qos.logback.core.FileAppender"> + <b><file>${USER_HOME}/myApp.log</file></b> + <layout class="ch.qos.logback.classic.PatternLayout"> + <Pattern>%msg%n</Pattern> + </layout> + </appender> + + <root level="debug"> + <appender-ref ref="FILE" /> + </root> +</configuration></pre></div> + + + + + <h4>Nested variable substitution</h4> + <p>Nested variabled subsitution is also supported. By nested, we mean that the value definition of a variable contains references to other variables. Suppose you wish to use variables to specify not @@ -1031,7 +1055,7 @@ <div class="source"><pre><configuration> - <substitutionProperty file="variables2.properties" /> + <property file="variables2.properties" /> <appender name="FILE" class="ch.qos.logback.core.FileAppender"> @@ -1047,7 +1071,7 @@ </root> </configuration></pre></div> - <h3>Default substitution values for variables</h3> + <h4>Default substitution values for variables</h4> <p>Under certain circumstances, it may be desirable for a variable to have a default value in case it is not declared or its value is Modified: logback/trunk/logback-site/src/site/pages/news.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/news.html (original) +++ logback/trunk/logback-site/src/site/pages/news.html Tue Oct 28 16:57:42 2008 @@ -14,9 +14,6 @@ <div id="left"> <script src="templates/left.js"></script> </div> -<div id="right"> - <script src="templates/right.js"></script> -</div> <div id="content"> <h2>Logback News</h2> @@ -28,6 +25,15 @@ <hr width="80%" align="center" /> + <h3>28th of November 2008 - Release of version 0.9.12</h3> + + <p>Fixed <a href="http://jira.qos.ch/browse/LBCORE-43">LBCORE-43</a> + reported by Bruno Navert. Configuration files can now look up + property files from classpath resources. + </p> + + <hr width="80%" align="center" /> + <h3>28th of October 2008 - Release of version 0.9.11</h3> <p>Fixed <a Modified: logback/trunk/logback-site/src/site/pages/repos.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/repos.html (original) +++ logback/trunk/logback-site/src/site/pages/repos.html Tue Oct 28 16:57:42 2008 @@ -14,9 +14,6 @@ <div id="left"> <script src="templates/left.js"></script> </div> -<div id="right"> - <script src="templates/right.js"></script> -</div> <div id="content"> Modified: logback/trunk/logback-site/src/site/pages/support.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/support.html (original) +++ logback/trunk/logback-site/src/site/pages/support.html Tue Oct 28 16:57:42 2008 @@ -35,7 +35,7 @@ <table border="0"> <tr> - <td>For a professional support contract quote please + <td>For a quote for "Professional Support Contract" please contact:</td> <td><img src="images/helpEMAIL.gif" alt=""/></td> </tr> Modified: logback/trunk/logback-site/src/site/pages/team.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/team.html (original) +++ logback/trunk/logback-site/src/site/pages/team.html Tue Oct 28 16:57:42 2008 @@ -14,9 +14,6 @@ <div id="left"> <script src="templates/left.js"></script> </div> -<div id="right"> - <script src="templates/right.js"></script> -</div> <div id="content">