servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r1085713 - in /servicemix/smx4/features/trunk: camel/servicemix-camel/ camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ examples/camel-nmr/ examples/camel-nmr/src/main/java/org/apache/servicemix/examples/camel/ examples...
Date Sat, 26 Mar 2011 12:43:04 GMT
Author: gertv
Date: Sat Mar 26 12:43:03 2011
New Revision: 1085713

URL: http://svn.apache.org/viewvc?rev=1085713&view=rev
Log:
SMX4-752: Switch to SLF4J for logging

Modified:
    servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml
    servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixBinding.java
    servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml
    servicemix/smx4/features/trunk/examples/camel-nmr/src/main/java/org/apache/servicemix/examples/camel/MyTransform.java
    servicemix/smx4/features/trunk/examples/camel-osgi/pom.xml
    servicemix/smx4/features/trunk/examples/camel-osgi/src/main/java/org/apache/servicemix/examples/camel/MyTransform.java
    servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/pom.xml
    servicemix/smx4/features/trunk/examples/itests/cxf-ws-security-osgi/pom.xml
    servicemix/smx4/features/trunk/examples/itests/tests/src/test/resources/org/apache/servicemix/MANIFEST.MF

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml?rev=1085713&r1=1085712&r2=1085713&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml Sat Mar 26 12:43:03 2011
@@ -163,7 +163,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <scope>test</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixBinding.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixBinding.java?rev=1085713&r1=1085712&r2=1085713&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixBinding.java
(original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixBinding.java
Sat Mar 26 12:43:03 2011
@@ -30,16 +30,18 @@ import org.apache.camel.ExchangePattern;
 import org.apache.camel.Message;
 import org.apache.camel.impl.DefaultExchange;
 import org.apache.camel.impl.DefaultMessage;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.nmr.api.Channel;
 import org.apache.servicemix.nmr.api.Pattern;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The binding object will help us to deal with copying between the NMR exchange and camel
exchange
  */
 public class ServiceMixBinding {
-    private final transient Log LOG = LogFactory.getLog(ServiceMixBinding.class);
+
+    private final transient Logger LOG = LoggerFactory.getLogger(ServiceMixBinding.class);
+
     public static final String NMR_MESSAGE = "nmrMessage";
     public static final String NMR_EXCHANGE = "nmrExchange";
     public static final String NMR_OPERATION = "nmrOperation";

Modified: servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml?rev=1085713&r1=1085712&r2=1085713&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/camel-nmr/pom.xml Sat Mar 26 12:43:03 2011
@@ -34,8 +34,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>

Modified: servicemix/smx4/features/trunk/examples/camel-nmr/src/main/java/org/apache/servicemix/examples/camel/MyTransform.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/camel-nmr/src/main/java/org/apache/servicemix/examples/camel/MyTransform.java?rev=1085713&r1=1085712&r2=1085713&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/camel-nmr/src/main/java/org/apache/servicemix/examples/camel/MyTransform.java
(original)
+++ servicemix/smx4/features/trunk/examples/camel-nmr/src/main/java/org/apache/servicemix/examples/camel/MyTransform.java
Sat Mar 26 12:43:03 2011
@@ -16,16 +16,16 @@
  */
 package org.apache.servicemix.examples.camel;
 
-import java.util.Date;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.Date;
 
 /**
  * @version $Revision: 640450 $
  */
 public class MyTransform  {
-    private static final transient Log LOG = LogFactory.getLog(MyTransform.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(MyTransform.class);
     private boolean verbose = true;
     private String prefix = "MyTransform";
 

Modified: servicemix/smx4/features/trunk/examples/camel-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/camel-osgi/pom.xml?rev=1085713&r1=1085712&r2=1085713&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/camel-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/camel-osgi/pom.xml Sat Mar 26 12:43:03 2011
@@ -34,8 +34,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: servicemix/smx4/features/trunk/examples/camel-osgi/src/main/java/org/apache/servicemix/examples/camel/MyTransform.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/camel-osgi/src/main/java/org/apache/servicemix/examples/camel/MyTransform.java?rev=1085713&r1=1085712&r2=1085713&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/camel-osgi/src/main/java/org/apache/servicemix/examples/camel/MyTransform.java
(original)
+++ servicemix/smx4/features/trunk/examples/camel-osgi/src/main/java/org/apache/servicemix/examples/camel/MyTransform.java
Sat Mar 26 12:43:03 2011
@@ -16,16 +16,18 @@
  */
 package org.apache.servicemix.examples.camel;
 
-import java.util.Date;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.Date;
 
 /**
  * @version $Revision: 640450 $
  */
 public class MyTransform  {
-    private static final transient Log LOG = LogFactory.getLog(MyTransform.class);
+
+    private static final transient Logger LOG = LoggerFactory.getLogger(MyTransform.class);
+
     private boolean verbose = true;
     private String prefix = "MyTransform";
 

Modified: servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/pom.xml?rev=1085713&r1=1085712&r2=1085713&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-ws-security-osgi/pom.xml Sat Mar 26 12:43:03
2011
@@ -73,7 +73,6 @@
                             org.springframework.beans.factory.config,
                             javax.security.auth.callback,
                             org.apache.ws.security,
-                            org.apache.commons.logging,
                             org.apache.servicemix.util,
                             org.apache.ws.security.processor
                         </Import-Package>

Modified: servicemix/smx4/features/trunk/examples/itests/cxf-ws-security-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-ws-security-osgi/pom.xml?rev=1085713&r1=1085712&r2=1085713&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-ws-security-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-ws-security-osgi/pom.xml Sat Mar 26
12:43:03 2011
@@ -70,8 +70,7 @@
                             org.apache.cxf.ws.security.wss4j,
                             org.springframework.beans.factory.config,
                             javax.security.auth.callback,
-                            org.apache.ws.security,
-                            org.apache.commons.logging
+                            org.apache.ws.security
                         </Import-Package>
                         <Export-Package>org.apache.servicemix.examples.cxf</Export-Package>
                         <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>

Modified: servicemix/smx4/features/trunk/examples/itests/tests/src/test/resources/org/apache/servicemix/MANIFEST.MF
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/resources/org/apache/servicemix/MANIFEST.MF?rev=1085713&r1=1085712&r2=1085713&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/src/test/resources/org/apache/servicemix/MANIFEST.MF
(original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/src/test/resources/org/apache/servicemix/MANIFEST.MF
Sat Mar 26 12:43:03 2011
@@ -21,7 +21,7 @@ Bundle-Vendor: Spring Framework
 Bundle-Activator: org.springframework.osgi.test.JUnitTestActivator
 Import-Package: junit.framework,
  org.osgi.framework;specification-version="1.3.0",
- org.apache.commons.logging,
+ org.slf4j,
  org.springframework.core,
  org.springframework.core.io,
  org.springframework.osgi.test,



Mime
View raw message