Author: davsclaus
Date: Sat Sep 13 09:46:43 2008
New Revision: 694983
URL: http://svn.apache.org/viewvc?rev=694983&view=rev
Log:
CAMEL-891: Upgraded to ftpserver 1.0.0-M3
Added:
activemq/camel/trunk/components/camel-ftp/src/test/resources/users.properties
(with props)
Modified:
activemq/camel/trunk/components/camel-ftp/pom.xml
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
Modified: activemq/camel/trunk/components/camel-ftp/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/pom.xml?rev=694983&r1=694982&r2=694983&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ftp/pom.xml (original)
+++ activemq/camel/trunk/components/camel-ftp/pom.xml Sat Sep 13 09:46:43 2008
@@ -76,14 +76,14 @@
<dependency>
<groupId>org.apache.ftpserver</groupId>
<artifactId>ftpserver-core</artifactId>
- <version>1.0.0-M2</version>
+ <version>1.0.0-M3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ftpserver</groupId>
<artifactId>ftplet-api</artifactId>
- <version>1.0.0-M2</version>
+ <version>1.0.0-M3</version>
<scope>test</scope>
</dependency>
Modified:
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java?rev=694983&r1=694982&r2=694983&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
(original)
+++
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
Sat Sep 13 09:46:43 2008
@@ -16,8 +16,12 @@
*/
package org.apache.camel.component.file.remote;
+import java.io.File;
+
import org.apache.camel.ContextTestSupport;
import org.apache.ftpserver.FtpServer;
+import org.apache.ftpserver.usermanager.ClearTextPasswordEncryptor;
+import org.apache.ftpserver.usermanager.PropertiesUserManager;
/**
* Base class for unit testing using a FTPServer
@@ -45,6 +49,15 @@
protected void initFtpServer() throws Exception {
ftpServer = new FtpServer();
+
+ // setup user management to read our users.properties and use clear
text passwords
+ PropertiesUserManager uman = new PropertiesUserManager();
+ uman.setFile(new
File("./src/test/resources/users.properties").getAbsoluteFile());
+ uman.setPasswordEncryptor(new ClearTextPasswordEncryptor());
+ uman.setAdminName("admin");
+ uman.configure();
+ ftpServer.setUserManager(uman);
+
ftpServer.getListener("default").setPort(getPort());
}
}
Added:
activemq/camel/trunk/components/camel-ftp/src/test/resources/users.properties
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/test/resources/users.properties?rev=694983&view=auto
==============================================================================
---
activemq/camel/trunk/components/camel-ftp/src/test/resources/users.properties
(added)
+++
activemq/camel/trunk/components/camel-ftp/src/test/resources/users.properties
Sat Sep 13 09:46:43 2008
@@ -0,0 +1,8 @@
+ftpserver.user.admin
+ftpserver.user.admin.userpassword=admin
+ftpserver.user.admin.homedirectory=./res/home
+ftpserver.user.admin.writepermission=true
+ftpserver.user.scott
+ftpserver.user.scott.userpassword=tiger
+ftpserver.user.scott.homedirectory=./res/home
+ftpserver.user.scott.writepermission=true
\ No newline at end of file
Propchange:
activemq/camel/trunk/components/camel-ftp/src/test/resources/users.properties
------------------------------------------------------------------------------
svn:eol-style = native
