Modified: camel/trunk/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityContentCacheTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityContentCacheTest.java?rev=747062&r1=747061&r2=747062&view=diff ============================================================================== --- camel/trunk/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityContentCacheTest.java (original) +++ camel/trunk/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityContentCacheTest.java Mon Feb 23 16:14:17 2009 @@ -17,8 +17,8 @@ package org.apache.camel.component.velocity; 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/velocity?append=false", "Hello $headers.name", FileComponent.HEADER_FILE_NAME, "hello.vm"); + template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/velocity?append=false", "Hello $headers.name", Exchange.FILE_NAME, "hello.vm"); } 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/velocity?append=false", "Bye $headers.name", FileComponent.HEADER_FILE_NAME, "hello.vm"); + template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/velocity?append=false", "Bye $headers.name", Exchange.FILE_NAME, "hello.vm"); 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/velocity?append=false", "Bye $headers.name", FileComponent.HEADER_FILE_NAME, "hello.vm"); + template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/velocity?append=false", "Bye $headers.name", Exchange.FILE_NAME, "hello.vm"); mock.reset(); // we must expected the original filecontent as the cache is enabled, so its Hello and not Bye @@ -76,7 +76,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/velocity?append=false", "Bye $headers.name", FileComponent.HEADER_FILE_NAME, "hello.vm"); + template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/velocity?append=false", "Bye $headers.name", Exchange.FILE_NAME, "hello.vm"); mock.reset(); // we must expected the original filecontent as the cache is enabled, so its Hello and not Bye
Modified: camel/trunk/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/EtlRoutes.java URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/EtlRoutes.java?rev=747062&r1=747061&r2=747062&view=diff ============================================================================== --- camel/trunk/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/EtlRoutes.java (original) +++ camel/trunk/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/EtlRoutes.java Mon Feb 23 16:14:17 2009 @@ -16,9 +16,8 @@ */ package org.apache.camel.example.etl; -import org.apache.camel.component.file.FileComponent; +import org.apache.camel.Exchange; import org.apache.camel.spring.SpringRouteBuilder; - import static org.apache.camel.language.juel.JuelExpression.el; /** @@ -28,12 +27,11 @@ public class EtlRoutes extends SpringRouteBuilder { public void configure() throws Exception { from("file:src/data?noop=true").convertBodyTo(PersonDocument.class) - // .intercept(transactionInterceptor()) .to("jpa:org.apache.camel.example.etl.CustomerEntity"); // the following will dump the database to files from("jpa:org.apache.camel.example.etl.CustomerEntity?consumeDelete=false&consumer.delay=3000&consumeLockEntity=false") - .setHeader(FileComponent.HEADER_FILE_NAME, el("${in.body.userName}.xml")) + .setHeader(Exchange.FILE_NAME, el("${in.body.userName}.xml")) .to("file:target/customers?append=false"); } } Modified: camel/trunk/examples/camel-example-reportincident/src/main/java/org/apache/camel/example/reportincident/ReportIncidentRoutes.java URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-reportincident/src/main/java/org/apache/camel/example/reportincident/ReportIncidentRoutes.java?rev=747062&r1=747061&r2=747062&view=diff ============================================================================== --- camel/trunk/examples/camel-example-reportincident/src/main/java/org/apache/camel/example/reportincident/ReportIncidentRoutes.java (original) +++ camel/trunk/examples/camel-example-reportincident/src/main/java/org/apache/camel/example/reportincident/ReportIncidentRoutes.java Mon Feb 23 16:14:17 2009 @@ -17,8 +17,8 @@ package org.apache.camel.example.reportincident; import org.apache.camel.CamelContext; +import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.file.FileComponent; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.language.bean.BeanLanguage; @@ -55,7 +55,7 @@ // we need to convert the CXF payload to InputReportIncident that FilenameGenerator and velocity expects .convertBodyTo(InputReportIncident.class) // then set the file name using the FilenameGenerator bean - .setHeader(FileComponent.HEADER_FILE_NAME, BeanLanguage.bean(FilenameGenerator.class, "generateFilename")) + .setHeader(Exchange.FILE_NAME, BeanLanguage.bean(FilenameGenerator.class, "generateFilename")) // and create the mail body using velocity templating .to("velocity:MailBody.vm") // and store the file Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFileAntPathMatcherRemoteFileFilterTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFileAntPathMatcherRemoteFileFilterTest.java?rev=747062&r1=747061&r2=747062&view=diff ============================================================================== --- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFileAntPathMatcherRemoteFileFilterTest.java (original) +++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFileAntPathMatcherRemoteFileFilterTest.java Mon Feb 23 16:14:17 2009 @@ -20,8 +20,8 @@ import org.apache.camel.Endpoint; import org.apache.camel.EndpointInject; +import org.apache.camel.Exchange; import org.apache.camel.ProducerTemplate; -import org.apache.camel.component.file.FileComponent; import org.apache.camel.component.mock.MockEndpoint; import org.apache.ftpserver.FtpServer; import org.apache.ftpserver.FtpServerFactory; @@ -52,11 +52,11 @@ public void testAntPatchMatherFilter() throws Exception { result.expectedBodiesReceived(expectedBody); - template.sendBodyAndHeader(inputFTP, "Hello World", FileComponent.HEADER_FILE_NAME, "hello.txt"); - template.sendBodyAndHeader(inputFTP, "Bye World", FileComponent.HEADER_FILE_NAME, "bye.xml"); - template.sendBodyAndHeader(inputFTP, "Bad world", FileComponent.HEADER_FILE_NAME, "subfolder/badday.txt"); - template.sendBodyAndHeader(inputFTP, "Day world", FileComponent.HEADER_FILE_NAME, "day.xml"); - template.sendBodyAndHeader(inputFTP, expectedBody, FileComponent.HEADER_FILE_NAME, "subfolder/foo/godday.txt"); + template.sendBodyAndHeader(inputFTP, "Hello World", Exchange.FILE_NAME, "hello.txt"); + template.sendBodyAndHeader(inputFTP, "Bye World", Exchange.FILE_NAME, "bye.xml"); + template.sendBodyAndHeader(inputFTP, "Bad world", Exchange.FILE_NAME, "subfolder/badday.txt"); + template.sendBodyAndHeader(inputFTP, "Day world", Exchange.FILE_NAME, "day.xml"); + template.sendBodyAndHeader(inputFTP, expectedBody, Exchange.FILE_NAME, "subfolder/foo/godday.txt"); result.assertIsSatisfied(); } Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFtpEndpointTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFtpEndpointTest.java?rev=747062&r1=747061&r2=747062&view=diff ============================================================================== --- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFtpEndpointTest.java (original) +++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFtpEndpointTest.java Mon Feb 23 16:14:17 2009 @@ -20,8 +20,8 @@ import org.apache.camel.Endpoint; import org.apache.camel.EndpointInject; +import org.apache.camel.Exchange; import org.apache.camel.ProducerTemplate; -import org.apache.camel.component.file.FileComponent; import org.apache.camel.component.mock.MockEndpoint; import org.apache.ftpserver.FtpServer; import org.apache.ftpserver.FtpServerFactory; @@ -53,7 +53,7 @@ public void testFtpEndpointAsSpringBean() throws Exception { result.expectedBodiesReceived("Hello World"); - template.sendBodyAndHeader(inputFTP, "Hello World", FileComponent.HEADER_FILE_NAME, "hello.txt"); + template.sendBodyAndHeader(inputFTP, "Hello World", Exchange.FILE_NAME, "hello.txt"); result.assertIsSatisfied(); } Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/FileToJmsTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/FileToJmsTest.java?rev=747062&r1=747061&r2=747062&view=diff ============================================================================== --- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/FileToJmsTest.java (original) +++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/FileToJmsTest.java Mon Feb 23 16:14:17 2009 @@ -18,8 +18,8 @@ package org.apache.camel.itest.jms; import org.apache.camel.EndpointInject; +import org.apache.camel.Exchange; import org.apache.camel.ProducerTemplate; -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; @@ -39,7 +39,7 @@ public void testFileToJms() throws Exception { result.expectedBodiesReceived("Hello World"); - template.sendBodyAndHeader("file://target/jmsfile?append=false", "Hello World", FileComponent.HEADER_FILE_NAME, "hello.txt"); + template.sendBodyAndHeader("file://target/jmsfile?append=false", "Hello World", Exchange.FILE_NAME, "hello.txt"); result.assertIsSatisfied(); }
