[slf4j-dev] svn commit: r1201 - in slf4j/trunk: jcl104-over-slf4j slf4j-site/src/site/pages src/main/assembly
ceki at slf4j.org
ceki at slf4j.org
Thu Oct 16 18:55:17 CEST 2008
Author: ceki
Date: Thu Oct 16 18:55:17 2008
New Revision: 1201
Modified:
slf4j/trunk/jcl104-over-slf4j/pom.xml
slf4j/trunk/slf4j-site/src/site/pages/codes.html
slf4j/trunk/slf4j-site/src/site/pages/extensions.html
slf4j/trunk/slf4j-site/src/site/pages/news.html
slf4j/trunk/src/main/assembly/source.xml
Log:
- last minute typo fixes
- added references to the integration module to assembly/source.xml
Modified: slf4j/trunk/jcl104-over-slf4j/pom.xml
==============================================================================
--- slf4j/trunk/jcl104-over-slf4j/pom.xml (original)
+++ slf4j/trunk/jcl104-over-slf4j/pom.xml Thu Oct 16 18:55:17 2008
@@ -10,7 +10,7 @@
<groupId>org.slf4j</groupId>
<artifactId>jcl104-over-slf4j</artifactId>
- <name>DEPRECATED - JCL implemented over SLF4J</name>
+ <name>DEPRECATED - JCL 1.0.4 implemented over SLF4J</name>
<url>http://www.slf4j.org</url>
<description>
Modified: slf4j/trunk/slf4j-site/src/site/pages/codes.html
==============================================================================
--- slf4j/trunk/slf4j-site/src/site/pages/codes.html (original)
+++ slf4j/trunk/slf4j-site/src/site/pages/codes.html Thu Oct 16 18:55:17 2008
@@ -75,7 +75,7 @@
SLF4FLogFactory, does not call any of these methods.
</p>
- <p>If you observe this problem, then it is higly probable that you
+ <p>If you observe this problem, then it is highly probable that you
have a copy of <em>commons-logging.jar</em> in your class path
overriding the classes shipping with
<em>jcl-over-slf4j.jar</em>. Note that this issue is very similar
@@ -154,7 +154,7 @@
<p>However, as reported in <a
href="http://bugzilla.slf4j.org/show_bug.cgi?id=68">bug 68</a>, in
some environments it may be difficult to upgrade the log4j
- version. To accomodate such circumstances, SLF4J's
+ version. To accommodate such circumstances, SLF4J's
<code>Log4jLoggerAdapter</code> will map the TRACE level as
DEBUG.</p>
@@ -178,7 +178,7 @@
</p>
- <h3><a name="substituteLogger" href="#substituteLogger">Substiture
+ <h3><a name="substituteLogger" href="#substituteLogger">Substitute
loggers were created during the default configuration phase of the
underlying logging system</a></h3>
@@ -186,7 +186,7 @@
create components which invoke loggers during their own
initialization. See issue <a
href="http://jira.qos.ch/browse/LBCORE-47">lbcore-47</a> for a
- typical occurence. However, since the binding process with SLF4J has
+ typical occurrence. However, since the binding process with SLF4J has
not yet completed (because the underlying logging system was not yet
completely loaded into memory), it is not possible to honor such
logger creation requests, resulting in a
@@ -206,7 +206,7 @@
</p>
<p>The only way to obtain output from the listed loggers, is to
- isolate the components invoking these loggers and to exlude them
+ isolate the components invoking these loggers and to exclude them
from the default configuration. Both logback and log4j allow
multi-step configuration. It follows that the problematic components
should be configured in a second step separate from default
@@ -214,7 +214,7 @@
</p>
<p>If you are not interested in the output from any of the
- substiture loggers, then no action is required on your part.</p>
+ substitute loggers, then no action is required on your part.</p>
Modified: slf4j/trunk/slf4j-site/src/site/pages/extensions.html
==============================================================================
--- slf4j/trunk/slf4j-site/src/site/pages/extensions.html (original)
+++ slf4j/trunk/slf4j-site/src/site/pages/extensions.html Thu Oct 16 18:55:17 2008
@@ -82,9 +82,9 @@
<code>profiler.start("A")</code> starts a stopwatch named "A". The
subsequent call to <code>profiler.start("B")</code> starts
stopwatch "B" and simultaneously stops the stopwatch named
- "A". Invoking the <code>stop()</code> on a profiler method stops
- the last stopwatch as well as the global stopwatch which was
- started when the profiler was instantiated.
+ "A". Invoking the <code>stop()</code> on a profiler stops the last
+ stopwatch as well as the global stopwatch which was started when
+ the profiler was instantiated.
</p>
Modified: slf4j/trunk/slf4j-site/src/site/pages/news.html
==============================================================================
--- slf4j/trunk/slf4j-site/src/site/pages/news.html (original)
+++ slf4j/trunk/slf4j-site/src/site/pages/news.html Thu Oct 16 18:55:17 2008
@@ -32,22 +32,23 @@
<p>This version corrects critical bugs. You are highly encouraged to
upgrade to SLF4J version 1.5.4. The upgrade should pose no
problems. Nevertheless, you might still want to refer to the <a
- href="compatibility.html#1_5_4">compatibility report</a>.
+ href="compatibility.html#1_5_4">compatibility report</a> for this
+ version.
</p>
<p>Fixed <a
href="http://bugzilla.slf4j.org/show_bug.cgi?id=106">critical bug
- 106</a>. In previous versions of SLF4J, if during intitial binding
- phase, the underlying logging system's default configuration created
- or invoked loggers, a <code>NullPointerException</code> would be
- thrown. See a fuller explanation in the <a
- href="codes.html#substituteLogger">in error codes</a> document.</p>
-
-
- <p>At initialization time, LoggerFactory will check that the version
- of the slf4j-binding matches that of slf4j-api. If there is a
- mismatch a warning will be issued on the console. This should help
- our users identify SLF4J related problems more quickly.</p>
+ 106</a>. In previous versions of SLF4J, if during the initial
+ binding phase, the underlying logging system's default configuration
+ created or invoked loggers, a <code>NullPointerException</code>
+ would be thrown. Refer to the <a
+ href="codes.html#substituteLogger">in error codes</a> document for a
+ fuller explanation.</p>
+
+ <p>At initialization time, LoggerFactory will now check that the
+ version of the slf4j-binding matches that of slf4j-api. If there is
+ a mismatch a warning will be issued on the console. This should help
+ users identify SLF4J related problems more quickly.</p>
<p>Improvements in documentation as well as fix for <a
href="http://bugzilla.slf4j.org/show_bug.cgi?id=102">packaging
@@ -61,7 +62,6 @@
by Jarek Gawor in <a
href="http://bugzilla.slf4j.org/show_bug.cgi?id=103">bug
103</a>.</p>
-
<p>We now say that markers contain <em>references</em> to other
markers. We no longer talk about child markers. The javadocs of the
@@ -94,7 +94,7 @@
a more complete fix which was incorporated in this release.</p>
<p>When slf4j bridges, e.g. jcl-over-slf4j or log4j-over-slf4j, were
- used in conjuction with JUL as the underlying logging system,
+ used in conjunction with JUL as the underlying logging system,
JDK14LoggerAdapter created a LogRecord even for disabled log
statements. This performance issue was reported in <a
href="http://bugzilla.slf4j.org/show_bug.cgi?id=90">bug 90</a> by
Modified: slf4j/trunk/src/main/assembly/source.xml
==============================================================================
--- slf4j/trunk/src/main/assembly/source.xml (original)
+++ slf4j/trunk/src/main/assembly/source.xml Thu Oct 16 18:55:17 2008
@@ -111,6 +111,16 @@
</includes>
</fileSet>
+ <fileSet>
+ <directory>integration/</directory>
+ <outputDirectory>integration/</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>build.xml</include>
+ <include>lib/*</include>
+ </includes>
+ </fileSet>
+
<!-- Module Source directories (includes tests) -->
<fileSet>
<directory>slf4j-api/src/</directory>
@@ -164,10 +174,14 @@
<directory>slf4j-site/src/</directory>
<outputDirectory>slf4j-site/src/</outputDirectory>
</fileSet>
- <fileSet>
+ <fileSet>
<directory>slf4j-migrator/src/</directory>
<outputDirectory>slf4j-migrator/src/</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>integration/src/</directory>
+ <outputDirectory>integration/src/</outputDirectory>
+ </fileSet>
<!-- Module JARs -->
@@ -266,7 +280,15 @@
<outputDirectory>/</outputDirectory>
<includes>
<include>slf4j-migrator-${project.version}.jar</include>
- <include>slf4j-migrator-${project.version}-sources.jar</include>
+ </includes>
+ </fileSet>
+
+
+ <fileSet>
+ <directory>integration/target/</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>integration-${project.version}.jar</include>
</includes>
</fileSet>
More information about the slf4j-dev
mailing list