[slf4j-dev] svn commit: r1175 - in slf4j/trunk: integration slf4j-api/src/main/java/org/slf4j/impl slf4j-jcl/src/main/java/org/slf4j/impl slf4j-jdk14/src/main/java/org/slf4j/impl slf4j-nop/src/main/java/org/slf4j/impl slf4j-simple/src/main/java/org/slf4j/impl

[ceki at slf4j.org]

Author: ceki
Date: Fri Oct  3 19:09:11 2008
New Revision: 1175

Modified:
   slf4j/trunk/integration/build.xml
   slf4j/trunk/slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
   slf4j/trunk/slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
   slf4j/trunk/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
   slf4j/trunk/slf4j-nop/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
   slf4j/trunk/slf4j-simple/src/main/java/org/slf4j/impl/StaticLoggerBinder.java

Log:
- minor clean up

Modified: slf4j/trunk/integration/build.xml
==============================================================================
--- slf4j/trunk/integration/build.xml	(original)
+++ slf4j/trunk/integration/build.xml	Fri Oct  3 19:09:11 2008
@@ -4,7 +4,7 @@
 	<echo message="runtime classpath: ${runtime_classpath}" />
 	<echo message="test classpath:    ${test_classpath}" />
 	<echo message="plugin classpath:  ${plugin_classpath}" />
-	
+
 	<path id="path150">
 		<pathelement location="xtarget/classes/" />
 		<pathelement location="target/test-classes/" />
@@ -27,14 +27,8 @@
 
 		<junit printsummary="yes" fork="no" haltonfailure="yes">
 			<classpath refid="path150" />
-
 			<formatter type="plain" />
-			<batchtest fork="yes" todir="target/unit-reports">
-				<fileset dir="src/test/java">
-					<include name="**/VersionTest.java" />
-					<exclude name="**/XTests.java" />
-				</fileset>
-			</batchtest>
+			<test fork="yes" todir="target/unit-reports" name="org.slf4j.VersionTest" />
 		</junit>
 
 	</target>

Modified: slf4j/trunk/slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
==============================================================================
--- slf4j/trunk/slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java	(original)
+++ slf4j/trunk/slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java	Fri Oct  3 19:09:11 2008
@@ -45,7 +45,7 @@
   
   /**
    * Version tag used to check compatibility. The value of this field is
-   * modified in each release. 
+   * modified with each release. 
    */
   // to avoid constant folding by the compiler, VERSION field should *not* be final
   public static String VERSION = "1.5.4-SNAPSHOT";  // !final

Modified: slf4j/trunk/slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
==============================================================================
--- slf4j/trunk/slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java	(original)
+++ slf4j/trunk/slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java	Fri Oct  3 19:09:11 2008
@@ -52,9 +52,10 @@
 
   /**
    * Version tag used to check compatibility. The value of this field is
-   * modified in each release. 
-   */
-  public static final String VERSION = "1.5.4-SNAPSHOT";
+   * modified with each release. 
+   */ 
+  //to avoid constant folding by the compiler, VERSION field should *not* be final
+  public static String VERSION = "1.5.4-SNAPSHOT";  
   
   // Binding specific code:
   private static final String loggerFactoryClassStr = JCLLoggerFactory.class

Modified: slf4j/trunk/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
==============================================================================
--- slf4j/trunk/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticLoggerBinder.java	(original)
+++ slf4j/trunk/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticLoggerBinder.java	Fri Oct  3 19:09:11 2008
@@ -49,11 +49,13 @@
    * The unique instance of this class.
    */
   public static final StaticLoggerBinder SINGLETON = new StaticLoggerBinder();
+
   /**
    * Version tag used to check compatibility. The value of this field is
-   * modified in each release. 
-   */
-  public static final String VERSION = "1.5.4-SNAPSHOT";
+   * modified with each release. 
+   */ 
+  //to avoid constant folding by the compiler, VERSION field should *not* be final
+  public static String VERSION = "1.5.4-SNAPSHOT";  
   
   private static final String loggerFactoryClassStr = org.slf4j.impl.JDK14LoggerFactory.class.getName();
 

Modified: slf4j/trunk/slf4j-nop/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
==============================================================================
--- slf4j/trunk/slf4j-nop/src/main/java/org/slf4j/impl/StaticLoggerBinder.java	(original)
+++ slf4j/trunk/slf4j-nop/src/main/java/org/slf4j/impl/StaticLoggerBinder.java	Fri Oct  3 19:09:11 2008
@@ -52,9 +52,10 @@
   
   /**
    * Version tag used to check compatibility. The value of this field is
-   * modified in each release. 
-   */
-  public static final String VERSION = "1.5.4-SNAPSHOT";
+   * modified with each release. 
+   */ 
+  //to avoid constant folding by the compiler, VERSION field should *not* be final
+  public static String VERSION = "1.5.4-SNAPSHOT";  
   
   private static final String loggerFactoryClassStr = NOPLoggerFactory.class.getName();
 

Modified: slf4j/trunk/slf4j-simple/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
==============================================================================
--- slf4j/trunk/slf4j-simple/src/main/java/org/slf4j/impl/StaticLoggerBinder.java	(original)
+++ slf4j/trunk/slf4j-simple/src/main/java/org/slf4j/impl/StaticLoggerBinder.java	Fri Oct  3 19:09:11 2008
@@ -41,11 +41,13 @@
    * The unique instance of this class.
    */
   public static final StaticLoggerBinder SINGLETON = new StaticLoggerBinder();
+  
   /**
    * Version tag used to check compatibility. The value of this field is
-   * modified in each release. 
-   */
-  public static final String VERSION = "1.5.4-SNAPSHOT";
+   * modified with each release. 
+   */ 
+  //to avoid constant folding by the compiler, VERSION field should *not* be final
+  public static String VERSION = "1.5.4-SNAPSHOT";  
   
   private static final String loggerFactoryClassStr = SimpleLoggerFactory.class.getName();