Author: ceki Date: Thu Nov 2 22:32:45 2006 New Revision: 861 Added: logback/trunk/logback-examples/lib/ logback/trunk/logback-examples/lib/slf4j-api-1.1.0-beta0.jar (contents, props changed) Modified: logback/trunk/logback-site/src/site/xdocTemplates/documentation.xml logback/trunk/logback-site/src/site/xdocTemplates/shortIntro.xml logback/trunk/src/main/assembly/dist.xml Log: Syncing assembly with shortIntro Added: logback/trunk/logback-examples/lib/slf4j-api-1.1.0-beta0.jar ============================================================================== Binary file. No diff available. Modified: logback/trunk/logback-site/src/site/xdocTemplates/documentation.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/documentation.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/documentation.xml Thu Nov 2 22:32:45 2006 @@ -18,7 +18,7 @@ <a href="shortIntro.html"><b>A short introduction to logback-classic</b></a> </li> <li> - <a href="accessLogJetty.html"><b>A short introduction to access logging with logback-access and Jetty</b></a> + <a href="access.html"><b>A short introduction to access logging Jetty and Tomcat</b></a> </li> <li> <a href="joran.html"><b>A introduction to Joran</b></a> Modified: logback/trunk/logback-site/src/site/xdocTemplates/shortIntro.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/shortIntro.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/shortIntro.xml Thu Nov 2 22:32:45 2006 @@ -97,36 +97,32 @@ <h2>First Baby Step</h2> + <h3>Requirements</h3> + <p>Logback-classic module requires the presence <em>slf4j-api.jar</em>, <em>logback-core.jar</em> in addition to <em>logback-classic.jar</em> on the classpath. </p> - <p>in order to falitate running the the examples in this document, - we have placed the required jar files in the - <em>logback-examples/lib</em> directory. Assuming your current - directory is $LOGBACK_HOME/logback-examples, where $LOGBACK_HOME - is the directory you've installed logback, you can start launch - the first example application, chapter1.HelloWord1 with the - following command: - </p> - <div class="source"><pre> - java -cp lib/slf4j-api-1.1.0-beta0.jar;lib/logback-core-${version}.jar;lib/logback-classic-${version}.jar - </pre></div> + <p>Let us now begin experimenting with logback.</p> -<h1>FIXME</h1> - - <p>Assuming the After you - have added the jar files <em>slf4j-api.jar</em>, - <em>logback-core.jar</em>, <em>logback-classic.jar</em> and their - dependencies to your classpath, you can begin experimenting with - logback. To + <p>In order to facilitate running the the examples in this + introduction, we have placed the required jar files in the + <em>$LOGBACK_HOME/logback-examples/lib</em> directory. Assuming + your current directory is $LOGBACK_HOME/logback-examples, where + $LOGBACK_HOME is the directory you've installed logback, you can + start launch the first example application, + <em>chapter1.HelloWord1</em> with the following command: </p> + <div class="source"><pre>java -cp lib/slf4j-api-1.1.0-beta0.jar;../logback-core-${version}.jar;\ + ../logback-classic-${version}.jar;logback-examples-${version}.jar\ + chapter1.HelloWorld1</pre></div> + + - <p>java -cp lib/logback-core-${version}.jar</p> -<em>Example 1.1: Basic template for logging (logback-examples/src/main/java/chapter1/HelloWorld1.java)</em> +<em>Example 1.1: Basic template for logging (<a href="xref/chapter1/HelloWorld1.html">logback-examples/src/main/java/chapter1/HelloWorld1.java</a>)</em> <div class="source"><pre>package chapter1; import org.slf4j.Logger; Modified: logback/trunk/src/main/assembly/dist.xml ============================================================================== --- logback/trunk/src/main/assembly/dist.xml (original) +++ logback/trunk/src/main/assembly/dist.xml Thu Nov 2 22:32:45 2006 @@ -79,10 +79,17 @@ </fileSet> <!-- We also include the classes of the examples module --> <fileSet> - <directory>logback-examples/target/classes/</directory> - <outputDirectory>logback-examples/classes/</outputDirectory> + <directory>logback-examples/target/</directory> + <outputDirectory>logback-examples/</outputDirectory> + <includes> + <include>logback-examples-${project.version}.jar</include> + </includes> </fileSet> - + <fileSet> + <directory>logback-examples/lib/</directory> + <outputDirectory>logback-examples/lib</outputDirectory> + </fileSet> + <!-- Module JARs --> <fileSet> <directory>logback-core/target/</directory>