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/02/16 07:58:45 UTC
svn commit: r744825 [2/2] - 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/main/resources/META-INF/services/org/apache/camel/component/
camel-...
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=744825&r1=744824&r2=744825&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 Mon Feb 16 06:58:43 2009
@@ -45,14 +45,14 @@
}
public void testConsumeFileBasedOnBeanName() throws Exception {
- template.sendBodyAndHeader("newfile://target/filelanguage/bean", "Hello World", NewFileComponent.HEADER_FILE_NAME, "122.txt");
- template.sendBodyAndHeader("newfile://target/filelanguage/bean", "Goodday World", NewFileComponent.HEADER_FILE_NAME, "123.txt");
- template.sendBodyAndHeader("newfile://target/filelanguage/bean", "Bye World", NewFileComponent.HEADER_FILE_NAME, "124.txt");
+ template.sendBodyAndHeader("file://target/filelanguage/bean", "Hello World", FileComponent.HEADER_FILE_NAME, "122.txt");
+ template.sendBodyAndHeader("file://target/filelanguage/bean", "Goodday World", FileComponent.HEADER_FILE_NAME, "123.txt");
+ template.sendBodyAndHeader("file://target/filelanguage/bean", "Bye World", FileComponent.HEADER_FILE_NAME, "124.txt");
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("newfile://target/filelanguage/bean/"
+ from("file://target/filelanguage/bean/"
+ "?fileExpression=${bean:counter.next}.txt&delete=true").to("mock:result");
}
});
@@ -67,15 +67,15 @@
}
public void testConsumeFileBasedOnDatePattern() throws Exception {
- template.sendBodyAndHeader("newfile://target/filelanguage/date", "Bye World", NewFileComponent.HEADER_FILE_NAME, "myfile-20081128.txt");
- template.sendBodyAndHeader("newfile://target/filelanguage/date", "Hello World", NewFileComponent.HEADER_FILE_NAME, "myfile-20081129.txt");
- template.sendBodyAndHeader("newfile://target/filelanguage/date", "Goodday World", NewFileComponent.HEADER_FILE_NAME, "myfile-${date:now:yyyyMMdd}.txt");
+ template.sendBodyAndHeader("file://target/filelanguage/date", "Bye World", FileComponent.HEADER_FILE_NAME, "myfile-20081128.txt");
+ template.sendBodyAndHeader("file://target/filelanguage/date", "Hello World", FileComponent.HEADER_FILE_NAME, "myfile-20081129.txt");
+ template.sendBodyAndHeader("file://target/filelanguage/date", "Goodday World", FileComponent.HEADER_FILE_NAME, "myfile-${date:now:yyyyMMdd}.txt");
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
// START SNIPPET: e1
- from("newfile://target/filelanguage/date/"
+ from("file://target/filelanguage/date/"
+ "?fileExpression=myfile-${date:now:yyyyMMdd}.txt").to("mock:result");
// END SNIPPET: e1
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileFilterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileFilterTest.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileFilterTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileFilterTest.java Mon Feb 16 06:58:43 2009
@@ -26,7 +26,7 @@
*/
public class FileConsumerFileFilterTest extends ContextTestSupport {
- private String fileUrl = "newfile://target/filefilter/?filter=#myFilter";
+ private String fileUrl = "file://target/filefilter/?filter=#myFilter";
@Override
protected JndiRegistry createRegistry() throws Exception {
@@ -45,7 +45,7 @@
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(0);
- template.sendBodyAndHeader("newfile:target/filefilter/", "This is a file to be filtered",
+ template.sendBodyAndHeader("file:target/filefilter/", "This is a file to be filtered",
FileComponent.HEADER_FILE_NAME, "skipme.txt");
mock.setResultWaitTime(2000);
@@ -57,10 +57,10 @@
mock.expectedMessageCount(1);
mock.expectedBodiesReceived("Hello World");
- template.sendBodyAndHeader("newfile:target/filefilter/", "This is a file to be filtered",
+ template.sendBodyAndHeader("file:target/filefilter/", "This is a file to be filtered",
FileComponent.HEADER_FILE_NAME, "skipme.txt");
- template.sendBodyAndHeader("newfile:target/filefilter/", "Hello World",
+ template.sendBodyAndHeader("file:target/filefilter/", "Hello World",
FileComponent.HEADER_FILE_NAME, "hello.txt");
mock.assertIsSatisfied();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeAndExcludeNameTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeAndExcludeNameTest.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeAndExcludeNameTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeAndExcludeNameTest.java Mon Feb 16 06:58:43 2009
@@ -36,17 +36,17 @@
}
private void prepareFiles() throws Exception {
- String url = "newfile://target/includeexclude";
- template.sendBodyAndHeader(url, "Hello World", NewFileComponent.HEADER_FILE_NAME, "hello.xml");
- template.sendBodyAndHeader(url, "Report 1", NewFileComponent.HEADER_FILE_NAME, "report1.xml");
- template.sendBodyAndHeader(url, "Report 2", NewFileComponent.HEADER_FILE_NAME, "report2.txt");
- template.sendBodyAndHeader(url, "Report 3", NewFileComponent.HEADER_FILE_NAME, "report3.txt");
+ String url = "file://target/includeexclude";
+ template.sendBodyAndHeader(url, "Hello World", FileComponent.HEADER_FILE_NAME, "hello.xml");
+ template.sendBodyAndHeader(url, "Report 1", FileComponent.HEADER_FILE_NAME, "report1.xml");
+ template.sendBodyAndHeader(url, "Report 2", FileComponent.HEADER_FILE_NAME, "report2.txt");
+ template.sendBodyAndHeader(url, "Report 3", FileComponent.HEADER_FILE_NAME, "report3.txt");
}
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("newfile://target/includeexclude/?includeNamePrefix=report&excludeNamePostfix=xml")
+ from("file://target/includeexclude/?includeNamePrefix=report&excludeNamePostfix=xml")
.to("mock:result");
}
};
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeNameTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeNameTest.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeNameTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIncludeNameTest.java Mon Feb 16 06:58:43 2009
@@ -36,17 +36,17 @@
}
private void prepareFiles() throws Exception {
- String url = "newfile://target/include";
- template.sendBodyAndHeader(url, "Hello World", NewFileComponent.HEADER_FILE_NAME, "hello.xml");
- template.sendBodyAndHeader(url, "Reports", NewFileComponent.HEADER_FILE_NAME, "report1.txt");
- template.sendBodyAndHeader(url, "Bye World", NewFileComponent.HEADER_FILE_NAME, "secret.txt");
- template.sendBodyAndHeader(url, "Reports", NewFileComponent.HEADER_FILE_NAME, "report2.txt");
+ String url = "file://target/include";
+ template.sendBodyAndHeader(url, "Hello World", FileComponent.HEADER_FILE_NAME, "hello.xml");
+ template.sendBodyAndHeader(url, "Reports", FileComponent.HEADER_FILE_NAME, "report1.txt");
+ template.sendBodyAndHeader(url, "Bye World", FileComponent.HEADER_FILE_NAME, "secret.txt");
+ template.sendBodyAndHeader(url, "Reports", FileComponent.HEADER_FILE_NAME, "report2.txt");
}
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("newfile://target/include/?includeNamePrefix=report&includeNamePostfix=txt")
+ from("file://target/include/?includeNamePrefix=report&includeNamePostfix=txt")
.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=744825&r1=744824&r2=744825&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 Mon Feb 16 06:58:43 2009
@@ -51,7 +51,7 @@
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("newfile://target/filelanguage/report.txt?directory=false&autoCreate=false"
+ from("file://target/filelanguage/report.txt?directory=false&autoCreate=false"
+ "&moveExpression=${id}.bak").to("mock:result");
}
});
@@ -60,7 +60,7 @@
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
- template.sendBodyAndHeader("newfile://target/filelanguage/", "Hello World", NewFileComponent.HEADER_FILE_NAME, "report.txt");
+ template.sendBodyAndHeader("file://target/filelanguage/", "Hello World", FileComponent.HEADER_FILE_NAME, "report.txt");
assertMockEndpointsSatisfied();
// give time for consumer to rename file
@@ -76,7 +76,7 @@
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("newfile://target/filelanguage/report2.txt?directory=false&autoCreate=false"
+ from("file://target/filelanguage/report2.txt?directory=false&autoCreate=false"
+ "&moveExpression=backup-${id}-${file:name.noext}.bak").to("mock:result");
}
});
@@ -85,7 +85,7 @@
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Bye World");
- template.sendBodyAndHeader("newfile://target/filelanguage/", "Bye World", NewFileComponent.HEADER_FILE_NAME, "report2.txt");
+ template.sendBodyAndHeader("file://target/filelanguage/", "Bye World", FileComponent.HEADER_FILE_NAME, "report2.txt");
assertMockEndpointsSatisfied();
// give time for consumer to rename file
@@ -101,7 +101,7 @@
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("newfile://target/filelanguage/report3.txt?directory=false&autoCreate=false"
+ from("file://target/filelanguage/report3.txt?directory=false&autoCreate=false"
+ "&moveExpression=backup/${bean:myguidgenerator.guid}.txt").to("mock:result");
}
});
@@ -111,7 +111,7 @@
mock.expectedBodiesReceived("Bye Big World");
mock.expectedFileExists("target/filelanguage/backup/123.txt", "Bye Big World");
- template.sendBodyAndHeader("newfile://target/filelanguage/", "Bye Big World", NewFileComponent.HEADER_FILE_NAME, "report3.txt");
+ template.sendBodyAndHeader("file://target/filelanguage/", "Bye Big World", FileComponent.HEADER_FILE_NAME, "report3.txt");
assertMockEndpointsSatisfied();
}
@@ -119,7 +119,7 @@
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("newfile://target/filelanguage/report4.txt?directory=false&autoCreate=false"
+ from("file://target/filelanguage/report4.txt?directory=false&autoCreate=false"
+ "&moveExpression=../backup/${file:name}.bak").to("mock:result");
}
});
@@ -129,7 +129,7 @@
mock.expectedBodiesReceived("Hello Big World");
mock.expectedFileExists("target/backup/report4.txt.bak");
- template.sendBodyAndHeader("newfile://target/filelanguage/", "Hello Big World", NewFileComponent.HEADER_FILE_NAME, "report4.txt");
+ template.sendBodyAndHeader("file://target/filelanguage/", "Hello Big World", FileComponent.HEADER_FILE_NAME, "report4.txt");
assertMockEndpointsSatisfied();
}
@@ -138,10 +138,10 @@
@Override
public void configure() throws Exception {
// configured by java using java beans setters
- NewFileEndpoint endpoint = new NewFileEndpoint();
+ FileEndpoint endpoint = new FileEndpoint();
endpoint.setCamelContext(context);
endpoint.setFile(new File("target/filelanguage/report5.txt"));
- endpoint.setOperations(new NewFileOperations(endpoint));
+ endpoint.setOperations(new FileOperations(endpoint));
endpoint.setDirectory(false);
endpoint.setAutoCreate(false);
endpoint.setMoveExpression(BeanLanguage.bean("myguidgenerator"));
@@ -155,8 +155,8 @@
mock.expectedBodiesReceived("Bean Language Rules The World");
mock.expectedFileExists("target/filelanguage/123");
- template.sendBodyAndHeader("newfile://target/filelanguage/", "Bean Language Rules The World",
- NewFileComponent.HEADER_FILE_NAME, "report5.txt");
+ template.sendBodyAndHeader("file://target/filelanguage/", "Bean Language Rules The World",
+ FileComponent.HEADER_FILE_NAME, "report5.txt");
assertMockEndpointsSatisfied();
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java Mon Feb 16 06:58:43 2009
@@ -39,8 +39,8 @@
MockEndpoint mock = getMockEndpoint("mock:report");
mock.expectedBodiesReceived("Hello Locked");
- template.sendBodyAndHeader("newfile:target/reports/locked", "Hello Locked",
- NewFileComponent.HEADER_FILE_NAME, "report.txt");
+ template.sendBodyAndHeader("file:target/reports/locked", "Hello Locked",
+ FileComponent.HEADER_FILE_NAME, "report.txt");
mock.assertIsSatisfied();
@@ -55,8 +55,8 @@
MockEndpoint mock = getMockEndpoint("mock:report");
mock.expectedBodiesReceived("Hello Not Locked");
- template.sendBodyAndHeader("newfile:target/reports/notlocked", "Hello Not Locked",
- NewFileComponent.HEADER_FILE_NAME, "report.txt");
+ template.sendBodyAndHeader("file:target/reports/notlocked", "Hello Not Locked",
+ FileComponent.HEADER_FILE_NAME, "report.txt");
mock.assertIsSatisfied();
@@ -70,7 +70,7 @@
private static void checkLockFile(boolean expected) {
String filename = "target/reports/";
filename += expected ? "locked/" : "notlocked/";
- filename += "report.txt" + NewFileComponent.DEFAULT_LOCK_FILE_POSTFIX;
+ filename += "report.txt" + FileComponent.DEFAULT_LOCK_FILE_POSTFIX;
File file = new File(filename);
file = file.getAbsoluteFile();
@@ -81,11 +81,11 @@
return new RouteBuilder() {
public void configure() throws Exception {
// for locks
- from("newfile://target/reports/locked/?noop=true").process(new MyNoopProcessor()).
+ from("file://target/reports/locked/?noop=true").process(new MyNoopProcessor()).
to("mock:report");
// for no locks
- from("newfile://target/reports/notlocked/?noop=true&readLock=false").process(new MyNoopProcessor()).
+ from("file://target/reports/notlocked/?noop=true&readLock=false").process(new MyNoopProcessor()).
to("mock:report");
}
};
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceGeneratedFileNameTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceGeneratedFileNameTest.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceGeneratedFileNameTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceGeneratedFileNameTest.java Mon Feb 16 06:58:43 2009
@@ -30,7 +30,7 @@
public void testGeneratedFileName() throws Exception {
Endpoint endpoint = context.getEndpoint("direct:a");
- NewFileEndpoint fileEndpoint = resolveMandatoryEndpoint("newfile://target", NewFileEndpoint.class);
+ FileEndpoint fileEndpoint = resolveMandatoryEndpoint("file://target", FileEndpoint.class);
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World");
@@ -47,7 +47,7 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("direct:a").to("newfile://target");
+ from("direct:a").to("file://target");
}
};
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceTempPrefixTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceTempPrefixTest.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceTempPrefixTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceTempPrefixTest.java Mon Feb 16 06:58:43 2009
@@ -27,7 +27,7 @@
*/
public class FileProduceTempPrefixTest extends ContextTestSupport {
- private String fileUrl = "newfile://target/tempandrename/?tempPrefix=inprogress.";
+ private String fileUrl = "file://target/tempandrename/?tempPrefix=inprogress.";
public void testCreateTempFileName() throws Exception {
Endpoint endpoint = context.getEndpoint(fileUrl);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteTest.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteTest.java Mon Feb 16 06:58:43 2009
@@ -31,7 +31,7 @@
protected Object expectedBody = "Hello there!";
protected String targetdir = "target/test-default-inbox";
protected String params = "?recursive=true";
- protected String uri = "newfile:" + targetdir + params;
+ protected String uri = "file:" + targetdir + params;
protected LockRecorderProcessor recorder = new LockRecorderProcessor();
public void testFileRoute() throws Exception {
@@ -47,7 +47,7 @@
@Override
protected void setUp() throws Exception {
deleteDirectory(targetdir);
- uri = "newfile:" + targetdir + params;
+ uri = "file:" + targetdir + params;
super.setUp();
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByExpressionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByExpressionTest.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByExpressionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByExpressionTest.java Mon Feb 16 06:58:43 2009
@@ -25,7 +25,7 @@
*/
public class FileSortByExpressionTest extends ContextTestSupport {
- private String fileUrl = "newfile://target/filesorter/";
+ private String fileUrl = "file://target/filesorter/";
@Override
protected void setUp() throws Exception {
@@ -39,14 +39,14 @@
}
private void prepareFolder(String folder) {
- template.sendBodyAndHeader("newfile:target/filesorter/" + folder, "Hello Paris",
- NewFileComponent.HEADER_FILE_NAME, "paris.dat");
+ template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello Paris",
+ FileComponent.HEADER_FILE_NAME, "paris.dat");
- template.sendBodyAndHeader("newfile:target/filesorter/" + folder, "Hello London",
- NewFileComponent.HEADER_FILE_NAME, "london.txt");
+ template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello London",
+ FileComponent.HEADER_FILE_NAME, "london.txt");
- template.sendBodyAndHeader("newfile:target/filesorter/" + folder, "Hello Copenhagen",
- NewFileComponent.HEADER_FILE_NAME, "copenhagen.xml");
+ template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello Copenhagen",
+ FileComponent.HEADER_FILE_NAME, "copenhagen.xml");
}
public void testSortFiles() throws Exception {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByIgnoreCaseExpressionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByIgnoreCaseExpressionTest.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByIgnoreCaseExpressionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByIgnoreCaseExpressionTest.java Mon Feb 16 06:58:43 2009
@@ -25,7 +25,7 @@
*/
public class FileSortByIgnoreCaseExpressionTest extends ContextTestSupport {
- private String fileUrl = "newfile://target/filesorter/";
+ private String fileUrl = "file://target/filesorter/";
@Override
protected void setUp() throws Exception {
@@ -39,14 +39,14 @@
}
private void prepareFolder(String folder) {
- template.sendBodyAndHeader("newfile:target/filesorter/" + folder, "Hello Paris",
- NewFileComponent.HEADER_FILE_NAME, "report-3.dat");
+ template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello Paris",
+ FileComponent.HEADER_FILE_NAME, "report-3.dat");
- template.sendBodyAndHeader("newfile:target/filesorter/" + folder, "Hello London",
- NewFileComponent.HEADER_FILE_NAME, "REPORT-2.txt");
+ template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello London",
+ FileComponent.HEADER_FILE_NAME, "REPORT-2.txt");
- template.sendBodyAndHeader("newfile:target/filesorter/" + folder, "Hello Copenhagen",
- NewFileComponent.HEADER_FILE_NAME, "Report-1.xml");
+ template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello Copenhagen",
+ FileComponent.HEADER_FILE_NAME, "Report-1.xml");
}
public void testSortFilesByNameWithCase() throws Exception {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByNestedExpressionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByNestedExpressionTest.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByNestedExpressionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSortByNestedExpressionTest.java Mon Feb 16 06:58:43 2009
@@ -25,7 +25,7 @@
*/
public class FileSortByNestedExpressionTest extends ContextTestSupport {
- private String fileUrl = "newfile://target/filesorter/";
+ private String fileUrl = "file://target/filesorter/";
@Override
protected void setUp() throws Exception {
@@ -39,16 +39,16 @@
}
private void prepareFolder(String folder) {
- template.sendBodyAndHeader("newfile:target/filesorter/" + folder, "Hello Paris",
+ template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello Paris",
FileComponent.HEADER_FILE_NAME, "paris.txt");
- template.sendBodyAndHeader("newfile:target/filesorter/" + folder, "Hello London",
+ template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello London",
FileComponent.HEADER_FILE_NAME, "london.txt");
- template.sendBodyAndHeader("newfile:target/filesorter/" + folder, "Hello Copenhagen",
+ template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello Copenhagen",
FileComponent.HEADER_FILE_NAME, "copenhagen.xml");
- template.sendBodyAndHeader("newfile:target/filesorter/" + folder, "Hello Dublin",
+ template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello Dublin",
FileComponent.HEADER_FILE_NAME, "dublin.txt");
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSorterRefTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSorterRefTest.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSorterRefTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileSorterRefTest.java Mon Feb 16 06:58:43 2009
@@ -28,7 +28,7 @@
*/
public class FileSorterRefTest extends ContextTestSupport {
- private String fileUrl = "newfile://target/filesorter/?sorter=#mySorter&initialDelay=1000";
+ private String fileUrl = "file://target/filesorter/?sorter=#mySorter&initialDelay=1000";
@Override
protected JndiRegistry createRegistry() throws Exception {
@@ -42,14 +42,14 @@
deleteDirectory("target/filesorter");
super.setUp();
- template.sendBodyAndHeader("newfile:target/filesorter/", "Hello Paris",
- NewFileComponent.HEADER_FILE_NAME, "paris.txt");
+ template.sendBodyAndHeader("file:target/filesorter/", "Hello Paris",
+ FileComponent.HEADER_FILE_NAME, "paris.txt");
- template.sendBodyAndHeader("newfile:target/filesorter/", "Hello London",
- NewFileComponent.HEADER_FILE_NAME, "london.txt");
+ template.sendBodyAndHeader("file:target/filesorter/", "Hello London",
+ FileComponent.HEADER_FILE_NAME, "london.txt");
- template.sendBodyAndHeader("newfile:target/filesorter/", "Hello Copenhagen",
- NewFileComponent.HEADER_FILE_NAME, "copenhagen.txt");
+ template.sendBodyAndHeader("file:target/filesorter/", "Hello Copenhagen",
+ FileComponent.HEADER_FILE_NAME, "copenhagen.txt");
}
public void testSortFiles() throws Exception {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FilerProducerFileNamesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FilerProducerFileNamesTest.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FilerProducerFileNamesTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FilerProducerFileNamesTest.java Mon Feb 16 06:58:43 2009
@@ -34,7 +34,7 @@
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("This is a good report");
- NewFileEndpoint fileEndpoint = resolveMandatoryEndpoint("newfile:target/reports/report.txt", NewFileEndpoint.class);
+ FileEndpoint fileEndpoint = resolveMandatoryEndpoint("file:target/reports/report.txt", FileEndpoint.class);
String id = fileEndpoint.getGeneratedFileName(exchange.getIn());
template.send("direct:report", exchange);
@@ -58,11 +58,11 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("direct:report").to("newfile:target/reports/report.txt");
+ from("direct:report").to("file:target/reports/report.txt");
- from("direct:report2").to("newfile:target/report2.txt?autoCreate=false&directory=false");
+ from("direct:report2").to("file:target/report2.txt?autoCreate=false&directory=false");
- from("direct:report3").setHeader(FileComponent.HEADER_FILE_NAME, constant("report-super.txt")).to("newfile:target/");
+ from("direct:report3").setHeader(FileComponent.HEADER_FILE_NAME, constant("report-super.txt")).to("file:target/");
}
};
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/NewFileConsumeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/NewFileConsumeTest.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/NewFileConsumeTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/NewFileConsumeTest.java Mon Feb 16 06:58:43 2009
@@ -42,7 +42,7 @@
public void testNewFileConsumer() throws Exception {
deleteDirectory("target/consumefile");
- NewFileComponent comp = new NewFileComponent();
+ FileComponent comp = new FileComponent();
comp.setCamelContext(context);
// create a file to consume
@@ -54,7 +54,7 @@
fos.close();
}
- Endpoint endpoint = comp.createEndpoint("newfile://target/consumefile", "target/consumefile", new HashMap());
+ Endpoint endpoint = comp.createEndpoint("file://target/consumefile", "target/consumefile", new HashMap());
Consumer consumer = endpoint.createConsumer(new Processor() {
public void process(Exchange exchange) throws Exception {
assertNotNull(exchange);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/NewFileProduceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/NewFileProduceTest.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/NewFileProduceTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/NewFileProduceTest.java Mon Feb 16 06:58:43 2009
@@ -37,10 +37,10 @@
public void testNewFileProducer() throws Exception {
deleteDirectory("target/producefile");
- NewFileComponent comp = new NewFileComponent();
+ FileComponent comp = new FileComponent();
comp.setCamelContext(context);
- Endpoint endpoint = comp.createEndpoint("newfile://target/producefile", "target/producefile", new HashMap());
+ Endpoint endpoint = comp.createEndpoint("file://target/producefile", "target/producefile", new HashMap());
template.send(endpoint, new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "bye.txt");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/language/FileLanguageTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/language/FileLanguageTest.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/language/FileLanguageTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/language/FileLanguageTest.java Mon Feb 16 06:58:43 2009
@@ -26,10 +26,10 @@
import org.apache.camel.ExchangePattern;
import org.apache.camel.LanguageTestSupport;
import org.apache.camel.component.file.FileComponent;
+import org.apache.camel.component.file.FileConsumer;
+import org.apache.camel.component.file.FileEndpoint;
import org.apache.camel.component.file.GenericFile;
import org.apache.camel.component.file.GenericFileExchange;
-import org.apache.camel.component.file.NewFileConsumer;
-import org.apache.camel.component.file.NewFileEndpoint;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.language.simple.FileLanguage;
@@ -108,14 +108,14 @@
public Exchange createExchange() {
// create the file
- String uri = "newfile://target/filelanguage";
+ String uri = "file://target/filelanguage";
template.sendBodyAndHeader(uri, "Hello World", FileComponent.HEADER_FILE_NAME, "hello.txt");
// get the file handle
file = new File("target/filelanguage/hello.txt");
- GenericFile<File> gf = NewFileConsumer.asGenericFile(file);
+ GenericFile<File> gf = FileConsumer.asGenericFile(file);
- NewFileEndpoint endpoint = getMandatoryEndpoint(uri, NewFileEndpoint.class);
+ FileEndpoint endpoint = getMandatoryEndpoint(uri, FileEndpoint.class);
GenericFileExchange<File> answer = new GenericFileExchange<File>(endpoint, ExchangePattern.InOut);
answer.setGenericFile(gf);
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpDefaultRootRenameStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpDefaultRootRenameStrategyTest.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpDefaultRootRenameStrategyTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpDefaultRootRenameStrategyTest.java Mon Feb 16 06:58:43 2009
@@ -22,7 +22,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
+import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
@@ -73,7 +73,7 @@
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody(IOConverter.toFile("src/test/data/ftpbinarytest/logo.jpeg"));
- exchange.getIn().setHeader(NewFileComponent.HEADER_FILE_NAME, "logo.jpeg");
+ exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "logo.jpeg");
Producer producer = endpoint.createProducer();
producer.start();
producer.process(exchange);
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDeleteFileTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDeleteFileTest.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDeleteFileTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDeleteFileTest.java Mon Feb 16 06:58:43 2009
@@ -22,7 +22,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
+import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -46,7 +46,7 @@
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World this file will be deleted");
- exchange.getIn().setHeader(NewFileComponent.HEADER_FILE_NAME, "hello.txt");
+ exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
Producer producer = endpoint.createProducer();
producer.start();
producer.process(exchange);
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDirectoryToBinaryFilesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDirectoryToBinaryFilesTest.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDirectoryToBinaryFilesTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDirectoryToBinaryFilesTest.java Mon Feb 16 06:58:43 2009
@@ -22,7 +22,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
+import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
@@ -68,7 +68,7 @@
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody(IOConverter.toFile("src/test/data/ftpbinarytest/logo.jpeg"));
- exchange.getIn().setHeader(NewFileComponent.HEADER_FILE_NAME, "logo.jpeg");
+ exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "logo.jpeg");
Producer producer = endpoint.createProducer();
producer.start();
producer.process(exchange);
@@ -77,7 +77,7 @@
endpoint = context.getEndpoint(getFtpUrl());
exchange = endpoint.createExchange();
exchange.getIn().setBody(IOConverter.toFile("src/test/data/ftpbinarytest/logo1.jpeg"));
- exchange.getIn().setHeader(NewFileComponent.HEADER_FILE_NAME, "logo1.jpeg");
+ exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "logo1.jpeg");
producer = endpoint.createProducer();
producer.start();
producer.process(exchange);
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=744825&r1=744824&r2=744825&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 Mon Feb 16 06:58:43 2009
@@ -22,7 +22,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
+import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -48,7 +48,7 @@
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World this file will be moved");
- exchange.getIn().setHeader(NewFileComponent.HEADER_FILE_NAME, "hello.txt");
+ exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
Producer producer = endpoint.createProducer();
producer.start();
producer.process(exchange);
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=744825&r1=744824&r2=744825&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 Mon Feb 16 06:58:43 2009
@@ -22,7 +22,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
+import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -48,7 +48,7 @@
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World this file will be moved");
- exchange.getIn().setHeader(NewFileComponent.HEADER_FILE_NAME, "hello.txt");
+ exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
Producer producer = endpoint.createProducer();
producer.start();
producer.process(exchange);
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=744825&r1=744824&r2=744825&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 Mon Feb 16 06:58:43 2009
@@ -22,7 +22,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
+import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -48,7 +48,7 @@
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World this file will be moved");
- exchange.getIn().setHeader(NewFileComponent.HEADER_FILE_NAME, "hello.txt");
+ exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
Producer producer = endpoint.createProducer();
producer.start();
producer.process(exchange);
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoopTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoopTest.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoopTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoopTest.java Mon Feb 16 06:58:43 2009
@@ -22,7 +22,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
+import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -46,7 +46,7 @@
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World");
- exchange.getIn().setHeader(NewFileComponent.HEADER_FILE_NAME, "hello.txt");
+ exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
Producer producer = endpoint.createProducer();
producer.start();
producer.process(exchange);
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPassiveModeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPassiveModeTest.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPassiveModeTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPassiveModeTest.java Mon Feb 16 06:58:43 2009
@@ -20,7 +20,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
+import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -44,7 +44,7 @@
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World");
- exchange.getIn().setHeader(NewFileComponent.HEADER_FILE_NAME, "hello.txt");
+ exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
Producer producer = endpoint.createProducer();
producer.start();
producer.process(exchange);
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPollFileOnlyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPollFileOnlyTest.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPollFileOnlyTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpPollFileOnlyTest.java Mon Feb 16 06:58:43 2009
@@ -20,7 +20,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
+import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -51,7 +51,7 @@
Endpoint endpoint = context.getEndpoint("ftp://admin@localhost:" + getPort() + "/fileonly/?password=admin&binary=false");
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World from FTPServer");
- exchange.getIn().setHeader(NewFileComponent.HEADER_FILE_NAME, "report.txt");
+ exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "report.txt");
Producer producer = endpoint.createProducer();
producer.start();
producer.process(exchange);
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=744825&r1=744824&r2=744825&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 Mon Feb 16 06:58:43 2009
@@ -23,7 +23,7 @@
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
+import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -49,7 +49,7 @@
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World this file will be moved");
- exchange.getIn().setHeader(NewFileComponent.HEADER_FILE_NAME, "hello.txt");
+ exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
Producer producer = endpoint.createProducer();
producer.start();
producer.process(exchange);
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=744825&r1=744824&r2=744825&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 Mon Feb 16 06:58:43 2009
@@ -22,7 +22,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
+import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -48,7 +48,7 @@
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World this file will be moved");
- exchange.getIn().setHeader(NewFileComponent.HEADER_FILE_NAME, "hello.txt");
+ exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
Producer producer = endpoint.createProducer();
producer.start();
producer.process(exchange);
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=744825&r1=744824&r2=744825&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 Mon Feb 16 06:58:43 2009
@@ -22,7 +22,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
+import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -48,7 +48,7 @@
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World this file will be moved");
- exchange.getIn().setHeader(NewFileComponent.HEADER_FILE_NAME, "hello.txt");
+ exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
Producer producer = endpoint.createProducer();
producer.start();
producer.process(exchange);
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=744825&r1=744824&r2=744825&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 Mon Feb 16 06:58:43 2009
@@ -17,7 +17,7 @@
package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
+import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -46,10 +46,10 @@
// prepares the FTP Server by creating files on the server that we want to unit
// test that we can pool and store as a local file
String ftpUrl = "ftp://admin@localhost:" + getPort() + "/regexp/?password=admin";
- template.sendBodyAndHeader(ftpUrl, "Hello World", NewFileComponent.HEADER_FILE_NAME, "hello.txt");
- template.sendBodyAndHeader(ftpUrl, "Reports", NewFileComponent.HEADER_FILE_NAME, "report1.txt");
- template.sendBodyAndHeader(ftpUrl, "Bye World", NewFileComponent.HEADER_FILE_NAME, "bye.txt");
- template.sendBodyAndHeader(ftpUrl, "Reports", NewFileComponent.HEADER_FILE_NAME, "report2.txt");
+ template.sendBodyAndHeader(ftpUrl, "Hello World", FileComponent.HEADER_FILE_NAME, "hello.txt");
+ template.sendBodyAndHeader(ftpUrl, "Reports", FileComponent.HEADER_FILE_NAME, "report1.txt");
+ template.sendBodyAndHeader(ftpUrl, "Bye World", FileComponent.HEADER_FILE_NAME, "bye.txt");
+ template.sendBodyAndHeader(ftpUrl, "Reports", FileComponent.HEADER_FILE_NAME, "report2.txt");
}
protected RouteBuilder createRouteBuilder() throws Exception {
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSortByNestedExpressionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSortByNestedExpressionTest.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSortByNestedExpressionTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSortByNestedExpressionTest.java Mon Feb 16 06:58:43 2009
@@ -17,7 +17,7 @@
package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
+import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSetNamesWithMultiDirectoriesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSetNamesWithMultiDirectoriesTest.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSetNamesWithMultiDirectoriesTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpSetNamesWithMultiDirectoriesTest.java Mon Feb 16 06:58:43 2009
@@ -22,7 +22,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
+import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
@@ -70,7 +70,7 @@
Endpoint endpoint = context.getEndpoint(ftpUrl);
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody(IOConverter.toFile("src/test/data/ftpbinarytest/logo1.jpeg"));
- exchange.getIn().setHeader(NewFileComponent.HEADER_FILE_NAME, "logo1.jpeg");
+ exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "logo1.jpeg");
Producer producer = endpoint.createProducer();
producer.start();
producer.process(exchange);
@@ -80,7 +80,7 @@
endpoint = context.getEndpoint(ftpUrl);
exchange = endpoint.createExchange();
exchange.getIn().setBody(IOConverter.toFile("src/test/data/ftpbinarytest/logo2.png"));
- exchange.getIn().setHeader(NewFileComponent.HEADER_FILE_NAME, "logo2.png");
+ exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "logo2.png");
producer = endpoint.createProducer();
producer.start();
producer.process(exchange);
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToAsciiFileNoBodyConversionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToAsciiFileNoBodyConversionTest.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToAsciiFileNoBodyConversionTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToAsciiFileNoBodyConversionTest.java Mon Feb 16 06:58:43 2009
@@ -20,7 +20,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
+import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -51,7 +51,7 @@
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello ASCII from FTPServer");
- exchange.getIn().setHeader(NewFileComponent.HEADER_FILE_NAME, "ascii.txt");
+ exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "ascii.txt");
Producer producer = endpoint.createProducer();
producer.start();
producer.process(exchange);
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToAsciiFileTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToAsciiFileTest.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToAsciiFileTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToAsciiFileTest.java Mon Feb 16 06:58:43 2009
@@ -22,7 +22,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
+import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -58,7 +58,7 @@
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World from FTPServer");
- exchange.getIn().setHeader(NewFileComponent.HEADER_FILE_NAME, "hello.txt");
+ exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
Producer producer = endpoint.createProducer();
producer.start();
producer.process(exchange);
@@ -69,7 +69,7 @@
return new RouteBuilder() {
public void configure() throws Exception {
String fileUrl = "file:target/ftptest/?append=false&noop=true";
- from(getFtpUrl()).setHeader(NewFileComponent.HEADER_FILE_NAME, constant("deleteme.txt")).
+ from(getFtpUrl()).setHeader(FileComponent.HEADER_FILE_NAME, constant("deleteme.txt")).
convertBodyTo(String.class).to(fileUrl).to("mock:result");
}
};
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFileTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFileTest.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFileTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFileTest.java Mon Feb 16 06:58:43 2009
@@ -22,7 +22,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
+import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
@@ -64,7 +64,7 @@
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody(IOConverter.toFile("src/test/data/ftpbinarytest/logo.jpeg"));
- exchange.getIn().setHeader(NewFileComponent.HEADER_FILE_NAME, "logo.jpeg");
+ exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "logo.jpeg");
Producer producer = endpoint.createProducer();
producer.start();
producer.process(exchange);
@@ -75,7 +75,7 @@
return new RouteBuilder() {
public void configure() throws Exception {
String fileUrl = "file:target/ftptest/?noop=true&append=false";
- from(getFtpUrl()).setHeader(NewFileComponent.HEADER_FILE_NAME, constant("deleteme.jpg"))
+ from(getFtpUrl()).setHeader(FileComponent.HEADER_FILE_NAME, constant("deleteme.jpg"))
.to(fileUrl, "mock:result");
}
};
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFilesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFilesTest.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFilesTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFilesTest.java Mon Feb 16 06:58:43 2009
@@ -22,7 +22,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
+import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
@@ -70,7 +70,7 @@
Endpoint endpoint = context.getEndpoint(ftpUrl);
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody(IOConverter.toFile("src/test/data/ftpbinarytest/logo.jpeg"));
- exchange.getIn().setHeader(NewFileComponent.HEADER_FILE_NAME, "logo.jpeg");
+ exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "logo.jpeg");
Producer producer = endpoint.createProducer();
producer.start();
producer.process(exchange);
@@ -81,7 +81,7 @@
endpoint = context.getEndpoint(ftpUrl);
exchange = endpoint.createExchange();
exchange.getIn().setBody(IOConverter.toFile("src/test/data/ftpbinarytest/logo1.jpeg"));
- exchange.getIn().setHeader(NewFileComponent.HEADER_FILE_NAME, "logo1.jpeg");
+ exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "logo1.jpeg");
producer = endpoint.createProducer();
producer.start();
producer.process(exchange);
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToFileNoFileNameHeaderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToFileNoFileNameHeaderTest.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToFileNoFileNameHeaderTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToFileNoFileNameHeaderTest.java Mon Feb 16 06:58:43 2009
@@ -22,7 +22,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
+import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -59,7 +59,7 @@
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World from FTPServer");
- exchange.getIn().setHeader(NewFileComponent.HEADER_FILE_NAME, "hello.txt");
+ exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
Producer producer = endpoint.createProducer();
producer.start();
producer.process(exchange);
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=744825&r1=744824&r2=744825&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 Mon Feb 16 06:58:43 2009
@@ -22,7 +22,7 @@
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
+import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -57,7 +57,7 @@
Endpoint endpoint = context.getEndpoint(getStoreUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Bye World");
- exchange.getIn().setHeader(NewFileComponent.HEADER_FILE_NAME, "hello.txt");
+ exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
Producer producer = endpoint.createProducer();
producer.start();
producer.process(exchange);
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerBodyAsStringTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerBodyAsStringTest.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerBodyAsStringTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerBodyAsStringTest.java Mon Feb 16 06:58:43 2009
@@ -21,7 +21,7 @@
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
+import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -45,7 +45,7 @@
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World");
- exchange.getIn().setHeader(NewFileComponent.HEADER_FILE_NAME, "hello.txt");
+ exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
Producer producer = endpoint.createProducer();
producer.start();
producer.process(exchange);
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerLocalWorkDirectoryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerLocalWorkDirectoryTest.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerLocalWorkDirectoryTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerLocalWorkDirectoryTest.java Mon Feb 16 06:58:43 2009
@@ -23,7 +23,7 @@
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.NewFileComponent;
+import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
import org.apache.camel.util.FileUtil;
@@ -51,7 +51,7 @@
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World");
- exchange.getIn().setHeader(NewFileComponent.HEADER_FILE_NAME, "hello.txt");
+ exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
Producer producer = endpoint.createProducer();
producer.start();
producer.process(exchange);
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpLoginTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpLoginTest.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpLoginTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpLoginTest.java Mon Feb 16 06:58:43 2009
@@ -21,7 +21,7 @@
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
-import org.apache.camel.component.file.NewFileComponent;
+import org.apache.camel.component.file.FileComponent;
/**
* Unit test for login failure due bad password and login with accepted password
@@ -63,7 +63,7 @@
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World from FTPServer");
- exchange.getIn().setHeader(NewFileComponent.HEADER_FILE_NAME, "report.txt");
+ exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "report.txt");
Producer producer = endpoint.createProducer();
producer.start();
producer.process(exchange);
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerTempPrefixTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerTempPrefixTest.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerTempPrefixTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerTempPrefixTest.java Mon Feb 16 06:58:43 2009
@@ -18,7 +18,7 @@
import java.io.File;
-import org.apache.camel.component.file.NewFileComponent;
+import org.apache.camel.component.file.FileComponent;
import org.apache.camel.converter.IOConverter;
/**
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java Mon Feb 16 06:58:43 2009
@@ -21,7 +21,7 @@
import java.util.Random;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.component.file.NewFileComponent;
+import org.apache.camel.component.file.FileComponent;
import org.apache.camel.converter.IOConverter;
import org.apache.ftpserver.FtpServer;
import org.apache.ftpserver.FtpServerFactory;
@@ -114,6 +114,6 @@
}
public void sendFile(String url, Object body, String fileName) {
- template.sendBodyAndHeader(url, body, NewFileComponent.HEADER_FILE_NAME, fileName);
+ template.sendBodyAndHeader(url, body, FileComponent.HEADER_FILE_NAME, fileName);
}
}
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileRouteTest.java?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileRouteTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileRouteTest.java Mon Feb 16 06:58:43 2009
@@ -23,7 +23,7 @@
import org.apache.camel.ProducerTemplate;
import org.apache.camel.TestSupport;
import org.apache.camel.component.file.FileComponent;
-import org.apache.camel.component.file.NewFileEndpoint;
+import org.apache.camel.component.file.FileEndpoint;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.hamcrest.Assertions;
import org.springframework.beans.factory.annotation.Autowired;
@@ -45,7 +45,7 @@
public void testMocksAreValid() throws Exception {
// lets check that our injected endpoint is valid
- NewFileEndpoint fileEndpoint = Assertions.assertInstanceOf(inputFile, NewFileEndpoint.class);
+ FileEndpoint fileEndpoint = Assertions.assertInstanceOf(inputFile, FileEndpoint.class);
assertEquals("File", new File("target/test-default-inbox"), fileEndpoint.getFile());
result.expectedBodiesReceived(expectedBody);
Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest-context.xml?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest-context.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest-context.xml Mon Feb 16 06:58:43 2009
@@ -27,7 +27,7 @@
<template id="camelTemplate"/>
<!-- use myFilter as filter to allow setting ANT paths for which files to scan for -->
- <endpoint id="myFileEndpoint" uri="newfile://target/antpathmatcher?recursive=true&filter=#myAntFilter"/>
+ <endpoint id="myFileEndpoint" uri="file://target/antpathmatcher?recursive=true&filter=#myAntFilter"/>
<route>
<from ref="myFileEndpoint"/>
Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/file/SpringFileRouteTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/file/SpringFileRouteTest-context.xml?rev=744825&r1=744824&r2=744825&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/file/SpringFileRouteTest-context.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/file/SpringFileRouteTest-context.xml Mon Feb 16 06:58:43 2009
@@ -32,7 +32,7 @@
</route>
</camelContext>
- <bean id="inputFile" class="org.apache.camel.component.file.NewFileEndpoint">
+ <bean id="inputFile" class="org.apache.camel.component.file.FileEndpoint">
<property name="file" value="target/test-default-inbox"/>
</bean>
<!-- END SNIPPET: example -->