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 2008/11/02 09:25:00 UTC
svn commit: r709850 - in /activemq/camel/trunk/components/camel-ftp: ./
src/main/java/org/apache/camel/component/file/remote/
src/test/java/org/apache/camel/component/file/remote/ src/test/resources/
Author: davsclaus
Date: Sun Nov 2 01:24:59 2008
New Revision: 709850
URL: http://svn.apache.org/viewvc?rev=709850&view=rev
Log:
CAMEL-1044: Added passive mode support for regular FTP
CAMEL-1045: Upgraded to commons net 2.0
Added:
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPassiveModeTest.java (contents, props changed)
- copied, changed from r709657, activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToMockTest.java
Modified:
activemq/camel/trunk/components/camel-ftp/pom.xml
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpUtils.java
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java
activemq/camel/trunk/components/camel-ftp/src/test/resources/log4j.properties
Modified: activemq/camel/trunk/components/camel-ftp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/pom.xml?rev=709850&r1=709849&r2=709850&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ftp/pom.xml (original)
+++ activemq/camel/trunk/components/camel-ftp/pom.xml Sun Nov 2 01:24:59 2008
@@ -65,7 +65,7 @@
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
- <version>1.4.1</version>
+ <version>2.0</version>
</dependency>
<!-- testing -->
@@ -104,22 +104,14 @@
</dependency>
<dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- <version>3.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>test</scope>
- <version>1.5.2</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
- <version>1.5.2</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
Modified: activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpUtils.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpUtils.java?rev=709850&r1=709849&r2=709850&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpUtils.java (original)
+++ activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpUtils.java Sun Nov 2 01:24:59 2008
@@ -44,6 +44,12 @@
LOG.trace("Connecting to " + config);
client.connect(host, port);
+ // must enter passive mode directly after connect
+ if (config.isPassiveMode()) {
+ LOG.trace("Using passive mode connections");
+ client.enterLocalPassiveMode();
+ }
+
boolean login;
if (username != null) {
LOG.trace("Attempting to login user: " + username);
Modified: activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java?rev=709850&r1=709849&r2=709850&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java (original)
+++ activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java Sun Nov 2 01:24:59 2008
@@ -34,6 +34,7 @@
private boolean directory = true;
private FTPClientConfig ftpClientConfig;
private Expression expression;
+ private boolean passiveMode;
public RemoteFileConfiguration() {
}
@@ -172,4 +173,17 @@
public void setExpression(String fileLanguageExpression) {
this.expression = FileLanguage.file(fileLanguageExpression);
}
+
+ public boolean isPassiveMode() {
+ return passiveMode;
+ }
+
+ /**
+ * Sets passive mode connections.
+ * <br/>
+ * Default is active mode connections.
+ */
+ public void setPassiveMode(boolean passiveMode) {
+ this.passiveMode = passiveMode;
+ }
}
Copied: activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPassiveModeTest.java (from r709657, activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToMockTest.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPassiveModeTest.java?p2=activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPassiveModeTest.java&p1=activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToMockTest.java&r1=709657&r2=709850&rev=709850&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToMockTest.java (original)
+++ activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPassiveModeTest.java Sun Nov 2 01:24:59 2008
@@ -18,33 +18,39 @@
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.component.file.FileComponent;
+import org.apache.camel.Endpoint;
+import org.apache.camel.Exchange;
+import org.apache.camel.Producer;
/**
* @version $Revision$
*/
-public class FromFtpToMockTest extends FtpServerTestSupport {
- protected MockEndpoint resultEndpoint;
- protected String expectedBody = "Hello there!";
- protected int port = 2001;
- protected String ftpUrl = "ftp://admin@localhost:" + port + "/tmp/camel?password=admin&consumer.recursive=true";
-
- public void testFtpRoute() throws Exception {
- MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
- resultEndpoint.expectedBodiesReceived(expectedBody);
-
- // TODO when we support multiple marshallers for messages
- // we can support passing headers over files using serialized/XML files
- //resultEndpoint.message(0).header("cheese").isEqualTo(123);
-
- template.sendBodyAndHeader(ftpUrl, expectedBody, "cheese", 123);
- // let some time pass to let the consumer etc. properly do its business before closing
- Thread.sleep(1000);
+public class FromFtpPassiveModeTest extends FtpServerTestSupport {
+ protected int port = 2434;
+ protected String ftpUrl = "ftp://admin@localhost:" + port + "/passive/?password=admin&passiveMode=true";
- resultEndpoint.assertIsSatisfied();
-
- Thread.sleep(1000);
+ public int getPort() {
+ return port;
+ }
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ deleteDirectory("./res/home/passive");
+ prepareFtpServer();
+ }
+ private void prepareFtpServer() throws Exception {
+ // prepares the FTP Server by creating a file on the server
+ Endpoint endpoint = context.getEndpoint(ftpUrl);
+ Exchange exchange = endpoint.createExchange();
+ exchange.getIn().setBody("Hello World");
+ exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
+ Producer producer = endpoint.createProducer();
+ producer.start();
+ producer.process(exchange);
+ producer.stop();
}
protected RouteBuilder createRouteBuilder() throws Exception {
@@ -55,8 +61,10 @@
};
}
- public int getPort() {
- return port;
+ public void testFtpPassiveMode() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedBodiesReceived("Hello World");
+ mock.assertIsSatisfied();
}
-}
+}
\ No newline at end of file
Propchange: activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPassiveModeTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPassiveModeTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPassiveModeTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: activemq/camel/trunk/components/camel-ftp/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/test/resources/log4j.properties?rev=709850&r1=709849&r2=709850&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ftp/src/test/resources/log4j.properties (original)
+++ activemq/camel/trunk/components/camel-ftp/src/test/resources/log4j.properties Sun Nov 2 01:24:59 2008
@@ -24,6 +24,7 @@
log4j.logger.org.apache.camel.component.file=TRACE
log4j.logger.org.apache.mina=WARN
log4j.logger.org.apache.ftpserver=WARN
+log4j.logger.org.apache.commons.net=TRACE
# CONSOLE appender not used by default
log4j.appender.out=org.apache.log4j.ConsoleAppender