perfsonar development work

Author: nordunet.behrmann
Date: 2012-12-06 11:29:47 +0000 (Thu, 06 Dec 2012)
New Revision: 6056

Modified:
   trunk/perfsonar-java-sql-ma/pom.xml
   trunk/perfsonar_base/pom.xml
   
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/logger/log4j/Log4jLoggerComponent.java
Log:
perfsonar_base, perfsonar-java-sql-ma: Upgraded to SLF4J 1.6.6

Added JUL to SLF4J bridge.

Modified: trunk/perfsonar-java-sql-ma/pom.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/pom.xml 2012-12-05 07:50:02 UTC (rev 6055)
+++ trunk/perfsonar-java-sql-ma/pom.xml 2012-12-06 11:29:47 UTC (rev 6056)
@@ -30,7 +30,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <deb.version>${project.version}-1</deb.version>
-        <slf4j.version>1.5.10</slf4j.version>
+        <slf4j.version>1.6.6</slf4j.version>
     </properties>
 
     <build>
@@ -171,6 +171,7 @@
                 <groupId>org.slf4j</groupId>
                 <artifactId>jcl104-over-slf4j</artifactId>
                 <version>${slf4j.version}</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
@@ -239,6 +240,12 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-jdbc</artifactId>
             <version>3.1.3.RELEASE</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
     <reporting>

Modified: trunk/perfsonar_base/pom.xml
===================================================================
--- trunk/perfsonar_base/pom.xml        2012-12-05 07:50:02 UTC (rev 6055)
+++ trunk/perfsonar_base/pom.xml        2012-12-06 11:29:47 UTC (rev 6056)
@@ -98,11 +98,6 @@
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
-                <artifactId>jcl104-over-slf4j</artifactId>
-                <version>${slf4j.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-simple</artifactId>
                 <version>${slf4j.version}</version>
             </dependency>
@@ -111,7 +106,7 @@
     <properties>
         <axis2.version>1.6.2</axis2.version>
         <axis1.version>1.4</axis1.version>
-        <slf4j.version>1.5.10</slf4j.version>
+        <slf4j.version>1.6.6</slf4j.version>
     </properties>
 
     <dependencies>
@@ -293,14 +288,24 @@
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
             <version>${slf4j.version}</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>jcl104-over-slf4j</artifactId>
+            <artifactId>jcl-over-slf4j</artifactId>
             <version>${slf4j.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jul-to-slf4j</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>xmldb</groupId>
@@ -354,6 +359,10 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>log4j-over-slf4j</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>jcl104-over-slf4j</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -411,6 +420,10 @@
                     <artifactId>slf4j-simple</artifactId>
                 </exclusion>
                 <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>jcl104-over-slf4j</artifactId>
+                </exclusion>
+                <exclusion>
                     <groupId>commons-logging</groupId>
                     <artifactId>commons-logging</artifactId>
                 </exclusion>

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/logger/log4j/Log4jLoggerComponent.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/logger/log4j/Log4jLoggerComponent.java
   2012-12-05 07:50:02 UTC (rev 6055)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/logger/log4j/Log4jLoggerComponent.java
   2012-12-06 11:29:47 UTC (rev 6056)
@@ -11,6 +11,7 @@
 import 
org.perfsonar.base.auxiliary.components.configuration.ConfigurationComponent;
 import org.perfsonar.base.auxiliary.components.logger.LoggerComponent;
 import org.perfsonar.base.exceptions.PerfSONARException;
+import org.slf4j.bridge.SLF4JBridgeHandler;
 
 /**
  * This class is responsible for logging functionality.
@@ -51,6 +52,9 @@
     @Override
     public void initComponent() throws PerfSONARException
     {
+        SLF4JBridgeHandler.removeHandlersForRootLogger();
+        SLF4JBridgeHandler.install();
+
         try {
             debugLog = Logger.getLogger("sonar-debug");
             infoLog = Logger.getLogger("sonar-info");