Author: ceki Date: Fri May 18 22:57:38 2007 New Revision: 812 Modified: slf4j/trunk/goVersion.sh slf4j/trunk/jcl104-over-slf4j/pom.xml slf4j/trunk/osgi-over-slf4j/pom.xml slf4j/trunk/pom.xml slf4j/trunk/slf4j-api/pom.xml slf4j/trunk/slf4j-archetype/pom.xml slf4j/trunk/slf4j-archetype/src/main/resources/META-INF/maven/archetype.xml slf4j/trunk/slf4j-archetype/src/main/resources/archetype-resources/pom.xml slf4j/trunk/slf4j-archetype/src/main/resources/archetype-resources/src/main/java/impl/NOPLogger.java slf4j/trunk/slf4j-archetype/src/main/resources/archetype-resources/src/main/java/impl/StaticLoggerBinder.java slf4j/trunk/slf4j-archetype/src/main/resources/archetype-resources/src/main/java/impl/StaticMarkerBinder.java slf4j/trunk/slf4j-archetype/src/main/resources/archetype-resources/src/test/java/InvocationTest.java slf4j/trunk/slf4j-jcl/pom.xml slf4j/trunk/slf4j-jdk14/pom.xml slf4j/trunk/slf4j-log4j12/pom.xml slf4j/trunk/slf4j-nop/pom.xml slf4j/trunk/slf4j-osgi-integration-test/pom.xml slf4j/trunk/slf4j-osgi-test-bundle/pom.xml slf4j/trunk/slf4j-simple/pom.xml slf4j/trunk/slf4j-site/pom.xml slf4j/trunk/slf4j-site/src/site/pages/faq.html slf4j/trunk/slf4j-site/src/site/pages/news.html
Log: - changing version number to 1.4.0 preparation for a release - modified carious pom.xml file to inherit the version number for the slf4j-api project from slf4j-parent module - fixed slf4j-archetype module (it can now create a functional albeit simple SLF4J binding) - updated the FAQ and news in preparation for the 1.4.0 release Modified: slf4j/trunk/goVersion.sh ============================================================================== --- slf4j/trunk/goVersion.sh (original) +++ slf4j/trunk/goVersion.sh Fri May 18 22:57:38 2007 @@ -2,5 +2,5 @@ VER=$1 echo "Will use version $VER" -find . -name "pom.xml" |xargs perl version.pl $VER +find . -name "pom.xml" |grep -v archetype-resources|xargs perl version.pl $VER perl version.pl $VER ./slf4j-site/src/site/site.xml \ No newline at end of file Modified: slf4j/trunk/jcl104-over-slf4j/pom.xml ============================================================================== --- slf4j/trunk/jcl104-over-slf4j/pom.xml (original) +++ slf4j/trunk/jcl104-over-slf4j/pom.xml Fri May 18 22:57:38 2007 @@ -3,7 +3,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.0</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: slf4j/trunk/osgi-over-slf4j/pom.xml ============================================================================== --- slf4j/trunk/osgi-over-slf4j/pom.xml (original) +++ slf4j/trunk/osgi-over-slf4j/pom.xml Fri May 18 22:57:38 2007 @@ -3,7 +3,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.0</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: slf4j/trunk/pom.xml ============================================================================== --- slf4j/trunk/pom.xml (original) +++ slf4j/trunk/pom.xml Fri May 18 22:57:38 2007 @@ -5,7 +5,7 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.0</version> <packaging>pom</packaging> <name>SLF4J</name> @@ -46,9 +46,24 @@ </dependencies> - <dependencyManagement> - <dependencies/> - </dependencyManagement> + <dependencyManagement> + <dependencies> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>slf4j-api</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.13</version> + </dependency> + + </dependencies> + </dependencyManagement> + <build> <plugins> Modified: slf4j/trunk/slf4j-api/pom.xml ============================================================================== --- slf4j/trunk/slf4j-api/pom.xml (original) +++ slf4j/trunk/slf4j-api/pom.xml Fri May 18 22:57:38 2007 @@ -5,7 +5,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.0</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: slf4j/trunk/slf4j-archetype/pom.xml ============================================================================== --- slf4j/trunk/slf4j-archetype/pom.xml (original) +++ slf4j/trunk/slf4j-archetype/pom.xml Fri May 18 22:57:38 2007 @@ -2,7 +2,7 @@ <parent> <artifactId>slf4j-parent</artifactId> <groupId>org.slf4j</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.0</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: slf4j/trunk/slf4j-archetype/src/main/resources/META-INF/maven/archetype.xml ============================================================================== --- slf4j/trunk/slf4j-archetype/src/main/resources/META-INF/maven/archetype.xml (original) +++ slf4j/trunk/slf4j-archetype/src/main/resources/META-INF/maven/archetype.xml Fri May 18 22:57:38 2007 @@ -4,7 +4,8 @@ <sources> <source>src/main/java/impl/StaticLoggerBinder.java</source> <source>src/main/java/impl/StaticMarkerBinder.java</source> - <source>src/main/java/impl/*.java</source> + <source>src/main/java/impl/NOPLoggerFactory.java</source> + <source>src/main/java/impl/NOPLogger.java</source> </sources> <testSources> <source>src/test/java/InvocationTest.java</source> Modified: slf4j/trunk/slf4j-archetype/src/main/resources/archetype-resources/pom.xml ============================================================================== --- slf4j/trunk/slf4j-archetype/src/main/resources/archetype-resources/pom.xml (original) +++ slf4j/trunk/slf4j-archetype/src/main/resources/archetype-resources/pom.xml Fri May 18 22:57:38 2007 @@ -5,19 +5,25 @@ <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> - </parent> - <groupId>$groupId</groupId> <artifactId>$artifactId</artifactId> - <version>$version</version> + <version>1.0-SNAPSHOT</version> <packaging>jar</packaging> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> - <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.4.0</version> + </dependency> </dependencies> + </project> Modified: slf4j/trunk/slf4j-archetype/src/main/resources/archetype-resources/src/main/java/impl/NOPLogger.java ============================================================================== --- slf4j/trunk/slf4j-archetype/src/main/resources/archetype-resources/src/main/java/impl/NOPLogger.java (original) +++ slf4j/trunk/slf4j-archetype/src/main/resources/archetype-resources/src/main/java/impl/NOPLogger.java Fri May 18 22:57:38 2007 @@ -34,7 +34,7 @@ package org.slf4j.impl; import org.slf4j.Logger; - +import org.slf4j.helpers.MarkerIgnoringBase; /** * A direct NOP (no operation) implementation of [EMAIL PROTECTED] Logger}. @@ -61,6 +61,39 @@ return "NOP"; } + /** + * Always returns false. + * @return always false + */ + final public boolean isTraceEnabled() { + return false; + } + + /** A NOP implementation. */ + final public void trace(String msg) { + // NOP + } + + /** A NOP implementation. */ + final public void trace(String format, Object arg) { + // NOP + } + + /** A NOP implementation. */ + public final void trace(String format, Object arg1, Object arg2) { + // NOP + } + + /** A NOP implementation. */ + public final void trace(String format, Object[] argArray) { + // NOP + } + + /** A NOP implementation. */ + final public void trace(String msg, Throwable t) { + // NOP + } + /** * Always returns false. * @return always false Modified: slf4j/trunk/slf4j-archetype/src/main/resources/archetype-resources/src/main/java/impl/StaticLoggerBinder.java ============================================================================== --- slf4j/trunk/slf4j-archetype/src/main/resources/archetype-resources/src/main/java/impl/StaticLoggerBinder.java (original) +++ slf4j/trunk/slf4j-archetype/src/main/resources/archetype-resources/src/main/java/impl/StaticLoggerBinder.java Fri May 18 22:57:38 2007 @@ -52,7 +52,7 @@ */ public static final StaticLoggerBinder SINGLETON = new StaticLoggerBinder(); // Note: JCL gets substituted at build time by an appropriate Ant task - private static final String loggerFactoryClassStr = ${IMPL}LoggerFactory.class.getName(); + private static final String loggerFactoryClassStr = NOPLoggerFactory.class.getName(); /** The ILoggerFactory instance returned by the [EMAIL PROTECTED] #getLoggerFactory} method * should always be the same object @@ -60,7 +60,7 @@ private final ILoggerFactory loggerFactory; private StaticLoggerBinder() { - loggerFactory = new ${IMPL}LoggerFactory(); + loggerFactory = new NOPLoggerFactory(); } public ILoggerFactory getLoggerFactory() { Modified: slf4j/trunk/slf4j-archetype/src/main/resources/archetype-resources/src/main/java/impl/StaticMarkerBinder.java ============================================================================== --- slf4j/trunk/slf4j-archetype/src/main/resources/archetype-resources/src/main/java/impl/StaticMarkerBinder.java (original) +++ slf4j/trunk/slf4j-archetype/src/main/resources/archetype-resources/src/main/java/impl/StaticMarkerBinder.java Fri May 18 22:57:38 2007 @@ -35,8 +35,10 @@ import org.slf4j.IMarkerFactory; import org.slf4j.MarkerFactory; +import org.slf4j.helpers.BasicMarkerFactory; import org.slf4j.spi.MarkerFactoryBinder; + /** * * The binding of [EMAIL PROTECTED] MarkerFactory} class with an actual instance of Modified: slf4j/trunk/slf4j-archetype/src/main/resources/archetype-resources/src/test/java/InvocationTest.java ============================================================================== --- slf4j/trunk/slf4j-archetype/src/main/resources/archetype-resources/src/test/java/InvocationTest.java (original) +++ slf4j/trunk/slf4j-archetype/src/main/resources/archetype-resources/src/test/java/InvocationTest.java Fri May 18 22:57:38 2007 @@ -42,9 +42,9 @@ * @author Ceki Gulcu * */ -public class InvocatonTest extends TestCase { +public class InvocationTest extends TestCase { - public InvocatonTest (String arg0) { + public InvocationTest (String arg0) { super(arg0); } Modified: slf4j/trunk/slf4j-jcl/pom.xml ============================================================================== --- slf4j/trunk/slf4j-jcl/pom.xml (original) +++ slf4j/trunk/slf4j-jcl/pom.xml Fri May 18 22:57:38 2007 @@ -3,7 +3,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.0</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -23,8 +23,7 @@ <dependencies> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${project.version}</version> + <artifactId>slf4j-api</artifactId> </dependency> <dependency> Modified: slf4j/trunk/slf4j-jdk14/pom.xml ============================================================================== --- slf4j/trunk/slf4j-jdk14/pom.xml (original) +++ slf4j/trunk/slf4j-jdk14/pom.xml Fri May 18 22:57:38 2007 @@ -6,7 +6,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.0</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -27,7 +27,6 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${project.version}</version> </dependency> </dependencies> Modified: slf4j/trunk/slf4j-log4j12/pom.xml ============================================================================== --- slf4j/trunk/slf4j-log4j12/pom.xml (original) +++ slf4j/trunk/slf4j-log4j12/pom.xml Fri May 18 22:57:38 2007 @@ -6,7 +6,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.0</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -26,14 +26,12 @@ <dependencies> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${project.version}</version> + <artifactId>slf4j-api</artifactId> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.13</version> </dependency> </dependencies> Modified: slf4j/trunk/slf4j-nop/pom.xml ============================================================================== --- slf4j/trunk/slf4j-nop/pom.xml (original) +++ slf4j/trunk/slf4j-nop/pom.xml Fri May 18 22:57:38 2007 @@ -6,7 +6,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.0</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -26,7 +26,6 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${project.version}</version> </dependency> </dependencies> Modified: slf4j/trunk/slf4j-osgi-integration-test/pom.xml ============================================================================== --- slf4j/trunk/slf4j-osgi-integration-test/pom.xml (original) +++ slf4j/trunk/slf4j-osgi-integration-test/pom.xml Fri May 18 22:57:38 2007 @@ -1,4 +1,4 @@ -<project +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> @@ -6,7 +6,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.0</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -50,63 +50,63 @@ <artifactId>slf4j-osgi-test-bundle</artifactId> <version>${parent.version}</version> <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework.osgi</groupId> - <artifactId>org.springframework.osgi.test</artifactId> - <version>1.0-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.springframework.osgi</groupId> - <artifactId>spring-core</artifactId> - <version>2.1-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.springframework.osgi</groupId> - <artifactId>spring-context</artifactId> - <version>2.1-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.springframework.osgi</groupId> - <artifactId>spring-beans</artifactId> - <version>2.1-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - - - <dependency> - <groupId>org.springframework.osgi</groupId> - <artifactId>spring-mock</artifactId> - <version>2.1-SNAPSHOT</version> - <type>jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework.osgi</groupId> - <artifactId>jcl104-over-slf4j.osgi</artifactId> - <version>1.1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j-full</artifactId> - <version>1.1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.springframework.osgi</groupId> - <artifactId>log4j.osgi</artifactId> - <version>1.2.13-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework.osgi</groupId> - <artifactId>backport-util-concurrent</artifactId> - <version>3.0-SNAPSHOT</version> - <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework.osgi</groupId> + <artifactId>org.springframework.osgi.test</artifactId> + <version>1.0-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.springframework.osgi</groupId> + <artifactId>spring-core</artifactId> + <version>2.1-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.springframework.osgi</groupId> + <artifactId>spring-context</artifactId> + <version>2.1-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.springframework.osgi</groupId> + <artifactId>spring-beans</artifactId> + <version>2.1-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + + + <dependency> + <groupId>org.springframework.osgi</groupId> + <artifactId>spring-mock</artifactId> + <version>2.1-SNAPSHOT</version> + <type>jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework.osgi</groupId> + <artifactId>jcl104-over-slf4j.osgi</artifactId> + <version>1.1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j-full</artifactId> + <version>1.1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.springframework.osgi</groupId> + <artifactId>log4j.osgi</artifactId> + <version>1.2.13-SNAPSHOT</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework.osgi</groupId> + <artifactId>backport-util-concurrent</artifactId> + <version>3.0-SNAPSHOT</version> + <scope>test</scope> </dependency> </dependencies> Modified: slf4j/trunk/slf4j-osgi-test-bundle/pom.xml ============================================================================== --- slf4j/trunk/slf4j-osgi-test-bundle/pom.xml (original) +++ slf4j/trunk/slf4j-osgi-test-bundle/pom.xml Fri May 18 22:57:38 2007 @@ -6,7 +6,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.0</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -26,9 +26,9 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${project.version}</version> <scope>provided</scope> </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-nop</artifactId> Modified: slf4j/trunk/slf4j-simple/pom.xml ============================================================================== --- slf4j/trunk/slf4j-simple/pom.xml (original) +++ slf4j/trunk/slf4j-simple/pom.xml Fri May 18 22:57:38 2007 @@ -3,7 +3,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.0</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -21,7 +21,6 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${project.version}</version> </dependency> </dependencies> Modified: slf4j/trunk/slf4j-site/pom.xml ============================================================================== --- slf4j/trunk/slf4j-site/pom.xml (original) +++ slf4j/trunk/slf4j-site/pom.xml Fri May 18 22:57:38 2007 @@ -5,7 +5,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.0</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: slf4j/trunk/slf4j-site/src/site/pages/faq.html ============================================================================== --- slf4j/trunk/slf4j-site/src/site/pages/faq.html (original) +++ slf4j/trunk/slf4j-site/src/site/pages/faq.html Fri May 18 22:57:38 2007 @@ -775,7 +775,7 @@ alredy in place.</p> <p class="source">mvn archetype:create -DgroupId=org.slf4j -DartifactId=slf4j-MY \ - -DarchetypeGroupId=org.slf4j -DarchetypeArtifactId=slf4j-archetype -DarchetypeVersion=1.1.0</p> + -DarchetypeGroupId=org.slf4j -DarchetypeArtifactId=slf4j-archetype -DarchetypeVersion=${project.version}</p> <p>At this stage, assuming your logging system has notion of a logger, called say <code>MyLogger</code>, you need to provide 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 Fri May 18 22:57:38 2007 @@ -34,11 +34,21 @@ <p>In response to many user requests over time, the TRACE level has - been added to <a href="">org.slf4j.Logger</a> interface. Please also - see the <a href="">FAQ entry discussing</a> the TRACE level. + been added to <a + href="api/org/slf4j/Logger.html">org.slf4j.Logger</a> + interface. Please also see the <a href="faq.html#trace">FAQ entry + discussing</a> the TRACE level. </p> + <p>Fixed <a href="http://bugzilla.slf4j.org/show_bug.cgi?id=47">bug + 47</a> as reported by Terry Todd. In previous a SLF4J release the + <code>org.apache.commons.logging.impl.SLF4FLogFactory</code> class + was renamed as <code>SLF4JLogFactory</code>. The + <em>META-INF/services/org.apache.commons.logging.LogFactory</em> + resource file had not reflected this change. It does now. + </p> + <hr noshade="noshade" size="1"/> <h3>April 15th, 2007 - Release of SLF4J 1.3.1</h3> _______________________________________________ dev mailing list dev@slf4j.org http://www.slf4j.org/mailman/listinfo/dev