Author: bvahdat Date: Tue Aug 21 09:21:43 2012 New Revision: 1375443 URL: http://svn.apache.org/viewvc?rev=1375443&view=rev Log: Merged revisions 1375442 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
................ r1375442 | bvahdat | 2012-08-21 11:19:07 +0200 (Di, 21 Aug 2012) | 9 lines 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.9.x/ (props changed) camel/branches/camel-2.9.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java camel/branches/camel-2.9.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsServerTestSupport.java camel/branches/camel-2.9.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Merged /camel/trunk:r1375439 Merged /camel/branches/camel-2.10.x:r1375442 Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.9.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.9.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java?rev=1375443&r1=1375442&r2=1375443&view=diff ============================================================================== --- camel/branches/camel-2.9.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java (original) +++ camel/branches/camel-2.9.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java Tue Aug 21 09:21:43 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.9.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.9.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsServerTestSupport.java?rev=1375443&r1=1375442&r2=1375443&view=diff ============================================================================== --- camel/branches/camel-2.9.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsServerTestSupport.java (original) +++ camel/branches/camel-2.9.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsServerTestSupport.java Tue Aug 21 09:21:43 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.9.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.9.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java?rev=1375443&r1=1375442&r2=1375443&view=diff ============================================================================== --- camel/branches/camel-2.9.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java (original) +++ camel/branches/camel-2.9.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpServerTestSupport.java Tue Aug 21 09:21:43 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;
