Author: davsclaus
Date: Sat Jul 19 23:52:21 2008
New Revision: 678254
URL:
http://svn.apache.org/viewvc?rev=678254&view=revLog:
CAMEL-738: Fixed failing unit test on bamboo due to class with port number. Fixed SFTP part as well. However need to improve the unit test to cover the directory store layout as the bug reports
Modified:
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConsumer.java
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFilesTest.java
Modified: activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java?rev=678254&r1=678253&r2=678254&view=diff==============================================================================
--- activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java (original)
+++ activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java Sat Jul 19 23:52:21 2008
@@ -100,6 +100,8 @@
}
protected void pollDirectory(String dir) throws Exception {
+ String currentDir = client.printWorkingDirectory();
+
client.changeWorkingDirectory(dir);
for (FTPFile ftpFile : client.listFiles()) {
if (ftpFile.isFile()) {
@@ -113,7 +115,9 @@
LOG.warn("Unsupported type of FTPFile: " + ftpFile + " not a file or directory");
}
}
- client.changeToParentDirectory();
+
+ // change back to original current dir
+ client.changeWorkingDirectory(currentDir);
}
protected String getFullFileName(FTPFile ftpFile) throws IOException {
Modified: activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java?rev=678254&r1=678253&r2=678254&view=diff==============================================================================
--- activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java Sat Jul 19 23:52:21 2008
@@ -45,17 +45,20 @@
}
protected FTPClient createFtpClient() {
- final FTPClient client = new FTPClient();
- return client;
+ return new FTPClient();
}
public void connect(FTPClient client) throws IOException {
+ // TODO: connect and disconnect. createFtpClient should be moved to another class they don't
+ // belong on this endpoint class that is only for Camel related stuff
RemoteFileConfiguration config = getConfiguration();
String host = config.getHost();
int port = config.getPort();
+ String username = config.getUsername();
+
client.connect(host, port);
- if (null != config.getUsername()) {
- client.login(config.getUsername(), config.getPassword());
+ if (username != null) {
+ client.login(username, config.getPassword());
} else {
client.login("anonymous", null);
}
Modified: activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConsumer.java?rev=678254&r1=678253&r2=678254&view=diff==============================================================================
--- activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConsumer.java (original)
+++ activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConsumer.java Sat Jul 19 23:52:21 2008
@@ -112,6 +112,8 @@
}
protected void pollDirectory(String dir) throws Exception {
+ String currentDir = channel.pwd();
+
channel.cd(dir);
for (ChannelSftp.LsEntry sftpFile : (ChannelSftp.LsEntry[])channel.ls(".").toArray(new ChannelSftp.LsEntry[] {})) {
if (sftpFile.getFilename().startsWith(".")) {
@@ -124,6 +126,9 @@
pollFile(sftpFile);
}
}
+
+ // change back to original current dir
+ channel.cd(currentDir);
}
protected String getFullFileName(ChannelSftp.LsEntry sftpFile) throws IOException, SftpException {
Modified: activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFilesTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFilesTest.java?rev=678254&r1=678253&r2=678254&view=diff==============================================================================
--- activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFilesTest.java (original)
+++ activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFilesTest.java Sat Jul 19 23:52:21 2008
@@ -31,7 +31,7 @@
*/
public class FromFtpToBinaryFilesTest extends FtpServerTestSupport {
- private String port = "20014";
+ private String port = "20015";
// must user "consumer." prefix on the parameters to the file component
private String ftpUrl = "ftp://admin@localhost:" + port + "/incoming?password=admin&binary=true"
+ "&consumer.delay=2000&consumer.recursive=true&consumer.append=false";
@@ -95,6 +95,7 @@
producer.process(exchange);
producer.stop();
}
+
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
