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/05/18 06:32:43 UTC
svn commit: r775806 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/component/file/
test/java/org/apache/camel/component/file/
Author: davsclaus
Date: Mon May 18 04:32:43 2009
New Revision: 775806
URL: http://svn.apache.org/viewvc?rev=775806&view=rev
Log:
File component. Renamed option flattern to flatten. Thanks to Joe Gottman for spotting this.
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileToFileWithFlattenTest.java (contents, props changed)
- copied, changed from r775621, camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileToFileWithFlatternTest.java
Removed:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileToFileWithFlatternTest.java
Modified:
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/test/java/org/apache/camel/component/file/FileConsumeSimpleAbsoluteMoveToAbsoluteTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleRelativeMoveToAbsoluteTest.java
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=775806&r1=775805&r2=775806&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 Mon May 18 04:32:43 2009
@@ -60,7 +60,7 @@
protected boolean noop;
protected boolean recursive;
protected boolean delete;
- protected boolean flattern;
+ protected boolean flatten;
protected String tempPrefix;
protected String include;
protected String exclude;
@@ -192,12 +192,12 @@
this.delete = delete;
}
- public boolean isFlattern() {
- return flattern;
+ public boolean isFlatten() {
+ return flatten;
}
- public void setFlattern(boolean flattern) {
- this.flattern = flattern;
+ public void setFlatten(boolean flatten) {
+ this.flatten = flatten;
}
public Expression getMove() {
@@ -400,8 +400,8 @@
public void configureMessage(GenericFile<T> file, Message message) {
message.setBody(file);
- if (flattern) {
- // when flattern the file name should not contain any paths
+ if (flatten) {
+ // when flatten the file name should not contain any paths
message.setHeader(Exchange.FILE_NAME, file.getFileNameOnly());
} else {
// compute name to set on header that should be relative to starting directory
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=775806&r1=775805&r2=775806&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 Mon May 18 04:32:43 2009
@@ -179,8 +179,8 @@
name = expression.evaluate(exchange, String.class);
}
- // flattern name
- if (name != null && endpoint.isFlattern()) {
+ // flatten name
+ if (name != null && endpoint.isFlatten()) {
int pos = name.lastIndexOf(getFileSeparator());
if (pos == -1) {
pos = name.lastIndexOf('/');
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleAbsoluteMoveToAbsoluteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleAbsoluteMoveToAbsoluteTest.java?rev=775806&r1=775805&r2=775806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleAbsoluteMoveToAbsoluteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleAbsoluteMoveToAbsoluteTest.java Mon May 18 04:32:43 2009
@@ -45,7 +45,7 @@
public void testMoveToSubDir() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(3);
- // will flattern when using absolute path in move
+ // will flatten when using absolute path in move
mock.expectedFileExists(base + "/.done/bye.txt");
mock.expectedFileExists(base + "/.done/hello.txt");
mock.expectedFileExists(base + "/.done/goodday.txt");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleRelativeMoveToAbsoluteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleRelativeMoveToAbsoluteTest.java?rev=775806&r1=775805&r2=775806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleRelativeMoveToAbsoluteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleRelativeMoveToAbsoluteTest.java Mon May 18 04:32:43 2009
@@ -45,7 +45,7 @@
public void testMoveToSubDir() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(3);
- // will flattern when using absolute path in move
+ // will flatten when using absolute path in move
mock.expectedFileExists(base + "/.done/bye.txt");
mock.expectedFileExists(base + "/.done/hello.txt");
mock.expectedFileExists(base + "/.done/goodday.txt");
Copied: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileToFileWithFlattenTest.java (from r775621, camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileToFileWithFlatternTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileToFileWithFlattenTest.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileToFileWithFlattenTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileToFileWithFlatternTest.java&r1=775621&r2=775806&rev=775806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileToFileWithFlatternTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileToFileWithFlattenTest.java Mon May 18 04:32:43 2009
@@ -24,9 +24,9 @@
/**
* @version $Revision$
*/
-public class FileToFileWithFlatternTest extends ContextTestSupport {
+public class FileToFileWithFlattenTest extends ContextTestSupport {
- private String fileUrl = "file://target/flattern-in";
+ private String fileUrl = "file://target/flatten-in";
@Override
public boolean isUseRouteBuilder() {
@@ -35,8 +35,8 @@
@Override
protected void setUp() throws Exception {
- deleteDirectory("./target/flattern-in");
- deleteDirectory("./target/flattern-out");
+ deleteDirectory("./target/flatten-in");
+ deleteDirectory("./target/flatten-out");
super.setUp();
template.sendBodyAndHeader(fileUrl, "Bye World", Exchange.FILE_NAME, "bye.txt");
template.sendBodyAndHeader(fileUrl, "Hello World", Exchange.FILE_NAME, "sub/hello.txt");
@@ -53,7 +53,7 @@
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("file://target/flattern-in?recursive=true&flattern=true").to("file://target/flattern-out", "mock:result");
+ from("file://target/flatten-in?recursive=true&flatten=true").to("file://target/flatten-out", "mock:result");
}
});
context.start();
@@ -61,15 +61,15 @@
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(3);
- // flattern files
- mock.expectedFileExists("./target/flattern-out/bye.txt");
- mock.expectedFileExists("./target/flattern-out/hello.txt");
- mock.expectedFileExists("./target/flattern-out/goodday.txt");
+ // flatten files
+ mock.expectedFileExists("./target/flatten-out/bye.txt");
+ mock.expectedFileExists("./target/flatten-out/hello.txt");
+ mock.expectedFileExists("./target/flatten-out/goodday.txt");
// default move files
- mock.expectedFileExists("./target/flattern-in/.camel/bye.txt");
- mock.expectedFileExists("./target/flattern-in/sub/.camel/hello.txt");
- mock.expectedFileExists("./target/flattern-in/sub/sub2/.camel/goodday.txt");
+ mock.expectedFileExists("./target/flatten-in/.camel/bye.txt");
+ mock.expectedFileExists("./target/flatten-in/sub/.camel/hello.txt");
+ mock.expectedFileExists("./target/flatten-in/sub/sub2/.camel/goodday.txt");
assertMockEndpointsSatisfied();
}
@@ -78,7 +78,7 @@
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("file://target/flattern-in?recursive=true").to("file://target/flattern-out?flattern=true", "mock:result");
+ from("file://target/flatten-in?recursive=true").to("file://target/flatten-out?flatten=true", "mock:result");
}
});
context.start();
@@ -86,15 +86,15 @@
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(3);
- // flattern files
- mock.expectedFileExists("./target/flattern-out/bye.txt");
- mock.expectedFileExists("./target/flattern-out/hello.txt");
- mock.expectedFileExists("./target/flattern-out/goodday.txt");
+ // flatten files
+ mock.expectedFileExists("./target/flatten-out/bye.txt");
+ mock.expectedFileExists("./target/flatten-out/hello.txt");
+ mock.expectedFileExists("./target/flatten-out/goodday.txt");
// default move files
- mock.expectedFileExists("./target/flattern-in/.camel/bye.txt");
- mock.expectedFileExists("./target/flattern-in/sub/.camel/hello.txt");
- mock.expectedFileExists("./target/flattern-in/sub/sub2/.camel/goodday.txt");
+ mock.expectedFileExists("./target/flatten-in/.camel/bye.txt");
+ mock.expectedFileExists("./target/flatten-in/sub/.camel/hello.txt");
+ mock.expectedFileExists("./target/flatten-in/sub/sub2/.camel/goodday.txt");
assertMockEndpointsSatisfied();
}
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileToFileWithFlattenTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileToFileWithFlattenTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date