Author: davsclaus
Date: Wed Oct 6 07:20:11 2010
New Revision: 1004911
URL: http://svn.apache.org/viewvc?rev=1004911&view=rev
Log:
Upgraded to FTP server 1.0.5
Added:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeAbsoluteTest.java
- copied, changed from r1004899,
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeAbsoluteTest.java
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeAbsoluteTest.java
camel/trunk/parent/pom.xml
Copied:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeAbsoluteTest.java
(from r1004899,
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeAbsoluteTest.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeAbsoluteTest.java?p2=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeAbsoluteTest.java&p1=camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeAbsoluteTest.java&r1=1004899&r2=1004911&rev=1004911&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeAbsoluteTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeAbsoluteTest.java
Wed Oct 6 07:20:11 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.file.remote.sftp;
+package org.apache.camel.component.file.remote;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
@@ -25,11 +25,11 @@ import org.junit.Test;
/**
* @version $Revision$
*/
-...@ignore("Absolute do not work with Apache SSHD")
-public class SftpSimpleConsumeAbsoluteTest extends SftpServerTestSupport {
+...@ignore("Absolute do not work with Apache FTP Server")
+public class FtpSimpleConsumeAbsoluteTest extends FtpServerTestSupport {
@Test
- public void testSftpSimpleConsumeAbsolute() throws Exception {
+ public void testFtpSimpleConsumeAbsolute() throws Exception {
if (!canTest()) {
return;
}
@@ -37,7 +37,7 @@ public class SftpSimpleConsumeAbsoluteTe
String expected = "Hello World";
// create file using regular file
- template.sendBodyAndHeader("file:////tmp", expected,
Exchange.FILE_NAME, "hello.txt");
+ template.sendBodyAndHeader("file:///tmp/mytemp", expected,
Exchange.FILE_NAME, "hello.txt");
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
@@ -53,7 +53,7 @@ public class SftpSimpleConsumeAbsoluteTe
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("sftp://localhost:" + getPort() +
"//tmp?username=admin&password=admin&delay=10s&disconnect=true")
+ from("ftp://localhost:" + getPort() +
"//tmp/mytemp?username=admin&password=admin&delay=10s&disconnect=true")
.routeId("foo").noAutoStartup()
.to("mock:result");
}
Modified:
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeAbsoluteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeAbsoluteTest.java?rev=1004911&r1=1004910&r2=1004911&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeAbsoluteTest.java
(original)
+++
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeAbsoluteTest.java
Wed Oct 6 07:20:11 2010
@@ -37,7 +37,7 @@ public class SftpSimpleConsumeAbsoluteTe
String expected = "Hello World";
// create file using regular file
- template.sendBodyAndHeader("file:////tmp", expected,
Exchange.FILE_NAME, "hello.txt");
+ template.sendBodyAndHeader("file:///tmp/mytemp", expected,
Exchange.FILE_NAME, "hello.txt");
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
@@ -53,7 +53,7 @@ public class SftpSimpleConsumeAbsoluteTe
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("sftp://localhost:" + getPort() +
"//tmp?username=admin&password=admin&delay=10s&disconnect=true")
+ from("sftp://localhost:" + getPort() +
"//tmp/mytemp?username=admin&password=admin&delay=10s&disconnect=true")
.routeId("foo").noAutoStartup()
.to("mock:result");
}
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1004911&r1=1004910&r2=1004911&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Oct 6 07:20:11 2010
@@ -55,7 +55,7 @@
<dozer-version>5.2.2</dozer-version>
<easymock-version>2.5.2</easymock-version>
<flatpack-version>3.2.0_1</flatpack-version>
- <ftpserver-version>1.0.4</ftpserver-version>
+ <ftpserver-version>1.0.5</ftpserver-version>
<fuse-commons-management-version>1.0</fuse-commons-management-version>
<freemarker-version>2.3.15</freemarker-version>
<geronimo-el-spec-version>1.0.1</geronimo-el-spec-version>