Author: lhein
Date: Fri Mar 25 14:21:51 2011
New Revision: 1085394
URL: http://svn.apache.org/viewvc?rev=1085394&view=rev
Log:
upgraded slf4j version to 1.6.1 (see SMX4-778)
Modified:
servicemix/components/trunk/bindings/servicemix-cxf-bc/pom.xml
servicemix/components/trunk/bindings/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/FtpPollerEndpoint.java
servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/LoggingPojoTest.java
servicemix/components/trunk/engines/servicemix-eip/pom.xml
servicemix/components/trunk/pom.xml
servicemix/components/trunk/shared-libraries/servicemix-soap/pom.xml
Modified: servicemix/components/trunk/bindings/servicemix-cxf-bc/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-cxf-bc/pom.xml?rev=1085394&r1=1085393&r2=1085394&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-cxf-bc/pom.xml (original)
+++ servicemix/components/trunk/bindings/servicemix-cxf-bc/pom.xml Fri Mar 25
14:21:51 2011
@@ -388,11 +388,6 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <scope>provided</scope>
- </dependency>
<!-- documentation -->
<dependency>
Modified:
servicemix/components/trunk/bindings/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/FtpPollerEndpoint.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/FtpPollerEndpoint.java?rev=1085394&r1=1085393&r2=1085394&view=diff
==============================================================================
---
servicemix/components/trunk/bindings/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/FtpPollerEndpoint.java
(original)
+++
servicemix/components/trunk/bindings/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/FtpPollerEndpoint.java
Fri Mar 25 14:21:51 2011
@@ -457,7 +457,7 @@ public class FtpPollerEndpoint extends P
logger.debug("Skipping {}: the file no longer exists on the
server", file);
}
} catch (Exception e) {
- logger.error("Failed to process file: {}. Reason: {}", file, e, e);
+ logger.error("Failed to process file: {}. Reason: {}", file, e);
} finally {
if (ftp != null) {
returnClient(ftp);
Modified:
servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/LoggingPojoTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/LoggingPojoTest.java?rev=1085394&r1=1085393&r2=1085394&view=diff
==============================================================================
---
servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/LoggingPojoTest.java
(original)
+++
servicemix/components/trunk/engines/servicemix-bean/src/test/java/org/apache/servicemix/bean/LoggingPojoTest.java
Fri Mar 25 14:21:51 2011
@@ -16,20 +16,7 @@
*/
package org.apache.servicemix.bean;
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.activation.DataHandler;
-import javax.activation.FileDataSource;
-import javax.jbi.messaging.ExchangeStatus;
-import javax.jbi.messaging.InOnly;
-import javax.jbi.messaging.InOut;
-import javax.jbi.messaging.MessageExchange;
-import javax.jbi.messaging.MessagingException;
-import javax.xml.namespace.QName;
-
import junit.framework.TestCase;
-
import org.apache.servicemix.bean.pojos.LoggingPojo;
import org.apache.servicemix.client.ServiceMixClient;
import org.apache.servicemix.client.ServiceMixClientFacade;
@@ -38,6 +25,13 @@ import org.apache.servicemix.jbi.jaxp.St
import org.slf4j.Logger;
import org.slf4j.Marker;
+import javax.activation.DataHandler;
+import javax.activation.FileDataSource;
+import javax.jbi.messaging.*;
+import javax.xml.namespace.QName;
+import java.util.LinkedList;
+import java.util.List;
+
public class LoggingPojoTest extends TestCase {
protected JBIContainer container;
@@ -212,7 +206,7 @@ public class LoggingPojoTest extends Tes
messages.add(message);
}
public void info(String message, Object args) {
- messages.add(message);
+ messages.add(message + args.toString());
}
public void info(String message, Object args1, Object args2) {
messages.add(message);
Modified: servicemix/components/trunk/engines/servicemix-eip/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-eip/pom.xml?rev=1085394&r1=1085393&r2=1085394&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-eip/pom.xml (original)
+++ servicemix/components/trunk/engines/servicemix-eip/pom.xml Fri Mar 25
14:21:51 2011
@@ -88,10 +88,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- </dependency>
<!-- provided -->
<dependency>
Modified: servicemix/components/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/pom.xml?rev=1085394&r1=1085393&r2=1085394&view=diff
==============================================================================
--- servicemix/components/trunk/pom.xml (original)
+++ servicemix/components/trunk/pom.xml Fri Mar 25 14:21:51 2011
@@ -150,7 +150,7 @@
<pax.exam.version>1.2.2</pax.exam.version>
<propertyset.version>1.3</propertyset.version>
<quartz.version>1.8.3</quartz.version>
- <slf4j.version>1.5.8</slf4j.version>
+ <slf4j.version>1.6.1</slf4j.version>
<spring.version>3.0.5.RELEASE</spring.version>
<spring.osgi.version>1.2.0</spring.osgi.version>
<stax-api.version>1.0-2</stax-api.version>
@@ -573,11 +573,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>
Modified: servicemix/components/trunk/shared-libraries/servicemix-soap/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/shared-libraries/servicemix-soap/pom.xml?rev=1085394&r1=1085393&r2=1085394&view=diff
==============================================================================
--- servicemix/components/trunk/shared-libraries/servicemix-soap/pom.xml
(original)
+++ servicemix/components/trunk/shared-libraries/servicemix-soap/pom.xml Fri
Mar 25 14:21:51 2011
@@ -125,10 +125,6 @@
<artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
