Author: davsclaus
Date: Tue Jun 15 13:38:10 2010
New Revision: 954879
URL: http://svn.apache.org/viewvc?rev=954879&view=rev
Log:
CAMEL-2790: Renamed option
Modified:
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsConfiguration.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsOperations.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithClientAuthTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithoutClientAuthTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithClientAuthTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithoutClientAuthTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithClientAuthTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithoutClientAuthTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithClientAuthTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithoutClientAuthTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithCustomKeyAndTrustStorePropertiesTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithCustomTrustStorePropertiesTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithDefaultSettingsTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithFtpClientConfigRefTest.java
Modified:
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsConfiguration.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsConfiguration.java?rev=954879&r1=954878&r2=954879&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsConfiguration.java
(original)
+++
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsConfiguration.java
Tue Jun 15 13:38:10 2010
@@ -27,7 +27,7 @@ public class FtpsConfiguration extends F
private String securityProtocol = "TLS";
private boolean isImplicit;
- private boolean useSecureDataChannel = true;
+ private boolean disableSecureDataChannelDefaults;
private String execProt;
private Long execPbsz;
@@ -74,19 +74,21 @@ public class FtpsConfiguration extends F
this.isImplicit = isImplicit;
}
- public boolean isUseSecureDataChannel() {
- return useSecureDataChannel;
+ public boolean isDisableSecureDataChannelDefaults() {
+ return disableSecureDataChannelDefaults;
}
/**
- * Sets whether to use secure data channel when transferring file content
+ * Use this option to disable default options when using secure data
channel.
* <p/>
- * Default is <tt>true</tt>
+ * This allows you to be in full control what the execPbsz and execProt
setting should be used.
+ * <p/>
+ * Default is <tt>false</tt>
* @see #setExecPbsz(Long)
* @see #setExecProt(String)
*/
- public void setUseSecureDataChannel(boolean useSecureDataChannel) {
- this.useSecureDataChannel = useSecureDataChannel;
+ public void setDisableSecureDataChannelDefaults(boolean
disableSecureDataChannelDefaults) {
+ this.disableSecureDataChannelDefaults =
disableSecureDataChannelDefaults;
}
public String getExecProt() {
Modified:
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsOperations.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsOperations.java?rev=954879&r1=954878&r2=954879&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsOperations.java
(original)
+++
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsOperations.java
Tue Jun 15 13:38:10 2010
@@ -44,8 +44,8 @@ public class FtpsOperations extends FtpO
try {
String execProt = config.getExecProt();
Long execPbsz = config.getExecPbsz();
- // if using secure channel then ensure prot and pbsz have
default values if unassigned
- if (config.isUseSecureDataChannel()) {
+ // use default values for prop and pbsz, unless told to not do
so
+ if (!config.isDisableSecureDataChannelDefaults()) {
if (ObjectHelper.isEmpty(execProt)) {
execProt = "P";
}
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithClientAuthTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithClientAuthTest.java?rev=954879&r1=954878&r2=954879&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithClientAuthTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithClientAuthTest.java
Tue Jun 15 13:38:10 2010
@@ -29,7 +29,7 @@ import org.junit.Test;
public class FileToFtpsExplicitSSLWithClientAuthTest extends
FtpsServerExplicitSSLWithClientAuthTestSupport {
private String getFtpUrl() {
- return "ftps://ad...@localhost:" + getPort() +
"/tmp2/camel?password=admin&consumer.initialDelay=5000&useSecureDataChannel=false"
+ return "ftps://ad...@localhost:" + getPort() +
"/tmp2/camel?password=admin&consumer.initialDelay=5000&disableSecureDataChannelDefaults=true"
+
"&securityProtocol=SSL&isImplicit=false&ftpClient.keyStore.file=./src/test/resources/server.jks&ftpClient.keyStore.type=JKS"
+
"&ftpClient.keyStore.algorithm=SunX509&ftpClient.keyStore.password=password&ftpClient.keyStore.keyPassword=password";
}
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithoutClientAuthTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithoutClientAuthTest.java?rev=954879&r1=954878&r2=954879&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithoutClientAuthTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithoutClientAuthTest.java
Tue Jun 15 13:38:10 2010
@@ -29,7 +29,7 @@ import org.junit.Test;
public class FileToFtpsExplicitSSLWithoutClientAuthTest extends
FtpsServerExplicitSSLWithoutClientAuthTestSupport {
private String getFtpUrl() {
- return "ftps://ad...@localhost:" + getPort() +
"/tmp2/camel?password=admin&consumer.initialDelay=5000&useSecureDataChannel=false"
+ return "ftps://ad...@localhost:" + getPort() +
"/tmp2/camel?password=admin&consumer.initialDelay=5000&disableSecureDataChannelDefaults=true"
+ "&securityProtocol=SSL&isImplicit=false";
}
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithClientAuthTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithClientAuthTest.java?rev=954879&r1=954878&r2=954879&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithClientAuthTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithClientAuthTest.java
Tue Jun 15 13:38:10 2010
@@ -29,7 +29,7 @@ import org.junit.Test;
public class FileToFtpsExplicitTLSWithClientAuthTest extends
FtpsServerExplicitTLSWithClientAuthTestSupport {
private String getFtpUrl() {
- return "ftps://ad...@localhost:" + getPort() +
"/tmp2/camel?password=admin&consumer.initialDelay=5000&useSecureDataChannel=false"
+ return "ftps://ad...@localhost:" + getPort() +
"/tmp2/camel?password=admin&consumer.initialDelay=5000&disableSecureDataChannelDefaults=true"
+
"&securityProtocol=TLS&isImplicit=false&ftpClient.keyStore.file=./src/test/resources/server.jks&ftpClient.keyStore.type=JKS"
+
"&ftpClient.keyStore.algorithm=SunX509&ftpClient.keyStore.password=password&ftpClient.keyStore.keyPassword=password";
}
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithoutClientAuthTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithoutClientAuthTest.java?rev=954879&r1=954878&r2=954879&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithoutClientAuthTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithoutClientAuthTest.java
Tue Jun 15 13:38:10 2010
@@ -29,7 +29,7 @@ import org.junit.Test;
public class FileToFtpsExplicitTLSWithoutClientAuthTest extends
FtpsServerExplicitTLSWithoutClientAuthTestSupport {
private String getFtpUrl() {
- return "ftps://ad...@localhost:" + getPort() +
"/tmp2/camel?password=admin&consumer.initialDelay=5000&useSecureDataChannel=false"
+ return "ftps://ad...@localhost:" + getPort() +
"/tmp2/camel?password=admin&consumer.initialDelay=5000&disableSecureDataChannelDefaults=true"
+ "&securityProtocol=TLS&isImplicit=false";
}
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithClientAuthTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithClientAuthTest.java?rev=954879&r1=954878&r2=954879&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithClientAuthTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithClientAuthTest.java
Tue Jun 15 13:38:10 2010
@@ -29,7 +29,7 @@ import org.junit.Test;
public class FileToFtpsImplicitSSLWithClientAuthTest extends
FtpsServerImplicitSSLWithClientAuthTestSupport {
private String getFtpUrl() {
- return "ftps://ad...@localhost:" + getPort() +
"/tmp2/camel?password=admin&consumer.initialDelay=5000&useSecureDataChannel=false"
+ return "ftps://ad...@localhost:" + getPort() +
"/tmp2/camel?password=admin&consumer.initialDelay=5000&disableSecureDataChannelDefaults=true"
+
"&securityProtocol=SSL&isImplicit=true&ftpClient.keyStore.file=./src/test/resources/server.jks&ftpClient.keyStore.type=JKS"
+
"&ftpClient.keyStore.algorithm=SunX509&ftpClient.keyStore.password=password&ftpClient.keyStore.keyPassword=password";
}
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithoutClientAuthTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithoutClientAuthTest.java?rev=954879&r1=954878&r2=954879&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithoutClientAuthTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithoutClientAuthTest.java
Tue Jun 15 13:38:10 2010
@@ -29,7 +29,7 @@ import org.junit.Test;
public class FileToFtpsImplicitSSLWithoutClientAuthTest extends
FtpsServerImplicitSSLWithoutClientAuthTestSupport {
private String getFtpUrl() {
- return "ftps://ad...@localhost:" + getPort() +
"/tmp2/camel?password=admin&consumer.initialDelay=5000&useSecureDataChannel=false"
+ return "ftps://ad...@localhost:" + getPort() +
"/tmp2/camel?password=admin&consumer.initialDelay=5000&disableSecureDataChannelDefaults=true"
+ "&securityProtocol=SSL&isImplicit=true";
}
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithClientAuthTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithClientAuthTest.java?rev=954879&r1=954878&r2=954879&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithClientAuthTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithClientAuthTest.java
Tue Jun 15 13:38:10 2010
@@ -29,7 +29,7 @@ import org.junit.Test;
public class FileToFtpsImplicitTLSWithClientAuthTest extends
FtpsServerImplicitTLSWithClientAuthTestSupport {
private String getFtpUrl() {
- return "ftps://ad...@localhost:" + getPort() +
"/tmp2/camel?password=admin&consumer.initialDelay=5000&useSecureDataChannel=false"
+ return "ftps://ad...@localhost:" + getPort() +
"/tmp2/camel?password=admin&consumer.initialDelay=5000&disableSecureDataChannelDefaults=true"
+
"&securityProtocol=TLS&isImplicit=true&ftpClient.keyStore.file=./src/test/resources/server.jks&ftpClient.keyStore.type=JKS"
+
"&ftpClient.keyStore.algorithm=SunX509&ftpClient.keyStore.password=password&ftpClient.keyStore.keyPassword=password";
}
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithoutClientAuthTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithoutClientAuthTest.java?rev=954879&r1=954878&r2=954879&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithoutClientAuthTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithoutClientAuthTest.java
Tue Jun 15 13:38:10 2010
@@ -29,7 +29,7 @@ import org.junit.Test;
public class FileToFtpsImplicitTLSWithoutClientAuthTest extends
FtpsServerImplicitTLSWithoutClientAuthTestSupport {
private String getFtpUrl() {
- return "ftps://ad...@localhost:" + getPort() +
"/tmp2/camel?password=admin&consumer.initialDelay=5000&useSecureDataChannel=false"
+ return "ftps://ad...@localhost:" + getPort() +
"/tmp2/camel?password=admin&consumer.initialDelay=5000&disableSecureDataChannelDefaults=true"
+ "&securityProtocol=TLS&isImplicit=true";
}
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithCustomKeyAndTrustStorePropertiesTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithCustomKeyAndTrustStorePropertiesTest.java?rev=954879&r1=954878&r2=954879&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithCustomKeyAndTrustStorePropertiesTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithCustomKeyAndTrustStorePropertiesTest.java
Tue Jun 15 13:38:10 2010
@@ -29,7 +29,7 @@ import org.junit.Test;
public class FileToFtpsWithCustomKeyAndTrustStorePropertiesTest extends
FtpsServerExplicitSSLWithClientAuthTestSupport {
private String getFtpUrl() {
- return "ftps://ad...@localhost:" + getPort() +
"/tmp2/camel?password=admin&consumer.initialDelay=5000&useSecureDataChannel=false"
+ return "ftps://ad...@localhost:" + getPort() +
"/tmp2/camel?password=admin&consumer.initialDelay=5000&disableSecureDataChannelDefaults=true"
+
"&securityProtocol=SSL&isImplicit=false&ftpClient.keyStore.file=./src/test/resources/server.jks&ftpClient.keyStore.type=JKS"
+
"&ftpClient.keyStore.algorithm=SunX509&ftpClient.keyStore.password=password&ftpClient.keyStore.keyPassword=password"
+
"&ftpClient.trustStore.file=./src/test/resources/server.jks&ftpClient.trustStore.type=JKS"
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithCustomTrustStorePropertiesTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithCustomTrustStorePropertiesTest.java?rev=954879&r1=954878&r2=954879&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithCustomTrustStorePropertiesTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithCustomTrustStorePropertiesTest.java
Tue Jun 15 13:38:10 2010
@@ -29,7 +29,7 @@ import org.junit.Test;
public class FileToFtpsWithCustomTrustStorePropertiesTest extends
FtpsServerExplicitSSLWithoutClientAuthTestSupport {
private String getFtpUrl() {
- return "ftps://ad...@localhost:" + getPort() +
"/tmp2/camel?password=admin&consumer.initialDelay=5000&useSecureDataChannel=false"
+ return "ftps://ad...@localhost:" + getPort() +
"/tmp2/camel?password=admin&consumer.initialDelay=5000&disableSecureDataChannelDefaults=true"
+
"&securityProtocol=SSL&isImplicit=false&ftpClient.trustStore.file=./src/test/resources/server.jks&ftpClient.trustStore.type=JKS"
+
"&ftpClient.trustStore.algorithm=SunX509&ftpClient.trustStore.password=password";
}
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithDefaultSettingsTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithDefaultSettingsTest.java?rev=954879&r1=954878&r2=954879&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithDefaultSettingsTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithDefaultSettingsTest.java
Tue Jun 15 13:38:10 2010
@@ -29,7 +29,7 @@ import org.junit.Test;
public class FileToFtpsWithDefaultSettingsTest extends
FtpsServerExplicitTLSWithoutClientAuthTestSupport {
private String getFtpUrl() {
- return "ftps://ad...@localhost:" + getPort() +
"/tmp2/camel?password=admin&consumer.initialDelay=5000&useSecureDataChannel=false";
+ return "ftps://ad...@localhost:" + getPort() +
"/tmp2/camel?password=admin&consumer.initialDelay=5000&disableSecureDataChannelDefaults=true";
}
@Test
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithFtpClientConfigRefTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithFtpClientConfigRefTest.java?rev=954879&r1=954878&r2=954879&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithFtpClientConfigRefTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithFtpClientConfigRefTest.java
Tue Jun 15 13:38:10 2010
@@ -31,7 +31,7 @@ import org.junit.Test;
public class FileToFtpsWithFtpClientConfigRefTest extends
FtpsServerExplicitSSLWithoutClientAuthTestSupport {
private String getFtpUrl() {
- return "ftps://ad...@localhost:" + getPort() +
"/tmp2/camel?password=admin&consumer.initialDelay=5000&ftpClient=#ftpsClient&useSecureDataChannel=false";
+ return "ftps://ad...@localhost:" + getPort() +
"/tmp2/camel?password=admin&consumer.initialDelay=5000&ftpClient=#ftpsClient&disableSecureDataChannelDefaults=true";
}
@Override
