You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2010/09/20 09:20:49 UTC
svn commit: r998815 - in /camel/trunk/components/camel-ftp/src:
main/java/org/apache/camel/component/file/remote/FtpOperations.java
test/java/org/apache/camel/component/file/remote/FtpAnonymousTest.java
test/resources/users.properties
Author: davsclaus
Date: Mon Sep 20 07:20:48 2010
New Revision: 998815
URL: http://svn.apache.org/viewvc?rev=998815&view=rev
Log:
CAMEL-3137: Fixed anonymous login to send empty password instead of null.
Added:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpAnonymousTest.java
- copied, changed from r998794, camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerExcludeNameTest.java
Modified:
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
camel/trunk/components/camel-ftp/src/test/resources/users.properties
Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java?rev=998815&r1=998814&r2=998815&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java (original)
+++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java Mon Sep 20 07:20:48 2010
@@ -160,7 +160,7 @@ public class FtpOperations implements Re
login = client.login(username, configuration.getPassword());
} else {
log.trace("Attempting to login anonymous");
- login = client.login("anonymous", null);
+ login = client.login("anonymous", "");
}
if (log.isTraceEnabled()) {
log.trace("User " + (username != null ? username : "anonymous") + " logged in: " + login);
Copied: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpAnonymousTest.java (from r998794, camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerExcludeNameTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpAnonymousTest.java?p2=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpAnonymousTest.java&p1=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerExcludeNameTest.java&r1=998794&r2=998815&rev=998815&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerExcludeNameTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpAnonymousTest.java Mon Sep 20 07:20:48 2010
@@ -22,13 +22,16 @@ import org.junit.Before;
import org.junit.Test;
/**
- * Unit test that ftp consumer will exclude pre and postfixes
+ * Unit test that ftp consumer for anonymous login
*/
-public class FtpConsumerExcludeNameTest extends FtpServerTestSupport {
+public class FtpAnonymousTest extends FtpServerTestSupport {
private String getFtpUrl() {
- return "ftp://admin@localhost:" + getPort() + "/excludename?password=admin"
- + "&exclude=secret.*|.*xml";
+ return "ftp://localhost:" + getPort();
+ }
+
+ private String getAdminFtpUrl() {
+ return "ftp://admin@localhost:" + getPort() + "?password=admin";
}
@Override
@@ -39,20 +42,15 @@ public class FtpConsumerExcludeNameTest
}
@Test
- public void testExludePreAndPostfixes() throws Exception {
+ public void testAnonymous() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
- mock.expectedMessageCount(2);
- mock.expectedBodiesReceived("Reports", "Reports");
+ mock.expectedMessageCount(1);
+
mock.assertIsSatisfied();
}
private void prepareFtpServer() throws Exception {
- // prepares the FTP Server by creating files on the server that we want to unit
- // test that we can pool and store as a local file
- sendFile(getFtpUrl(), "Hello World", "hello.xml");
- sendFile(getFtpUrl(), "Reports", "report1.txt");
- sendFile(getFtpUrl(), "Bye World", "secret.txt");
- sendFile(getFtpUrl(), "Reports", "report2.txt");
+ sendFile(getAdminFtpUrl(), "Hello World", "hello.xml");
}
protected RouteBuilder createRouteBuilder() throws Exception {
Modified: camel/trunk/components/camel-ftp/src/test/resources/users.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/resources/users.properties?rev=998815&r1=998814&r2=998815&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/resources/users.properties (original)
+++ camel/trunk/components/camel-ftp/src/test/resources/users.properties Mon Sep 20 07:20:48 2010
@@ -10,3 +10,6 @@ ftpserver.user.dummy
ftpserver.user.dummy.userpassword=foo
ftpserver.user.dummy.homedirectory=./res/home
ftpserver.user.dummy.writepermission=false
+ftpserver.user.anonymous
+ftpserver.user.anonymous.homedirectory=./res/home
+ftpserver.user.anonymous.writepermission=false