You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2012/08/21 11:19:07 UTC
svn commit: r1375442 - in /camel/branches/camel-2.10.x: ./
components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/
components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/
Author: bvahdat
Date: Tue Aug 21 09:19:07 2012
New Revision: 1375442
URL: http://svn.apache.org/viewvc?rev=1375442&view=rev
Log:
Merged revisions 1375439 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1375439 | bvahdat | 2012-08-21 11:15:38 +0200 (Di, 21 Aug 2012) | 1 line
Corrected the slf4j placeholder format.
........
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsServerTestSupport.java
camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1375439
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java?rev=1375442&r1=1375441&r2=1375442&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java (original)
+++ camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java Tue Aug 21 09:19:07 2012
@@ -72,7 +72,7 @@ public abstract class FtpServerTestSuppo
String name = System.getProperty("os.name");
String message = nsae.getMessage();
System.out.println("SunX509 is not avail on this platform [" + name + "] Testing is skipped! Real cause: " + message);
- log.warn("SunX509 is not avail on this platform [{0}] Testing is skipped! Real cause: {1}", name, message);
+ log.warn("SunX509 is not avail on this platform [{}] Testing is skipped! Real cause: {}", name, message);
} else {
// some other error then throw it so the test can fail
throw e;
Modified: camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsServerTestSupport.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsServerTestSupport.java?rev=1375442&r1=1375441&r2=1375442&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsServerTestSupport.java (original)
+++ camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsServerTestSupport.java Tue Aug 21 09:19:07 2012
@@ -49,7 +49,7 @@ public abstract class FtpsServerTestSupp
String name = System.getProperty("os.name");
String message = nsae.getMessage();
System.out.println("SunX509 is not avail on this platform [" + name + "] Testing is skipped! Real cause: " + message);
- log.warn("SunX509 is not avail on this platform [{0}] Testing is skipped! Real cause: {1}", name, message);
+ log.warn("SunX509 is not avail on this platform [{}] Testing is skipped! Real cause: {}", name, message);
return null;
} else {
Modified: camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java?rev=1375442&r1=1375441&r2=1375442&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java (original)
+++ camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java Tue Aug 21 09:19:07 2012
@@ -65,7 +65,7 @@ public class SftpServerTestSupport exten
String name = System.getProperty("os.name");
String message = nsae.getMessage();
System.out.println("SunX509 is not avail on this platform [" + name + "] Testing is skipped! Real cause: " + message);
- log.warn("SunX509 is not avail on this platform [{0}] Testing is skipped! Real cause: {1}", name, message);
+ log.warn("SunX509 is not avail on this platform [{}] Testing is skipped! Real cause: {}", name, message);
} else {
// some other error then throw it so the test can fail
throw e;