Author: dkulp Date: Mon Sep 19 23:03:21 2011 New Revision: 1172885 URL: http://svn.apache.org/viewvc?rev=1172885&view=rev Log: Merged revisions 1162790 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk
........ r1162790 | ningjiang | 2011-08-29 09:14:19 -0400 (Mon, 29 Aug 2011) | 1 line CAMEL-4356 changed the option name to fastExistsCheck ........ Modified: camel/branches/camel-2.8.x/ (props changed) camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java camel/branches/camel-2.8.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileFastExistFailTest.java Propchange: camel/branches/camel-2.8.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java?rev=1172885&r1=1172884&r2=1172885&view=diff ============================================================================== --- camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java (original) +++ camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java Mon Sep 19 23:03:21 2011 @@ -507,7 +507,7 @@ public class FtpOperations implements Re public boolean existsFile(String name) throws GenericFileOperationFailedException { log.trace("existsFile({})", name); - if (endpoint.isFastExist()) { + if (endpoint.isFastExistsCheck()) { return fastExistsFile(name); } // check whether a file already exists Modified: camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java?rev=1172885&r1=1172884&r2=1172885&view=diff ============================================================================== --- camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java (original) +++ camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java Mon Sep 19 23:03:21 2011 @@ -33,7 +33,7 @@ public abstract class RemoteFileEndpoint private int maximumReconnectAttempts = 3; private long reconnectDelay = 1000; private boolean disconnect; - private boolean fastExist; + private boolean fastExistsCheck; public RemoteFileEndpoint() { // no args constructor for spring bean endpoint configuration @@ -172,12 +172,12 @@ public abstract class RemoteFileEndpoint this.disconnect = disconnect; } - public boolean isFastExist() { - return fastExist; + public boolean isFastExistsCheck() { + return fastExistsCheck; } - public void setFastExist(boolean fastExist) { - this.fastExist = fastExist; + public void setFastExistsCheck(boolean fastExistsCheck) { + this.fastExistsCheck = fastExistsCheck; } } Modified: camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java?rev=1172885&r1=1172884&r2=1172885&view=diff ============================================================================== --- camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java (original) +++ camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java Mon Sep 19 23:03:21 2011 @@ -678,7 +678,7 @@ public class SftpOperations implements R public boolean existsFile(String name) throws GenericFileOperationFailedException { LOG.trace("existsFile({})", name); - if (endpoint.isFastExist()) { + if (endpoint.isFastExistsCheck()) { return fastExistsFile(name); } // check whether a file already exists Modified: camel/branches/camel-2.8.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileFastExistFailTest.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileFastExistFailTest.java?rev=1172885&r1=1172884&r2=1172885&view=diff ============================================================================== --- camel/branches/camel-2.8.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileFastExistFailTest.java (original) +++ camel/branches/camel-2.8.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerFileFastExistFailTest.java Mon Sep 19 23:03:21 2011 @@ -30,7 +30,7 @@ import org.junit.Test; public class FtpProducerFileFastExistFailTest extends FtpProducerFileExistFailTest { private String getFtpUrl() { - return "ftp://admin@localhost:" + getPort() + "/exist?fastExist=true&password=admin&delay=2000&noop=true&fileExist=Fail"; + return "ftp://admin@localhost:" + getPort() + "/exist?fastExistsCheck=true&password=admin&delay=2000&noop=true&fileExist=Fail"; } } \ No newline at end of file