Author: ceki
Date: Mon Sep 4 22:07:32 2006
New Revision: 638
Added:
slf4j/trunk/slf4j-site/src/site/fml/faq.xml
Removed:
slf4j/trunk/slf4j-site/src/site/bug-reporting.xml
slf4j/trunk/slf4j-site/src/site/codes.xml
slf4j/trunk/slf4j-site/src/site/docs.xml
slf4j/trunk/slf4j-site/src/site/download.xml
slf4j/trunk/slf4j-site/src/site/index.xml
slf4j/trunk/slf4j-site/src/site/license.xml
slf4j/trunk/slf4j-site/src/site/mailing-lists.xml
slf4j/trunk/slf4j-site/src/site/manual.xml
slf4j/trunk/slf4j-site/src/site/news.xml
slf4j/trunk/slf4j-site/src/site/svn.xml
Modified:
slf4j/trunk/TODO.txt
slf4j/trunk/pom.xml
slf4j/trunk/slf4j-site/pom.xml
slf4j/trunk/slf4j-site/src/site/site.xml
slf4j/trunk/slf4j-site/src/site/xdocs/license.xml
slf4j/trunk/slf4j-site/src/site/xdocs/svn.xml
slf4j/trunk/src/main/assembly/source.xml
Log:
minor updates
Modified: slf4j/trunk/TODO.txt
==============================================================================
--- slf4j/trunk/TODO.txt (original)
+++ slf4j/trunk/TODO.txt Mon Sep 4 22:07:32 2006
@@ -2,9 +2,9 @@
TODO ITEMS
==========
-- Build javadocs
-- import tests
-- create distribution
+- FAQ using maven
+- javadoc aggregation
+- support for log4j 1.3
DONE ITEMS
==========
Modified: slf4j/trunk/pom.xml
==============================================================================
--- slf4j/trunk/pom.xml (original)
+++ slf4j/trunk/pom.xml Mon Sep 4 22:07:32 2006
@@ -67,12 +67,25 @@
</excludes>
</configuration>
</plugin>
-
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
+ <destDir>/target/site/api</destDir>
<aggregate>true</aggregate>
<links>
<link>
Modified: slf4j/trunk/slf4j-site/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-site/pom.xml (original)
+++ slf4j/trunk/slf4j-site/pom.xml Mon Sep 4 22:07:32 2006
@@ -13,7 +13,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-site</artifactId>
<version>${parent.version}</version>
- <packaging>jar</packaging>
+ <packaging>pom</packaging>
<name>SLF4J Site</name>
<url>http://www.slf4j.org</url>
@@ -25,18 +25,6 @@
<inceptionYear>2005</inceptionYear>
<build>
- <resources>
- <resource>
- <directory>src/site/xdocTemplates</directory>
- <!--
- We're saving filtered xdocs in a
temporary folder
- and telling the site plug in to get the
xdocs there.
- -->
- <targetPath>generated-site</targetPath>
- <filtering>true</filtering>
- </resource>
- </resources>
-
</build>
<reporting>
@@ -45,9 +33,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<configuration>
- <xdocDirectory>
-
${project.build.outputDirectory}/generated-site
- </xdocDirectory>
+
<xdocDirectory>src/site/xdocs</xdocDirectory>
<outputDirectory>${project.parent.basedir}/target/site</outputDirectory>
</configuration>
</plugin>
Added: slf4j/trunk/slf4j-site/src/site/fml/faq.xml
==============================================================================
--- (empty file)
+++ slf4j/trunk/slf4j-site/src/site/fml/faq.xml Mon Sep 4 22:07:32 2006
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+
+<document>
+
+<faqs title="Frequently Asked Questions about SLF4J">
+
+ <part id="Generalities">
+ <title>Generalities</title>
+
+ <text>
+ <p>This section contains general questions about SLF4J.</p>
+ </text>
+
+ <faq>
+ <question>
+ <title>What is SLF4J?</title>
+ </question>
+ <answer>
+ <p>SLF4J is a simple facade for logging systems allowing the
+ end-user to plug-in the desired logging system at deployment
+ time.
+ </p>
+ </answer>
+ </faq>
+
+ <faq>
+ <question>
+ <title>When should SLF4J be used?</title>
+ </question>
+ <answer>
+ <p>In short, libraries and other embedded components should
+ consider SLF4J for their logging needs because libraries
+ cannot afford to impose their choice of logging system on the
+ end-user. On the other hand, it does not necessarily make
+ sense for stand-alone applications to use SLF4J. Stand-alone
+ applications can invoke the logging system of their choice
+ directly.
+ </p>
+
+ <p>SLF4J is only a facade, meaning that it does not provide a
+ complete logging solution. Operations such as configuring
+ appenders or setting logging levels cannot be performed with
+ SLF4J. Thus, at same point in time, any non-trivial
+ application will need to directly invoke the underlying
+ logging system. In other words, complete independence from the
+ API underlying logging system is not possible for a
+ stand-alone application. Nevertheless, SLF4J reduces the
+ impact of this dependence to near-painless levels.
+ </p>
+
+ <p>Suppose that your CRM application uses log4j for its
+ logging. However, one of your important clients request that
+ logging be performed through JDK 1.4 logging. If your
+ application is riddled with thousands of direct log4j calls,
+ migration to JDK 1.4 would be a long and error-prone
+ process. Had you been invoking SLF4J API instead of log4j, the
+ migration could be completed in a matter of minutes instead of
+ hours.
+ </p>
+
+ <p>SLF4J lets component developers to defer the choice of the
+ logging system to the end-user but eventually a choice needs
+ to be made.
+ </p>
+
+ </answer>
+ </faq>
+
+ </part>
+</faqs>
\ No newline at end of file
Modified: slf4j/trunk/slf4j-site/src/site/site.xml
==============================================================================
--- slf4j/trunk/slf4j-site/src/site/site.xml (original)
+++ slf4j/trunk/slf4j-site/src/site/site.xml Mon Sep 4 22:07:32 2006
@@ -28,7 +28,6 @@
</menu>
<menu name="Native implementations">
<item name="Logback" href="http://logback.qos.ch/"/>
- <item name="NLOG4J" href="http://www.slf4j.org/nlog4j/"/>
<item name="x4juli" href="http://www.x4juli.org/"/>
</menu>
<menu name="Wrapped implementations">
Modified: slf4j/trunk/slf4j-site/src/site/xdocs/license.xml
==============================================================================
--- slf4j/trunk/slf4j-site/src/site/xdocs/license.xml (original)
+++ slf4j/trunk/slf4j-site/src/site/xdocs/license.xml Mon Sep 4 22:07:32 2006
@@ -14,7 +14,7 @@
following license.
</p>
- <p class="source">
+ <div class="source">
Copyright (c) 2004-2005 SLF4J.ORG
Copyright (c) 2004-2005 QOS.ch
@@ -44,7 +44,7 @@
shall not be used in advertising or otherwise to promote the sale, use
or other dealings in this Software without prior written authorization
of the copyright holder.
- </p>
+ </div>
<p>These terms are <em>identical</em> to those of the X11 License,
which is a simple, permissive non-copyleft free software license,
Modified: slf4j/trunk/slf4j-site/src/site/xdocs/svn.xml
==============================================================================
--- slf4j/trunk/slf4j-site/src/site/xdocs/svn.xml (original)
+++ slf4j/trunk/slf4j-site/src/site/xdocs/svn.xml Mon Sep 4 22:07:32 2006
@@ -29,25 +29,18 @@
<h2>Web Access</h2>
<p>If you just wish to browse around or download a few individual
- files, the best tool is the web-based ViewCVS interface for CVS
- repositories and ViewCVS interface for Subversion or go straight to
- the public repositories at:
+ files, the best tool is the web-based ViewVC interface for
+ Subversion repositories:
</p>
<table cellspacing="6">
<tr>
<td>For SLF4J </td>
- <td><a href="http://svn.slf4j.org/viewcvs/slf4j/trunk/";>
- http://svn.slf4j.org/viewcvs/slf4j/trunk/</a>
+ <td><a href="http://svn.slf4j.org/viewvc/slf4j/trunk/";>
+ http://svn.slf4j.org/viewvc/slf4j/trunk/</a>
</td>
</tr>
- <tr>
- <td>For NLOG4J </td>
- <td><a href="http://svn.slf4j.org/viewcvs/nlog4j/trunk/";>
- http://svn.slf4j.org/viewcvs/nlog4j/trunk/</a>
- </td>
- </tr>
</table>
<h2>Checking out a read-only copy</h2>
@@ -61,11 +54,6 @@
<pre class="cmd">svn checkout
<b>http://svn.slf4j.org/repos/slf4j/trunk</b></pre>
-
- <p>To check out the NLOG4J module, issue the following command: </p>
-
- <pre class="cmd">svn checkout
<b>http://svn.slf4j.org/repos/nlog4j/trunk</b></pre>
-
<p>Note that anonymous access allows read-only access only. For
read-write access please contact the <a
href="http://slf4j.org/mailman/listinfo/dev";>slf4j developer list</a>.
Modified: slf4j/trunk/src/main/assembly/source.xml
==============================================================================
--- slf4j/trunk/src/main/assembly/source.xml (original)
+++ slf4j/trunk/src/main/assembly/source.xml Mon Sep 4 22:07:32 2006
@@ -22,8 +22,6 @@
</includes>
</fileSet>
-
-
<fileSet>
<directory>slf4j-jdk14/</directory>
<outputDirectory>slf4j-jdk14/</outputDirectory>
@@ -32,8 +30,39 @@
</includes>
</fileSet>
-
- <!-- Module Source directories -->
+ <fileSet>
+ <directory>slf4j-log4j12/</directory>
+ <outputDirectory>slf4j-log4j12/</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>slf4j-nop/</directory>
+ <outputDirectory>slf4j-nop/</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>slf4j-simple/</directory>
+ <outputDirectory>slf4j-simple/</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>jcl104-over-slf4j/</directory>
+ <outputDirectory>jcl104-over-slf4j/</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ </includes>
+ </fileSet>
+
+ <!-- Module Source directories (includes tests) -->
<fileSet>
<directory>slf4j-api/src/</directory>
<outputDirectory>slf4j-api/src/</outputDirectory>
@@ -44,28 +73,97 @@
</excludes>
</fileSet>
+ <fileSet>
+ <directory>slf4j-jcl/src/</directory>
+ <outputDirectory>slf4j-jcl/src/</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>slf4j-jdk14/src/</directory>
+ <outputDirectory>slf4j-jdk14/src/</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>slf4j-log4j12/src/</directory>
+ <outputDirectory>slf4j-log4j12/src/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>slf4j-nop/src/</directory>
+ <outputDirectory>slf4j-nop/src/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>slf4j-jcl/src/</directory>
+ <outputDirectory>slf4j-jcl/src/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>jcl104-over-slf4j/src/</directory>
+
<outputDirectory>jcl104-over-slf4j/src/</outputDirectory>
+ </fileSet>
+
<!-- Module JARs -->
<fileSet>
<directory>slf4j-api/target/</directory>
<outputDirectory>/</outputDirectory>
<includes>
-
<include>slf4j-api-${project.version}.jar</include>
+
<include>slf4j-api-${project.version}*.jar</include>
</includes>
</fileSet>
- <!-- Module Source JARs -->
<fileSet>
- <directory>slf4j-api/target/</directory>
+ <directory>slf4j-jcl/target/</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+
<include>slf4j-jcl-${project.version}*.jar</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>slf4j-jdk14/target/</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+
<include>slf4j-jdk14-${project.version}*.jar</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>slf4j-log4j12/target/</directory>
<outputDirectory>/</outputDirectory>
<includes>
-
<include>slf4j-api-${project.version}-sources.jar</include>
+
<include>slf4j-log4j12-${project.version}*.jar</include>
</includes>
</fileSet>
+
+ <fileSet>
+ <directory>slf4j-nop/target/</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+
<include>slf4j-nop-${project.version}*.jar</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>slf4j-simple/target/</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+
<include>slf4j-simple-${project.version}*.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>jcl104-over-slf4j/target/</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+
<include>jcl104-over-slf4j-${project.version}*.jar</include>
+ </includes>
+ </fileSet>
+
<!-- Website -->
<fileSet>
<directory>target/site</directory>
<outputDirectory>/site</outputDirectory>
+ <excludes>
+ <exclude>dist/*</exclude>
+ </excludes>
</fileSet>
<!-- Parent files -->
_______________________________________________
dev mailing list
[email protected]
http://www.slf4j.org/mailman/listinfo/dev
