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 2009/03/07 10:31:19 UTC
svn commit: r751229 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/component/file/
camel-core/src/main/java/org/apache/camel/component/file/strategy/
camel-core/src/test/java/org/apache/camel/component/file/
components/camel-ftp/src/main/...
Author: davsclaus
Date: Sat Mar 7 09:31:17 2009
New Revision: 751229
URL: http://svn.apache.org/viewvc?rev=751229&view=rev
Log:
CAMEL-1434: Renamed some URI options on Camel VFS for more,premove and filename expression.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileProcessStrategyFactory.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileProcessStrategyFactory.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMoveMultipleDirectoriesTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathWithAbsoluteMoveTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathWithRelativeMoveTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginAndCommitExpressionRenameStrategyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginAndCommitRenameStrategyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginExpressionRenameStrategyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginRenameStrategyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameAbsolutePathStrategyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameStrategyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentRefTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveExpressionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerExpressionTest.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileAbsoluteFolderRecursiveTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePostfixTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePrefixTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileRecursiveTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileToHiddenFolderRecursiveTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFileExpressionTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePostfixTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePrefixTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRegexPatternTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromQueueThenConsumeFtpToMockTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDirectoriesNotMatchedTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerExcludeNameTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIncludeNameTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMoveExpressionTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpIllegalOptionsTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerExpressionTest.java
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/ftp/SpringFtpEndpointTest-context.xml
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java Sat Mar 7 09:31:17 2009
@@ -48,13 +48,13 @@
// we assume its a file if the name has a dot in it (eg foo.txt)
if (file.getName().contains(".")) {
- throw new IllegalArgumentException("Only directory is supported. File must be configured as a directory: " + file);
+ throw new IllegalArgumentException("Only directory is supported. Endpoint must be configured with a valid starting directory: " + file);
}
FileConsumer result = new FileConsumer(this, processor, operations);
- if (isDelete() && getMoveExpression() != null) {
- throw new IllegalArgumentException("You cannot set both delete=true and moveExpression options");
+ if (isDelete() && getMove() != null) {
+ throw new IllegalArgumentException("You cannot set both delete=true and move options");
}
// if noop=true then idempotent should also be configured
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java Sat Mar 7 09:31:17 2009
@@ -329,7 +329,7 @@
}
// use file expression for a simple dynamic file filter
- if (endpoint.getFileExpression() != null) {
+ if (endpoint.getFileName() != null) {
evaluteFileExpression();
if (fileExpressionResult != null) {
if (!name.equals(fileExpressionResult)) {
@@ -345,7 +345,7 @@
if (fileExpressionResult == null) {
// create a dummy exchange as Exchange is needed for expression evaluation
Exchange dummy = new DefaultExchange(endpoint.getCamelContext());
- fileExpressionResult = (String) endpoint.getFileExpression().evaluate(dummy);
+ fileExpressionResult = (String) endpoint.getFileName().evaluate(dummy);
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java Sat Mar 7 09:31:17 2009
@@ -61,9 +61,9 @@
protected String tempPrefix;
protected String include;
protected String exclude;
- protected Expression fileExpression;
- protected Expression moveExpression;
- protected Expression preMoveExpression;
+ protected Expression fileName;
+ protected Expression move;
+ protected Expression preMove;
protected boolean idempotent;
protected IdempotentRepository idempotentRepository;
protected GenericFileFilter<T> filter;
@@ -185,52 +185,52 @@
this.delete = delete;
}
- public Expression getMoveExpression() {
- return moveExpression;
+ public Expression getMove() {
+ return move;
}
- public void setMoveExpression(Expression moveExpression) {
- this.moveExpression = moveExpression;
+ public void setMove(Expression move) {
+ this.move = move;
}
/**
* Sets the move expression based on
* {@link org.apache.camel.language.simple.FileLanguage}
*/
- public void setMoveExpression(String fileLanguageExpression) {
- this.moveExpression = FileLanguage.file(fileLanguageExpression);
+ public void setMove(String fileLanguageExpression) {
+ this.move = FileLanguage.file(fileLanguageExpression);
}
- public Expression getPreMoveExpression() {
- return preMoveExpression;
+ public Expression getPreMove() {
+ return preMove;
}
- public void setPreMoveExpression(Expression preMoveExpression) {
- this.preMoveExpression = preMoveExpression;
+ public void setPreMove(Expression preMove) {
+ this.preMove = preMove;
}
/**
* Sets the pre move expression based on
* {@link org.apache.camel.language.simple.FileLanguage}
*/
- public void setPreMoveExpression(String fileLanguageExpression) {
- this.preMoveExpression = FileLanguage.file(fileLanguageExpression);
+ public void setPreMove(String fileLanguageExpression) {
+ this.preMove = FileLanguage.file(fileLanguageExpression);
}
- public Expression getFileExpression() {
- return fileExpression;
+ public Expression getFileName() {
+ return fileName;
}
- public void setFileExpression(Expression fileExpression) {
- this.fileExpression = fileExpression;
+ public void setFileName(Expression fileName) {
+ this.fileName = fileName;
}
/**
* Sets the file expression based on
* {@link org.apache.camel.language.simple.FileLanguage}
*/
- public void setFileExpression(String fileLanguageExpression) {
- this.fileExpression = FileLanguage.file(fileLanguageExpression);
+ public void setFileName(String fileLanguageExpression) {
+ this.fileName = FileLanguage.file(fileLanguageExpression);
}
public boolean isIdempotent() {
@@ -408,11 +408,11 @@
if (isDelete()) {
params.put("delete", Boolean.toString(true));
}
- if (moveExpression != null) {
- params.put("moveExpression", moveExpression);
+ if (move != null) {
+ params.put("move", move);
}
- if (preMoveExpression != null) {
- params.put("preMoveExpression", preMoveExpression);
+ if (preMove != null) {
+ params.put("preMove", preMove);
}
if (exclusiveReadLockStrategy != null) {
params.put("exclusiveReadLockStrategy", exclusiveReadLockStrategy);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java Sat Mar 7 09:31:17 2009
@@ -154,7 +154,7 @@
String name = exchange.getIn().getHeader(Exchange.FILE_NAME, String.class);
// expression support
- Expression expression = endpoint.getFileExpression();
+ Expression expression = endpoint.getFileName();
if (name != null) {
// the header name can be an expression too, that should override
// whatever configured on the endpoint
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileProcessStrategyFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileProcessStrategyFactory.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileProcessStrategyFactory.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileProcessStrategyFactory.java Sat Mar 7 09:31:17 2009
@@ -35,8 +35,8 @@
// We assume a value is present only if its value not null for String and 'true' for boolean
boolean isNoop = params.get("noop") != null;
boolean isDelete = params.get("delete") != null;
- Expression moveExpression = (Expression) params.get("moveExpression");
- Expression preMoveExpression = (Expression) params.get("preMoveExpression");
+ Expression moveExpression = (Expression) params.get("move");
+ Expression preMoveExpression = (Expression) params.get("preMove");
if (isNoop) {
GenericFileNoOpProcessStrategy<File> strategy = new GenericFileNoOpProcessStrategy<File>();
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileProcessStrategyFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileProcessStrategyFactory.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileProcessStrategyFactory.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileProcessStrategyFactory.java Sat Mar 7 09:31:17 2009
@@ -34,8 +34,8 @@
// We assume a value is present only if its value not null for String and 'true' for boolean
boolean isNoop = params.get("noop") != null;
boolean isDelete = params.get("delete") != null;
- Expression moveExpression = (Expression) params.get("moveExpression");
- Expression preMoveExpression = (Expression) params.get("preMoveExpression");
+ Expression moveExpression = (Expression) params.get("move");
+ Expression preMoveExpression = (Expression) params.get("preMove");
if (isNoop) {
GenericFileNoOpProcessStrategy strategy = new GenericFileNoOpProcessStrategy();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMoveMultipleDirectoriesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMoveMultipleDirectoriesTest.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMoveMultipleDirectoriesTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMoveMultipleDirectoriesTest.java Sat Mar 7 09:31:17 2009
@@ -27,7 +27,7 @@
public class FileConsumeMoveMultipleDirectoriesTest extends ContextTestSupport {
private String fileUrl = "file://target/multidir/?recursive=true&initialDelay=2000&delay=5000"
- + "&exclude=.*old&moveExpression=done/${file:name}.old";
+ + "&exclude=.*old&move=done/${file:name}.old";
@Override
protected void setUp() throws Exception {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathWithAbsoluteMoveTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathWithAbsoluteMoveTest.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathWithAbsoluteMoveTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathWithAbsoluteMoveTest.java Sat Mar 7 09:31:17 2009
@@ -51,7 +51,7 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("file://" + base + "?moveExpression=" + base + "/done/${file:name}").to("mock:report");
+ from("file://" + base + "?move=" + base + "/done/${file:name}").to("mock:report");
}
};
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathWithRelativeMoveTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathWithRelativeMoveTest.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathWithRelativeMoveTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsolutePathWithRelativeMoveTest.java Sat Mar 7 09:31:17 2009
@@ -51,7 +51,7 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("file://" + base + "?moveExpression=../done/${file:name}").to("mock:report");
+ from("file://" + base + "?move=../done/${file:name}").to("mock:report");
}
};
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginAndCommitExpressionRenameStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginAndCommitExpressionRenameStrategyTest.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginAndCommitExpressionRenameStrategyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginAndCommitExpressionRenameStrategyTest.java Sat Mar 7 09:31:17 2009
@@ -50,7 +50,7 @@
public void testIllegalOptions() throws Exception {
try {
- context.getEndpoint("file://target?moveExpression=../done/${file:name}&delete=true").createConsumer(new Processor() {
+ context.getEndpoint("file://target?move=../done/${file:name}&delete=true").createConsumer(new Processor() {
public void process(Exchange exchange) throws Exception {
}
});
@@ -63,7 +63,7 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("file://target/reports?preMoveExpression=../inprogress/${file:name.noext}.bak&moveExpression=../done/${file:name}&consumer.delay=5000")
+ from("file://target/reports?preMove=../inprogress/${file:name.noext}.bak&move=../done/${file:name}&consumer.delay=5000")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
GenericFileExchange<File> fe = (GenericFileExchange<File>) exchange;
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginAndCommitRenameStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginAndCommitRenameStrategyTest.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginAndCommitRenameStrategyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginAndCommitRenameStrategyTest.java Sat Mar 7 09:31:17 2009
@@ -50,7 +50,7 @@
public void testIllegalOptions() throws Exception {
try {
- context.getEndpoint("file://target?moveExpression=../done/${file:name}&delete=true").createConsumer(new Processor() {
+ context.getEndpoint("file://target?move=../done/${file:name}&delete=true").createConsumer(new Processor() {
public void process(Exchange exchange) throws Exception {
}
});
@@ -60,7 +60,7 @@
}
try {
- context.getEndpoint("file://target?moveExpression=${file:name.noext}.bak&delete=true").createConsumer(new Processor() {
+ context.getEndpoint("file://target?move=${file:name.noext}.bak&delete=true").createConsumer(new Processor() {
public void process(Exchange exchange) throws Exception {
}
});
@@ -73,7 +73,7 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("file://target/reports?preMoveExpression=../inprogress/${file:name}&moveExpression=../done/${file:name}&consumer.delay=5000")
+ from("file://target/reports?preMove=../inprogress/${file:name}&move=../done/${file:name}&consumer.delay=5000")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
GenericFileExchange<File> fe = (GenericFileExchange<File>) exchange;
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginExpressionRenameStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginExpressionRenameStrategyTest.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginExpressionRenameStrategyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginExpressionRenameStrategyTest.java Sat Mar 7 09:31:17 2009
@@ -72,7 +72,7 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("file://target/reports?preMoveExpression=../inprogress/${file:name.noext}.bak&consumer.delay=5000")
+ from("file://target/reports?preMove=../inprogress/${file:name.noext}.bak&consumer.delay=5000")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
GenericFileExchange<File> fe = (GenericFileExchange<File>) exchange;
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginRenameStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginRenameStrategyTest.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginRenameStrategyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginRenameStrategyTest.java Sat Mar 7 09:31:17 2009
@@ -70,7 +70,7 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("file://target/reports?preMoveExpression=../inprogress/${file:name}&consumer.delay=5000")
+ from("file://target/reports?preMove=../inprogress/${file:name}&consumer.delay=5000")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
GenericFileExchange<File> fe = (GenericFileExchange<File>) exchange;
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameAbsolutePathStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameAbsolutePathStrategyTest.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameAbsolutePathStrategyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameAbsolutePathStrategyTest.java Sat Mar 7 09:31:17 2009
@@ -52,7 +52,7 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("file://target/reports?moveExpression=" + base + "/done/${file:name}&consumer.delay=5000").to("mock:report");
+ from("file://target/reports?move=" + base + "/done/${file:name}&consumer.delay=5000").to("mock:report");
}
};
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameStrategyTest.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameStrategyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameStrategyTest.java Sat Mar 7 09:31:17 2009
@@ -77,7 +77,7 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("file://target/reports?moveExpression=../done/${file:name}&consumer.delay=5000").to("mock:report");
+ from("file://target/reports?move=../done/${file:name}&consumer.delay=5000").to("mock:report");
}
};
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionTest.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileExpressionTest.java Sat Mar 7 09:31:17 2009
@@ -54,7 +54,7 @@
@Override
public void configure() throws Exception {
from("file://target/filelanguage/bean/"
- + "?fileExpression=${bean:counter.next}.txt&delete=true").to("mock:result");
+ + "?fileName=${bean:counter.next}.txt&delete=true").to("mock:result");
}
});
context.start();
@@ -77,7 +77,7 @@
public void configure() throws Exception {
// START SNIPPET: e1
from("file://target/filelanguage/date/"
- + "?fileExpression=myfile-${date:now:yyyyMMdd}.txt").to("mock:result");
+ + "?fileName=myfile-${date:now:yyyyMMdd}.txt").to("mock:result");
// END SNIPPET: e1
}
});
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentRefTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentRefTest.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentRefTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentRefTest.java Sat Mar 7 09:31:17 2009
@@ -50,7 +50,7 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("file://target/idempotent/?idempotent=true&idempotentRepository=#myRepo&moveExpression=done/${file:name}").to("mock:result");
+ from("file://target/idempotent/?idempotent=true&idempotentRepository=#myRepo&move=done/${file:name}").to("mock:result");
}
};
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentTest.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentTest.java Sat Mar 7 09:31:17 2009
@@ -39,7 +39,7 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("file://target/idempotent/?idempotent=true&moveExpression=done/${file:name}").to("mock:result");
+ from("file://target/idempotent/?idempotent=true&move=done/${file:name}").to("mock:result");
}
};
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveExpressionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveExpressionTest.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveExpressionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveExpressionTest.java Sat Mar 7 09:31:17 2009
@@ -53,7 +53,7 @@
@Override
public void configure() throws Exception {
from("file://target/filelanguage/?exclude=.*bak"
- + "&moveExpression=${id}.bak").to("mock:result");
+ + "&move=${id}.bak").to("mock:result");
}
});
context.start();
@@ -78,7 +78,7 @@
@Override
public void configure() throws Exception {
from("file://target/filelanguage/?exclude=.*bak"
- + "&moveExpression=backup-${id}-${file:name.noext}.bak").to("mock:result");
+ + "&move=backup-${id}-${file:name.noext}.bak").to("mock:result");
}
});
context.start();
@@ -103,7 +103,7 @@
@Override
public void configure() throws Exception {
from("file://target/filelanguage/?exclude=.*bak"
- + "&moveExpression=backup/${bean:myguidgenerator.guid}.txt").to("mock:result");
+ + "&move=backup/${bean:myguidgenerator.guid}.txt").to("mock:result");
}
});
context.start();
@@ -121,7 +121,7 @@
@Override
public void configure() throws Exception {
from("file://target/filelanguage/?exclude=.*bak"
- + "&moveExpression=../backup/${file:name}.bak").to("mock:result");
+ + "&move=../backup/${file:name}.bak").to("mock:result");
}
});
context.start();
@@ -144,7 +144,7 @@
endpoint.setFile(new File("target/filelanguage/"));
endpoint.setOperations(new FileOperations(endpoint));
endpoint.setAutoCreate(false);
- endpoint.setMoveExpression(BeanLanguage.bean("myguidgenerator"));
+ endpoint.setMove(BeanLanguage.bean("myguidgenerator"));
endpoint.setExclude(".*bak");
from(endpoint).to("mock:result");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerExpressionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerExpressionTest.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerExpressionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerExpressionTest.java Sat Mar 7 09:31:17 2009
@@ -52,7 +52,7 @@
}
public void testProduceBeanByExpression() throws Exception {
- template.sendBody("file://target/filelanguage?fileExpression=${bean:myguidgenerator}.bak", "Hello World");
+ template.sendBody("file://target/filelanguage?fileName=${bean:myguidgenerator}.bak", "Hello World");
assertFileExists("target/filelanguage/123.bak");
}
@@ -66,7 +66,7 @@
}
public void testProducerDateByExpression() throws Exception {
- template.sendBody("file://target/filelanguage?fileExpression=myfile-${date:now:yyyyMMdd}.txt", "Hello World");
+ template.sendBody("file://target/filelanguage?fileName=myfile-${date:now:yyyyMMdd}.txt", "Hello World");
String date = new SimpleDateFormat("yyyyMMdd").format(new Date());
assertFileExists("target/filelanguage/myfile-" + date + ".txt");
@@ -74,14 +74,14 @@
public void testProducerComplexByExpression() throws Exception {
String expression = "../filelanguageinbox/myfile-${bean:myguidgenerator.guid}-${date:now:yyyyMMdd}.txt";
- template.sendBody("file://target/filelanguage?fileExpression=" + expression, "Hello World");
+ template.sendBody("file://target/filelanguage?fileName=" + expression, "Hello World");
String date = new SimpleDateFormat("yyyyMMdd").format(new Date());
assertFileExists("target/filelanguageinbox/myfile-123-" + date + ".txt");
}
public void testProducerSimpleWithHeaderByExpression() throws Exception {
- template.sendBodyAndHeader("file://target/filelanguage?fileExpression=myfile-${in.header.foo}.txt",
+ template.sendBodyAndHeader("file://target/filelanguage?fileName=myfile-${in.header.foo}.txt",
"Hello World", "foo", "abc");
assertFileExists("target/filelanguage/myfile-abc.txt");
@@ -92,7 +92,7 @@
cal.set(1974, Calendar.APRIL, 20);
Date date = cal.getTime();
- template.sendBodyAndHeader("file://target/filelanguage?fileExpression=mybirthday-${date:in.header.birthday:yyyyMMdd}.txt",
+ template.sendBodyAndHeader("file://target/filelanguage?fileName=mybirthday-${date:in.header.birthday:yyyyMMdd}.txt",
"Hello World", "birthday", date);
assertFileExists("target/filelanguage/mybirthday-19740420.txt");
Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java (original)
+++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java Sat Mar 7 09:31:17 2009
@@ -61,8 +61,13 @@
afterPropertiesSet();
RemoteFileConsumer<T> consumer = buildConsumer(processor, (RemoteFileOperations<T>) operations);
- if (isDelete() && getMoveExpression() != null) {
- throw new IllegalArgumentException("You cannot both set delete=true and moveExpression options");
+ // we assume its a file if the name has a dot in it (eg foo.txt)
+ if (configuration.getDirectory().contains(".")) {
+ throw new IllegalArgumentException("Only directory is supported. Endpoint must be configured with a valid directory: " + configuration.getDirectory());
+ }
+
+ if (isDelete() && getMove() != null) {
+ throw new IllegalArgumentException("You cannot both set delete=true and move options");
}
// if noop=true then idempotent should also be configured
if (isNoop() && !isIdempotent()) {
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileAbsoluteFolderRecursiveTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileAbsoluteFolderRecursiveTest.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileAbsoluteFolderRecursiveTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileAbsoluteFolderRecursiveTest.java Sat Mar 7 09:31:17 2009
@@ -26,8 +26,8 @@
public class FromFtpMoveFileAbsoluteFolderRecursiveTest extends FtpServerTestSupport {
private String getFtpUrl() {
- return "ftp://admin@localhost:" + getPort() + "/movefile?password=admin&recursive=true&binary=false&excludeNamePostfix=.old"
- + "&moveExpression=/done/${file:name}.old&initialDelay=5000&delay=5000";
+ return "ftp://admin@localhost:" + getPort() + "/movefile?password=admin&recursive=true&binary=false&exclude=.*old"
+ + "&move=/done/${file:name}.old&initialDelay=2500&delay=5000";
}
@Override
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePostfixTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePostfixTest.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePostfixTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePostfixTest.java Sat Mar 7 09:31:17 2009
@@ -31,7 +31,7 @@
private String getFtpUrl() {
return "ftp://admin@localhost:" + getPort() + "/movefile?password=admin&binary=false"
- + "&moveExpression=${file:name}.old&consumer.delay=5000";
+ + "&move=${file:name}.old&consumer.delay=5000";
}
@Override
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePrefixTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePrefixTest.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePrefixTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFilePrefixTest.java Sat Mar 7 09:31:17 2009
@@ -31,7 +31,7 @@
private String getFtpUrl() {
return "ftp://admin@localhost:" + getPort() + "/movefile?password=admin&binary=false&consumer.delay=5000"
- + "&moveExpression=done/${file:name}";
+ + "&move=done/${file:name}";
}
@Override
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileRecursiveTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileRecursiveTest.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileRecursiveTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileRecursiveTest.java Sat Mar 7 09:31:17 2009
@@ -26,8 +26,8 @@
public class FromFtpMoveFileRecursiveTest extends FtpServerTestSupport {
private String getFtpUrl() {
- return "ftp://admin@localhost:" + getPort() + "/movefile?password=admin&recursive=true&binary=false&excludeNamePostfix=.old"
- + "&moveExpression=done/${file:name}.old&initialDelay=5000&delay=5000";
+ return "ftp://admin@localhost:" + getPort() + "/movefile?password=admin&recursive=true&binary=false&exclude=.*old"
+ + "&move=done/${file:name}.old&initialDelay=2500&delay=5000";
}
@Override
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileTest.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileTest.java Sat Mar 7 09:31:17 2009
@@ -31,7 +31,7 @@
private String getFtpUrl() {
return "ftp://admin@localhost:" + getPort() + "/movefile?password=admin&binary=false"
- + "&moveExpression=done/sub2/${file:name}.old&consumer.delay=5000";
+ + "&move=done/sub2/${file:name}.old&consumer.delay=5000";
}
@Override
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileToHiddenFolderRecursiveTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileToHiddenFolderRecursiveTest.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileToHiddenFolderRecursiveTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpMoveFileToHiddenFolderRecursiveTest.java Sat Mar 7 09:31:17 2009
@@ -27,7 +27,7 @@
private String getFtpUrl() {
return "ftp://admin@localhost:" + getPort() + "?password=admin&recursive=true&binary=false"
- + "&moveExpression=.done/${file:name}&initialDelay=3000&delay=5000";
+ + "&move=.done/${file:name}&initialDelay=3000&delay=5000";
}
@Override
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFileExpressionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFileExpressionTest.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFileExpressionTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFileExpressionTest.java Sat Mar 7 09:31:17 2009
@@ -26,13 +26,13 @@
import org.apache.camel.component.mock.MockEndpoint;
/**
- * Unit test to test preMoveExpression option.
+ * Unit test to test preMove option.
*/
public class FromFtpPreMoveFileExpressionTest extends FtpServerTestSupport {
private String getFtpUrl() {
return "ftp://admin@localhost:" + getPort() + "/movefile?password=admin&binary=false&consumer.delay=5000"
- + "&preMoveExpression=../inprogress/${file:name.noext}.bak";
+ + "&preMove=../inprogress/${file:name.noext}.bak";
}
@Override
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePostfixTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePostfixTest.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePostfixTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePostfixTest.java Sat Mar 7 09:31:17 2009
@@ -31,7 +31,7 @@
private String getFtpUrl() {
return "ftp://admin@localhost:" + getPort() + "/movefile?password=admin&binary=false"
- + "&preMoveExpression=${file:name}.old";
+ + "&preMove=${file:name}.old";
}
@Override
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePrefixTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePrefixTest.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePrefixTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPreMoveFilePrefixTest.java Sat Mar 7 09:31:17 2009
@@ -31,7 +31,7 @@
private String getFtpUrl() {
return "ftp://admin@localhost:" + getPort() + "/movefile?password=admin&binary=false&consumer.delay=5000"
- + "&preMoveExpression=done/${file:name}";
+ + "&preMove=done/${file:name}";
}
@Override
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRegexPatternTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRegexPatternTest.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRegexPatternTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRegexPatternTest.java Sat Mar 7 09:31:17 2009
@@ -26,7 +26,7 @@
public class FromFtpRegexPatternTest extends FtpServerTestSupport {
private String getFtpUrl() {
- return "ftp://admin@localhost:" + getPort() + "/regexp?password=admin®exPattern=report.*";
+ return "ftp://admin@localhost:" + getPort() + "/regexp?password=admin&include=report.*";
}
public void testFtpRegexPattern() throws Exception {
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromQueueThenConsumeFtpToMockTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromQueueThenConsumeFtpToMockTest.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromQueueThenConsumeFtpToMockTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromQueueThenConsumeFtpToMockTest.java Sat Mar 7 09:31:17 2009
@@ -80,8 +80,8 @@
String filename = exchange.getIn().getHeader("myfile", String.class);
// construct the total url for the ftp consumer
- // set a regex pattern to only consume the file we want
- String url = getFtpUrl() + "®exPattern=" + filename;
+ // add the fileName option with the file we want to consume
+ String url = getFtpUrl() + "&fileName=" + filename;
// create a ftp endpoint
Endpoint ftp = context.getEndpoint(url);
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDirectoriesNotMatchedTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDirectoriesNotMatchedTest.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDirectoriesNotMatchedTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDirectoriesNotMatchedTest.java Sat Mar 7 09:31:17 2009
@@ -26,7 +26,7 @@
private String getFtpUrl() {
return "ftp://admin@localhost:" + getPort() + "/dirnotmatched/?password=admin"
- + "&recursive=true®exPattern=.*txt$";
+ + "&recursive=true&include=.*txt$";
}
@Override
Modified: 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/FtpConsumerExcludeNameTest.java?rev=751229&r1=751228&r2=751229&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/FtpConsumerExcludeNameTest.java Sat Mar 7 09:31:17 2009
@@ -26,7 +26,7 @@
private String getFtpUrl() {
return "ftp://admin@localhost:" + getPort() + "/excludename?password=admin"
- + "&excludeNamePrefix=secret&excludeNamePostfix=xml";
+ + "&exclude=secret.*|.*xml";
}
@Override
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIncludeNameTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIncludeNameTest.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIncludeNameTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerIncludeNameTest.java Sat Mar 7 09:31:17 2009
@@ -26,7 +26,7 @@
private String getFtpUrl() {
return "ftp://admin@localhost:" + getPort() + "/includename?password=admin"
- + "&includeNamePrefix=report&excludeNamePostfix=xml";
+ + "&include=report.*&exclude=.*xml";
}
@Override
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMoveExpressionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMoveExpressionTest.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMoveExpressionTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMoveExpressionTest.java Sat Mar 7 09:31:17 2009
@@ -69,7 +69,7 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from(getFtpUrl() + "&moveExpression=backup/${date:now:yyyyMMdd}/${bean:myguidgenerator}"
+ from(getFtpUrl() + "&move=backup/${date:now:yyyyMMdd}/${bean:myguidgenerator}"
+ "-${file:name.noext}.bak").to("mock:result");
}
};
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpIllegalOptionsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpIllegalOptionsTest.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpIllegalOptionsTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpIllegalOptionsTest.java Sat Mar 7 09:31:17 2009
@@ -24,7 +24,7 @@
public void testIllegalOptions() throws Exception {
try {
- context.getEndpoint("ftp://target?moveExpression=../done/${file:name}&delete=true").createConsumer(new Processor() {
+ context.getEndpoint("ftp://target?move=../done/${file:name}&delete=true").createConsumer(new Processor() {
public void process(Exchange exchange) throws Exception {
}
});
@@ -34,7 +34,7 @@
}
try {
- context.getEndpoint("file://target?moveExpression=../done/${file:name}&delete=true").createConsumer(new Processor() {
+ context.getEndpoint("file://target?move=../done/${file:name}&delete=true").createConsumer(new Processor() {
public void process(Exchange exchange) throws Exception {
}
});
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerExpressionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerExpressionTest.java?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerExpressionTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerExpressionTest.java Sat Mar 7 09:31:17 2009
@@ -53,7 +53,7 @@
}
public void testProduceBeanByExpression() throws Exception {
- template.sendBody(getFtpUrl() + "&fileExpression=${bean:myguidgenerator}.bak", "Hello World");
+ template.sendBody(getFtpUrl() + "&fileName=${bean:myguidgenerator}.bak", "Hello World");
assertFileExists(FTP_ROOT_DIR + "filelanguage/123.bak");
}
@@ -72,7 +72,7 @@
}
public void testProducerDateByExpression() throws Exception {
- template.sendBody(getFtpUrl() + "&fileExpression=myfile-${date:now:yyyyMMdd}.txt", "Hello World");
+ template.sendBody(getFtpUrl() + "&fileName=myfile-${date:now:yyyyMMdd}.txt", "Hello World");
String date = new SimpleDateFormat("yyyyMMdd").format(new Date());
assertFileExists(FTP_ROOT_DIR + "filelanguage/myfile-" + date + ".txt");
@@ -80,14 +80,14 @@
public void testProducerComplexByExpression() throws Exception {
String expression = "../filelanguageinbox/myfile-${bean:myguidgenerator.guid}-${date:now:yyyyMMdd}.txt";
- template.sendBody(getFtpUrl() + "&fileExpression=" + expression, "Hello World");
+ template.sendBody(getFtpUrl() + "&fileName=" + expression, "Hello World");
String date = new SimpleDateFormat("yyyyMMdd").format(new Date());
assertFileExists(FTP_ROOT_DIR + "filelanguageinbox/myfile-123-" + date + ".txt");
}
public void testProducerSimpleWithHeaderByExpression() throws Exception {
- template.sendBodyAndHeader(getFtpUrl() + "&fileExpression=myfile-${in.header.foo}.txt",
+ template.sendBodyAndHeader(getFtpUrl() + "&fileName=myfile-${in.header.foo}.txt",
"Hello World", "foo", "abc");
assertFileExists(FTP_ROOT_DIR + "filelanguage/myfile-abc.txt");
@@ -98,7 +98,7 @@
cal.set(1974, Calendar.APRIL, 20);
Date date = cal.getTime();
- template.sendBodyAndHeader(getFtpUrl() + "&fileExpression=mybirthday-${date:in.header.birthday:yyyyMMdd}.txt",
+ template.sendBodyAndHeader(getFtpUrl() + "&fileName=mybirthday-${date:in.header.birthday:yyyyMMdd}.txt",
"Hello World", "birthday", date);
assertFileExists(FTP_ROOT_DIR + "filelanguage/mybirthday-19740420.txt");
Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/ftp/SpringFtpEndpointTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/ftp/SpringFtpEndpointTest-context.xml?rev=751229&r1=751228&r2=751229&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/ftp/SpringFtpEndpointTest-context.xml (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/ftp/SpringFtpEndpointTest-context.xml Sat Mar 7 09:31:17 2009
@@ -40,7 +40,7 @@
<property name="username" value="admin"/>
<property name="password" value="admin"/>
<property name="protocol" value="ftp"/>
- <property name="file" value="helloftp"/>
+ <property name="directory" value="helloftp"/>
</bean>
<!-- END SNIPPET: e1 -->