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/23 17:15:38 UTC
svn commit: r747062 [4/5] - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/
camel-core/src/main/java/org/apache/camel/builder/
camel-core/src/main/java/org/apache/camel/builder/xml/
camel-core/src/main/java/org/apache/camel/component/bean/ ...
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=747062&r1=747061&r2=747062&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 Mon Feb 23 16:14:17 2009
@@ -23,6 +23,7 @@
import java.util.GregorianCalendar;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.impl.JndiRegistry;
/**
@@ -45,7 +46,7 @@
public void testProduceBeanByHeader() throws Exception {
template.sendBodyAndHeader("file://target/filelanguage", "Hello World",
- FileComponent.HEADER_FILE_NAME, "${bean:myguidgenerator}.bak");
+ Exchange.FILE_NAME, "${bean:myguidgenerator}.bak");
assertFileExists("target/filelanguage/123.bak");
}
@@ -58,7 +59,7 @@
public void testProducerDateByHeader() throws Exception {
template.sendBodyAndHeader("file://target/filelanguage", "Hello World",
- FileComponent.HEADER_FILE_NAME, "myfile-${date:now:yyyyMMdd}.txt");
+ Exchange.FILE_NAME, "myfile-${date:now:yyyyMMdd}.txt");
String date = new SimpleDateFormat("yyyyMMdd").format(new Date());
assertFileExists("target/filelanguage/myfile-" + date + ".txt");
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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -17,6 +17,7 @@
package org.apache.camel.component.file;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -40,13 +41,13 @@
private void prepareFolder(String folder) {
template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello Paris",
- FileComponent.HEADER_FILE_NAME, "paris.dat");
+ Exchange.FILE_NAME, "paris.dat");
template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello London",
- FileComponent.HEADER_FILE_NAME, "london.txt");
+ Exchange.FILE_NAME, "london.txt");
template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello Copenhagen",
- FileComponent.HEADER_FILE_NAME, "copenhagen.xml");
+ Exchange.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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -17,6 +17,7 @@
package org.apache.camel.component.file;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -40,13 +41,13 @@
private void prepareFolder(String folder) {
template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello Paris",
- FileComponent.HEADER_FILE_NAME, "report-3.dat");
+ Exchange.FILE_NAME, "report-3.dat");
template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello London",
- FileComponent.HEADER_FILE_NAME, "REPORT-2.txt");
+ Exchange.FILE_NAME, "REPORT-2.txt");
template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello Copenhagen",
- FileComponent.HEADER_FILE_NAME, "Report-1.xml");
+ Exchange.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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -17,6 +17,7 @@
package org.apache.camel.component.file;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -40,16 +41,16 @@
private void prepareFolder(String folder) {
template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello Paris",
- FileComponent.HEADER_FILE_NAME, "paris.txt");
+ Exchange.FILE_NAME, "paris.txt");
template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello London",
- FileComponent.HEADER_FILE_NAME, "london.txt");
+ Exchange.FILE_NAME, "london.txt");
template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello Copenhagen",
- FileComponent.HEADER_FILE_NAME, "copenhagen.xml");
+ Exchange.FILE_NAME, "copenhagen.xml");
template.sendBodyAndHeader("file:target/filesorter/" + folder, "Hello Dublin",
- FileComponent.HEADER_FILE_NAME, "dublin.txt");
+ Exchange.FILE_NAME, "dublin.txt");
}
public void testSortNestedFiles() throws Exception {
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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -19,6 +19,7 @@
import java.util.Comparator;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
@@ -43,13 +44,13 @@
super.setUp();
template.sendBodyAndHeader("file:target/filesorter/", "Hello Paris",
- FileComponent.HEADER_FILE_NAME, "paris.txt");
+ Exchange.FILE_NAME, "paris.txt");
template.sendBodyAndHeader("file:target/filesorter/", "Hello London",
- FileComponent.HEADER_FILE_NAME, "london.txt");
+ Exchange.FILE_NAME, "london.txt");
template.sendBodyAndHeader("file:target/filesorter/", "Hello Copenhagen",
- FileComponent.HEADER_FILE_NAME, "copenhagen.txt");
+ Exchange.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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -62,7 +62,7 @@
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("file:target/");
+ from("direct:report3").setHeader(Exchange.FILE_NAME, constant("report-super.txt")).to("file:target/");
}
};
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/MoveFilesToDirectoryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/MoveFilesToDirectoryTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/MoveFilesToDirectoryTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/MoveFilesToDirectoryTest.java Mon Feb 23 16:14:17 2009
@@ -19,6 +19,7 @@
import java.io.File;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -34,7 +35,7 @@
protected boolean noop;
public void testFileRoute() throws Exception {
- template.sendBodyAndHeader("file:" + inputDirectory, expectedBody, FileComponent.HEADER_FILE_NAME, fileName);
+ template.sendBodyAndHeader("file:" + inputDirectory, expectedBody, Exchange.FILE_NAME, fileName);
MockEndpoint result = getMockEndpoint("mock:result");
result.expectedBodiesReceived(expectedBody);
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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -43,7 +43,7 @@
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");
+ exchange.getIn().setHeader(Exchange.FILE_NAME, "bye.txt");
exchange.getIn().setBody("Bye World");
}
});
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/ToFileRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/ToFileRouteTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/ToFileRouteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/ToFileRouteTest.java Mon Feb 23 16:14:17 2009
@@ -67,7 +67,7 @@
// set the output filename using java code logic, notice that this is done by setting
// a special header property of the out exchange
- exchange.getOut().setHeader(FileComponent.HEADER_FILE_NAME, "report.txt");
+ exchange.getOut().setHeader(Exchange.FILE_NAME, "report.txt");
}
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/timer/TimerFiredTimeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/timer/TimerFiredTimeTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/timer/TimerFiredTimeTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/timer/TimerFiredTimeTest.java Mon Feb 23 16:14:17 2009
@@ -33,8 +33,8 @@
assertMockEndpointsSatisfied();
Exchange exchange = mock.getExchanges().get(0);
- assertEquals("hello", exchange.getProperty("org.apache.camel.timer.name"));
- assertNotNull(exchange.getProperty("org.apache.camel.timer.firedTime"));
+ assertEquals("hello", exchange.getProperty(Exchange.TIMER_NAME));
+ assertNotNull(exchange.getProperty(Exchange.TIMER_FIRED_TIME));
assertNotNull(exchange.getIn().getHeader("firedTime"));
}
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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -109,7 +109,7 @@
public Exchange createExchange() {
// create the file
String uri = "file://target/filelanguage";
- template.sendBodyAndHeader(uri, "Hello World", FileComponent.HEADER_FILE_NAME, "hello.txt");
+ template.sendBodyAndHeader(uri, "Hello World", Exchange.FILE_NAME, "hello.txt");
// get the file handle
file = new File("target/filelanguage/hello.txt");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanRouteTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanRouteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanRouteTest.java Mon Feb 23 16:14:17 2009
@@ -17,7 +17,6 @@
package org.apache.camel.processor;
import java.util.concurrent.atomic.AtomicInteger;
-
import javax.naming.Context;
import org.apache.camel.ContextTestSupport;
@@ -25,7 +24,6 @@
import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.bean.BeanProcessor;
import org.apache.camel.util.jndi.JndiContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -40,7 +38,7 @@
public void testSendingMessageWithMethodNameHeader() throws Exception {
String expectedBody = "Wobble";
- template.sendBodyAndHeader("direct:in", expectedBody, BeanProcessor.METHOD_NAME, "read");
+ template.sendBodyAndHeader("direct:in", expectedBody, Exchange.BEAN_METHOD_NAME, "read");
assertEquals("bean received correct value for: " + myBean, expectedBody, myBean.body);
}
@@ -52,7 +50,7 @@
public void process(Exchange exchange) {
Message in = exchange.getIn();
in.setBody(expectedBody);
- in.setHeader(BeanProcessor.METHOD_NAME, "read");
+ in.setHeader(Exchange.BEAN_METHOD_NAME, "read");
}
});
assertEquals("bean received correct value", expectedBody, myBean.body);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoopTestProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoopTestProcessor.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoopTestProcessor.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoopTestProcessor.java Mon Feb 23 16:14:17 2009
@@ -41,8 +41,8 @@
}
public void process(Exchange exchange) {
- Integer c = exchange.getProperty(LoopProcessor.PROP_ITER_COUNT, Integer.class);
- Integer i = exchange.getProperty(LoopProcessor.PROP_ITER_INDEX, Integer.class);
+ Integer c = exchange.getProperty(Exchange.LOOP_SIZE, Integer.class);
+ Integer i = exchange.getProperty(Exchange.LOOP_INDEX, Integer.class);
if (c == null || c.intValue() != this.count) {
exchange.setException(new CamelException(
"Invalid count value. Expected " + this.count + " but was " + c));
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java Mon Feb 23 16:14:17 2009
@@ -53,8 +53,8 @@
for (int i = 0; i < 4; i++) {
Exchange exchange = list.get(i);
Message in = exchange.getIn();
- assertMessageHeader(in, Splitter.SPLIT_COUNTER, i);
- assertMessageHeader(in, Splitter.SPLIT_SIZE, 4);
+ assertMessageHeader(in, Exchange.SPLIT_INDEX, i);
+ assertMessageHeader(in, Exchange.SPLIT_SIZE, 4);
}
}
@@ -74,7 +74,7 @@
Message out = result.getOut();
assertEquals("Roman", out.getBody());
assertMessageHeader(out, "foo", "bar");
- assertMessageHeader(out, Splitter.SPLIT_COUNTER, 4);
+ assertMessageHeader(out, Exchange.SPLIT_INDEX, 4);
}
public void testEmptyBody() {
@@ -113,10 +113,10 @@
for (int i = 0; i < 4; i++) {
Exchange exchange = list.get(i);
Message in = exchange.getIn();
- Integer splitCounter = in.getHeader(Splitter.SPLIT_COUNTER, Integer.class);
+ Integer splitCounter = in.getHeader(Exchange.SPLIT_INDEX, Integer.class);
numbersFound.add(splitCounter);
assertEquals(names[splitCounter], in.getBody());
- assertMessageHeader(in, Splitter.SPLIT_SIZE, 4);
+ assertMessageHeader(in, Exchange.SPLIT_SIZE, 4);
}
assertEquals(4, numbersFound.size());
@@ -176,9 +176,9 @@
assertMockEndpointsSatisfied();
for (Exchange exchange : resultEndpoint.getReceivedExchanges()) {
- assertNotNull(exchange.getIn().getHeader(Splitter.SPLIT_COUNTER));
+ assertNotNull(exchange.getIn().getHeader(Exchange.SPLIT_INDEX));
//this header cannot be set when streaming is used
- assertNull(exchange.getIn().getHeader(Splitter.SPLIT_SIZE));
+ assertNull(exchange.getIn().getHeader(Exchange.SPLIT_SIZE));
}
}
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java Mon Feb 23 16:14:17 2009
@@ -44,8 +44,6 @@
// we need to filter the header of this name.
getOutFilter().add(Message.PROTOCOL_HEADERS);
getInFilter().add(Message.PROTOCOL_HEADERS);
-
-
}
}
Modified: camel/trunk/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerContentCacheTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerContentCacheTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerContentCacheTest.java (original)
+++ camel/trunk/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerContentCacheTest.java Mon Feb 23 16:14:17 2009
@@ -17,8 +17,8 @@
package org.apache.camel.component.freemarker;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -30,7 +30,7 @@
super.setUp();
// create a vm file in the classpath as this is the tricky reloading stuff
- template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/freemarker?append=false", "Hello ${headers.name}", FileComponent.HEADER_FILE_NAME, "hello.ftl");
+ template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/freemarker?append=false", "Hello ${headers.name}", Exchange.FILE_NAME, "hello.ftl");
}
public void testNotCached() throws Exception {
@@ -41,7 +41,7 @@
mock.assertIsSatisfied();
// now change content in the file in the classpath and try again
- template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/freemarker?append=false", "Bye ${headers.name}", FileComponent.HEADER_FILE_NAME, "hello.ftl");
+ template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/freemarker?append=false", "Bye ${headers.name}", Exchange.FILE_NAME, "hello.ftl");
mock.reset();
mock.expectedBodiesReceived("Bye Paris");
@@ -58,7 +58,7 @@
mock.assertIsSatisfied();
// now change content in the file in the classpath and try again
- template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/freemarker?append=false", "Bye ${headers.name}", FileComponent.HEADER_FILE_NAME, "hello.ftl");
+ template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/freemarker?append=false", "Bye ${headers.name}", Exchange.FILE_NAME, "hello.ftl");
mock.reset();
// we must expected the original filecontent as the cache is enabled, so its Hello and not Bye
Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java (original)
+++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java Mon Feb 23 16:14:17 2009
@@ -26,7 +26,7 @@
import java.util.Arrays;
import java.util.List;
-import org.apache.camel.component.file.FileComponent;
+import org.apache.camel.Exchange;
import org.apache.camel.component.file.GenericFile;
import org.apache.camel.component.file.GenericFileEndpoint;
import org.apache.camel.component.file.GenericFileExchange;
@@ -231,7 +231,7 @@
os = new FileOutputStream(temp);
// set header with the path to the local work file
- exchange.getIn().setHeader(FileComponent.HEADER_FILE_LOCAL_WORK_PATH, local.getPath());
+ exchange.getIn().setHeader(Exchange.FILE_LOCAL_WORK_PATH, local.getPath());
} catch (Exception e) {
throw new RemoteFileOperationFailedException("Cannot create new local work file: " + local);
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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -22,7 +22,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
@@ -73,7 +72,7 @@
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody(IOConverter.toFile("src/test/data/ftpbinarytest/logo.jpeg"));
- exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "logo.jpeg");
+ exchange.getIn().setHeader(Exchange.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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -22,7 +22,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -46,7 +45,7 @@
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World this file will be deleted");
- exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
+ exchange.getIn().setHeader(Exchange.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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -22,7 +22,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
@@ -68,7 +67,7 @@
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody(IOConverter.toFile("src/test/data/ftpbinarytest/logo.jpeg"));
- exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "logo.jpeg");
+ exchange.getIn().setHeader(Exchange.FILE_NAME, "logo.jpeg");
Producer producer = endpoint.createProducer();
producer.start();
producer.process(exchange);
@@ -77,7 +76,7 @@
endpoint = context.getEndpoint(getFtpUrl());
exchange = endpoint.createExchange();
exchange.getIn().setBody(IOConverter.toFile("src/test/data/ftpbinarytest/logo1.jpeg"));
- exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "logo1.jpeg");
+ exchange.getIn().setHeader(Exchange.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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -22,7 +22,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -48,7 +47,7 @@
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World this file will be moved");
- exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
+ exchange.getIn().setHeader(Exchange.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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -22,7 +22,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -48,7 +47,7 @@
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World this file will be moved");
- exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
+ exchange.getIn().setHeader(Exchange.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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -22,7 +22,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -48,7 +47,7 @@
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World this file will be moved");
- exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
+ exchange.getIn().setHeader(Exchange.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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -22,7 +22,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -46,7 +45,7 @@
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World");
- exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
+ exchange.getIn().setHeader(Exchange.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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -20,7 +20,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -44,7 +43,7 @@
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World");
- exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
+ exchange.getIn().setHeader(Exchange.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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -20,7 +20,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -51,7 +50,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(FileComponent.HEADER_FILE_NAME, "report.txt");
+ exchange.getIn().setHeader(Exchange.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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -23,7 +23,6 @@
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -49,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(FileComponent.HEADER_FILE_NAME, "hello.txt");
+ exchange.getIn().setHeader(Exchange.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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -22,7 +22,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -48,7 +47,7 @@
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World this file will be moved");
- exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
+ exchange.getIn().setHeader(Exchange.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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -22,7 +22,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -48,7 +47,7 @@
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World this file will be moved");
- exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
+ exchange.getIn().setHeader(Exchange.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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.file.remote;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-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", 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");
+ template.sendBodyAndHeader(ftpUrl, "Hello World", Exchange.FILE_NAME, "hello.txt");
+ template.sendBodyAndHeader(ftpUrl, "Reports", Exchange.FILE_NAME, "report1.txt");
+ template.sendBodyAndHeader(ftpUrl, "Bye World", Exchange.FILE_NAME, "bye.txt");
+ template.sendBodyAndHeader(ftpUrl, "Reports", Exchange.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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -17,7 +17,6 @@
package org.apache.camel.component.file.remote;
import org.apache.camel.builder.RouteBuilder;
-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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -22,7 +22,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
@@ -70,7 +69,7 @@
Endpoint endpoint = context.getEndpoint(ftpUrl);
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody(IOConverter.toFile("src/test/data/ftpbinarytest/logo1.jpeg"));
- exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "logo1.jpeg");
+ exchange.getIn().setHeader(Exchange.FILE_NAME, "logo1.jpeg");
Producer producer = endpoint.createProducer();
producer.start();
producer.process(exchange);
@@ -80,7 +79,7 @@
endpoint = context.getEndpoint(ftpUrl);
exchange = endpoint.createExchange();
exchange.getIn().setBody(IOConverter.toFile("src/test/data/ftpbinarytest/logo2.png"));
- exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "logo2.png");
+ exchange.getIn().setHeader(Exchange.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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -20,7 +20,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -51,7 +50,7 @@
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello ASCII from FTPServer");
- exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "ascii.txt");
+ exchange.getIn().setHeader(Exchange.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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -22,7 +22,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -58,7 +57,7 @@
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World from FTPServer");
- exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
+ exchange.getIn().setHeader(Exchange.FILE_NAME, "hello.txt");
Producer producer = endpoint.createProducer();
producer.start();
producer.process(exchange);
@@ -69,7 +68,7 @@
return new RouteBuilder() {
public void configure() throws Exception {
String fileUrl = "file:target/ftptest/?append=false&noop=true";
- from(getFtpUrl()).setHeader(FileComponent.HEADER_FILE_NAME, constant("deleteme.txt")).
+ from(getFtpUrl()).setHeader(Exchange.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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -22,7 +22,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
@@ -64,7 +63,7 @@
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody(IOConverter.toFile("src/test/data/ftpbinarytest/logo.jpeg"));
- exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "logo.jpeg");
+ exchange.getIn().setHeader(Exchange.FILE_NAME, "logo.jpeg");
Producer producer = endpoint.createProducer();
producer.start();
producer.process(exchange);
@@ -75,7 +74,7 @@
return new RouteBuilder() {
public void configure() throws Exception {
String fileUrl = "file:target/ftptest/?noop=true&append=false";
- from(getFtpUrl()).setHeader(FileComponent.HEADER_FILE_NAME, constant("deleteme.jpg"))
+ from(getFtpUrl()).setHeader(Exchange.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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -22,7 +22,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
@@ -70,7 +69,7 @@
Endpoint endpoint = context.getEndpoint(ftpUrl);
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody(IOConverter.toFile("src/test/data/ftpbinarytest/logo.jpeg"));
- exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "logo.jpeg");
+ exchange.getIn().setHeader(Exchange.FILE_NAME, "logo.jpeg");
Producer producer = endpoint.createProducer();
producer.start();
producer.process(exchange);
@@ -81,7 +80,7 @@
endpoint = context.getEndpoint(ftpUrl);
exchange = endpoint.createExchange();
exchange.getIn().setBody(IOConverter.toFile("src/test/data/ftpbinarytest/logo1.jpeg"));
- exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "logo1.jpeg");
+ exchange.getIn().setHeader(Exchange.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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -22,7 +22,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -59,7 +58,7 @@
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World from FTPServer");
- exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
+ exchange.getIn().setHeader(Exchange.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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -22,7 +22,6 @@
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -57,7 +56,7 @@
Endpoint endpoint = context.getEndpoint(getStoreUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Bye World");
- exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
+ exchange.getIn().setHeader(Exchange.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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -21,7 +21,6 @@
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -45,7 +44,7 @@
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World");
- exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
+ exchange.getIn().setHeader(Exchange.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/FtpConsumerDeleteNoWritePermissionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDeleteNoWritePermissionTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDeleteNoWritePermissionTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerDeleteNoWritePermissionTest.java Mon Feb 23 16:14:17 2009
@@ -18,7 +18,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.PollingConsumer;
-import org.apache.camel.component.file.FileComponent;
/**
* User does not have write permissions so can't deleted consumed file.
@@ -55,7 +54,7 @@
// 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() + "/deletenoperm/?password=admin";
- template.sendBodyAndHeader(ftpUrl, "Hello World", FileComponent.HEADER_FILE_NAME, "hello.txt");
+ template.sendBodyAndHeader(ftpUrl, "Hello World", Exchange.FILE_NAME, "hello.txt");
}
}
\ No newline at end of file
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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -23,7 +23,6 @@
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-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 +50,7 @@
Endpoint endpoint = context.getEndpoint(getFtpUrl());
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World");
- exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "hello.txt");
+ exchange.getIn().setHeader(Exchange.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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -21,7 +21,6 @@
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
-import org.apache.camel.component.file.FileComponent;
/**
* Unit test for login failure due bad password and login with accepted password
@@ -63,7 +62,7 @@
Exchange exchange = endpoint.createExchange();
exchange.getIn().setBody("Hello World from FTPServer");
- exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "report.txt");
+ exchange.getIn().setHeader(Exchange.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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -18,7 +18,6 @@
import java.io.File;
-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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -21,7 +21,7 @@
import java.util.Random;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.component.file.FileComponent;
+import org.apache.camel.Exchange;
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, FileComponent.HEADER_FILE_NAME, fileName);
+ template.sendBodyAndHeader(url, body, Exchange.FILE_NAME, fileName);
}
}
Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpHeaderFilterStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpHeaderFilterStrategy.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpHeaderFilterStrategy.java (original)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpHeaderFilterStrategy.java Mon Feb 23 16:14:17 2009
@@ -34,9 +34,9 @@
getOutFilter().add(HttpMethods.HTTP_METHOD.toLowerCase());
getOutFilter().add(HttpProducer.QUERY);
getOutFilter().add(HttpProducer.HTTP_RESPONSE_CODE.toLowerCase());
- setLowercase(true);
+ setLowerCase(true);
- // filter headers begin with "org.apache.camel"
- setOutFilterPattern("(org\\.apache\\.camel)[\\.|a-z|A-z|0-9]*");
+ // filter headers begin with "Camel" or "org.apache.camel"
+ setOutFilterPattern("([Camel|org\\.apache\\.camel])[\\.|a-z|A-z|0-9]*");
}
}
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpToFileTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpToFileTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpToFileTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpToFileTest.java Mon Feb 23 16:14:17 2009
@@ -19,8 +19,8 @@
import java.io.File;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
@@ -65,7 +65,7 @@
// store the content from the queue as a file
from("seda:in")
- .setHeader(FileComponent.HEADER_FILE_NAME, constant("hello.txt"))
+ .setHeader(Exchange.FILE_NAME, constant("hello.txt"))
.convertBodyTo(String.class)
.to("file://target/myworld/")
.to("mock:result");
Modified: camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcHeaderFilterStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcHeaderFilterStrategy.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcHeaderFilterStrategy.java (original)
+++ camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcHeaderFilterStrategy.java Mon Feb 23 16:14:17 2009
@@ -34,9 +34,9 @@
getOutFilter().add("content-length");
getOutFilter().add("content-type");
getOutFilter().add(JhcProducer.HTTP_RESPONSE_CODE);
- setLowercase(true);
+ setLowerCase(true);
- // filter headers begin with "org.apache.camel"
- setOutFilterPattern("(org\\.apache\\.camel)[\\.|a-z|A-z|0-9]*");
+ // filter headers begin with "Camel" or "org.apache.camel"
+ setOutFilterPattern("([Camel|org\\.apache\\.camel])[\\.|a-z|A-z|0-9]*");
}
}
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsTest.java Mon Feb 23 16:14:17 2009
@@ -21,11 +21,10 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.FileComponent;
-import org.apache.camel.component.mock.MockEndpoint;
-
import static org.apache.camel.component.jms.JmsComponent.jmsComponentClientAcknowledge;
+import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -42,7 +41,7 @@
mock.message(0).bodyAs(String.class).isEqualTo("Hello World");
deleteDirectory("target/routefromfile");
- template.sendBodyAndHeader("file://target/routefromfile", "Hello World", FileComponent.HEADER_FILE_NAME, "hello.txt");
+ template.sendBodyAndHeader("file://target/routefromfile", "Hello World", Exchange.FILE_NAME, "hello.txt");
assertMockEndpointsSatisfied();
}
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsToFileTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsToFileTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsToFileTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsToFileTest.java Mon Feb 23 16:14:17 2009
@@ -22,11 +22,10 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.FileComponent;
-import org.apache.camel.component.mock.MockEndpoint;
-
import static org.apache.camel.component.jms.JmsComponent.jmsComponentClientAcknowledge;
+import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -41,7 +40,7 @@
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
- template.sendBodyAndHeader("file://target/file2file/in", "Hello World", FileComponent.HEADER_FILE_NAME, "hello.txt");
+ template.sendBodyAndHeader("file://target/file2file/in", "Hello World", Exchange.FILE_NAME, "hello.txt");
assertMockEndpointsSatisfied();
Thread.sleep(100);
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsBeanMethodHeaderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsBeanMethodHeaderTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsBeanMethodHeaderTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsBeanMethodHeaderTest.java Mon Feb 23 16:14:17 2009
@@ -23,14 +23,13 @@
import org.apache.camel.Body;
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.bean.BeanProcessor;
+import static org.apache.camel.component.jms.JmsComponent.jmsComponentClientAcknowledge;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
-import static org.apache.camel.component.jms.JmsComponent.jmsComponentClientAcknowledge;
-
/**
* Unit test for sending the bean method name as a key over the JMS wire, that we now support this.
*/
@@ -61,7 +60,7 @@
mock.expectedBodiesReceived("Yes");
template.sendBodyAndHeader("direct:approve", ExchangePattern.InOut, "James",
- BeanProcessor.METHOD_NAME, "approveLoan");
+ Exchange.BEAN_METHOD_NAME, "approveLoan");
mock.assertIsSatisfied();
}
@@ -71,7 +70,7 @@
mock.expectedBodiesReceived("Yes");
template.sendBodyAndHeader("activemq:approve", ExchangePattern.InOut, "James",
- BeanProcessor.METHOD_NAME, "approveLoan");
+ Exchange.BEAN_METHOD_NAME, "approveLoan");
mock.assertIsSatisfied();
}
@@ -82,7 +81,7 @@
mock.expectedBodiesReceived("No");
template.sendBodyAndHeader("activemq:queue", ExchangePattern.InOut, "James",
- BeanProcessor.METHOD_NAME, "approveSuperLoan");
+ Exchange.BEAN_METHOD_NAME, "approveSuperLoan");
mock.assertIsSatisfied();
}
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsFilenameHeaderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsFilenameHeaderTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsFilenameHeaderTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsFilenameHeaderTest.java Mon Feb 23 16:14:17 2009
@@ -17,17 +17,15 @@
package org.apache.camel.component.jms.issues;
import java.io.File;
-
import javax.jms.ConnectionFactory;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.FileComponent;
-import org.apache.camel.component.mock.MockEndpoint;
-
import static org.apache.camel.component.jms.JmsComponent.jmsComponentClientAcknowledge;
+import org.apache.camel.component.mock.MockEndpoint;
/**
* Unit test for sending the filename for file producer over the JMS wire.
@@ -39,8 +37,7 @@
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
- template.sendBodyAndHeader("direct:in", "Hello World",
- FileComponent.HEADER_FILE_NAME, filename);
+ template.sendBodyAndHeader("direct:in", "Hello World", Exchange.FILE_NAME, filename);
mock.assertIsSatisfied();
Modified: camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/FileConsumerJpaIdempotentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/FileConsumerJpaIdempotentTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/FileConsumerJpaIdempotentTest.java (original)
+++ camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/FileConsumerJpaIdempotentTest.java Mon Feb 23 16:14:17 2009
@@ -21,8 +21,8 @@
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.processor.idempotent.jpa.MessageProcessed;
import org.apache.camel.spring.SpringCamelContext;
@@ -57,7 +57,7 @@
super.setUp();
cleanupRepository();
deleteDirectory("target/idempotent");
- template.sendBodyAndHeader("file://target/idempotent/", "Hello World", FileComponent.HEADER_FILE_NAME, "report.txt");
+ template.sendBodyAndHeader("file://target/idempotent/", "Hello World", Exchange.FILE_NAME, "report.txt");
}
@Override
Modified: camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiFactoryFinder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiFactoryFinder.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiFactoryFinder.java (original)
+++ camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiFactoryFinder.java Mon Feb 23 16:14:17 2009
@@ -22,8 +22,8 @@
import java.net.URL;
import java.util.Properties;
+import org.apache.camel.NoFactoryAvailableException;
import org.apache.camel.util.FactoryFinder;
-import org.apache.camel.util.NoFactoryAvailableException;
import org.apache.camel.util.ObjectHelper;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
Modified: camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiFactoryFinderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiFactoryFinderTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiFactoryFinderTest.java (original)
+++ camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiFactoryFinderTest.java Mon Feb 23 16:14:17 2009
@@ -14,12 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.osgi;
import java.io.IOException;
-import org.apache.camel.util.NoFactoryAvailableException;
+import org.apache.camel.NoFactoryAvailableException;
public class OsgiFactoryFinderTest extends CamelOsgiTestSupport {
public void testFindClass() throws Exception {
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest.java Mon Feb 23 16:14:17 2009
@@ -18,9 +18,9 @@
import org.apache.camel.Endpoint;
import org.apache.camel.EndpointInject;
+import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.TestSupport;
-import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
@@ -42,11 +42,11 @@
public void testAntPatchMatherFilter() throws Exception {
result.expectedBodiesReceived(expectedBody);
- template.sendBodyAndHeader(inputFile, "Hello World", FileComponent.HEADER_FILE_NAME, "hello.txt");
- template.sendBodyAndHeader(inputFile, "Bye World", FileComponent.HEADER_FILE_NAME, "bye.xml");
- template.sendBodyAndHeader(inputFile, expectedBody, FileComponent.HEADER_FILE_NAME, "subfolder/foo/godday.txt");
- template.sendBodyAndHeader(inputFile, "Bad world", FileComponent.HEADER_FILE_NAME, "subfolder/badday.txt");
- template.sendBodyAndHeader(inputFile, "Day world", FileComponent.HEADER_FILE_NAME, "day.xml");
+ template.sendBodyAndHeader(inputFile, "Hello World", Exchange.FILE_NAME, "hello.txt");
+ template.sendBodyAndHeader(inputFile, "Bye World", Exchange.FILE_NAME, "bye.xml");
+ template.sendBodyAndHeader(inputFile, expectedBody, Exchange.FILE_NAME, "subfolder/foo/godday.txt");
+ template.sendBodyAndHeader(inputFile, "Bad world", Exchange.FILE_NAME, "subfolder/badday.txt");
+ template.sendBodyAndHeader(inputFile, "Day world", Exchange.FILE_NAME, "day.xml");
result.assertIsSatisfied();
}
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=747062&r1=747061&r2=747062&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 23 16:14:17 2009
@@ -20,9 +20,9 @@
import org.apache.camel.Endpoint;
import org.apache.camel.EndpointInject;
+import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.TestSupport;
-import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.file.FileEndpoint;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.hamcrest.Assertions;
@@ -51,7 +51,7 @@
result.expectedBodiesReceived(expectedBody);
result.setResultWaitTime(5000);
- template.sendBodyAndHeader(inputFile, expectedBody, FileComponent.HEADER_FILE_NAME, "hello.txt");
+ template.sendBodyAndHeader(inputFile, expectedBody, Exchange.FILE_NAME, "hello.txt");
result.assertIsSatisfied();
}
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/idempotent/FileConsumerIdempotentTest.java Mon Feb 23 16:14:17 2009
@@ -20,7 +20,7 @@
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.component.file.FileComponent;
+import org.apache.camel.Exchange;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.IdempotentRepository;
import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
@@ -46,7 +46,7 @@
assertFalse(repo.contains("report.txt"));
// send a file
- template.sendBodyAndHeader("file://target/fileidempotent/", "Hello World", FileComponent.HEADER_FILE_NAME, "report.txt");
+ template.sendBodyAndHeader("file://target/fileidempotent/", "Hello World", Exchange.FILE_NAME, "report.txt");
// consume the file the first time
MockEndpoint mock = getMockEndpoint("mock:result");
Modified: camel/trunk/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateContentCacheTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateContentCacheTest.java?rev=747062&r1=747061&r2=747062&view=diff
==============================================================================
--- camel/trunk/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateContentCacheTest.java (original)
+++ camel/trunk/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateContentCacheTest.java Mon Feb 23 16:14:17 2009
@@ -17,8 +17,8 @@
package org.apache.camel.component.stringtemplate;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
/**
@@ -30,7 +30,7 @@
super.setUp();
// create a tm file in the classpath as this is the tricky reloading stuff
- template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/stringtemplate?append=false", "Hello $headers.name$", FileComponent.HEADER_FILE_NAME, "hello.tm");
+ template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/stringtemplate?append=false", "Hello $headers.name$", Exchange.FILE_NAME, "hello.tm");
}
public void testNotCached() throws Exception {
@@ -41,7 +41,7 @@
mock.assertIsSatisfied();
// now change content in the file in the classpath and try again
- template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/stringtemplate?append=false", "Bye $headers.name$", FileComponent.HEADER_FILE_NAME, "hello.tm");
+ template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/stringtemplate?append=false", "Bye $headers.name$", Exchange.FILE_NAME, "hello.tm");
mock.reset();
mock.expectedBodiesReceived("Bye Paris");
@@ -58,7 +58,7 @@
mock.assertIsSatisfied();
// now change content in the file in the classpath and try again
- template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/stringtemplate?append=false", "Bye $headers.name$", FileComponent.HEADER_FILE_NAME, "hello.tm");
+ template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/stringtemplate?append=false", "Bye $headers.name$", Exchange.FILE_NAME, "hello.tm");
mock.reset();
// we must expected the original filecontent as the cache is enabled, so its Hello and not Bye