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/13 15:30:28 UTC
svn commit: r744124 - in /camel/trunk:
components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/
tests/camel-itest/
tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/
tests/camel-itest/src/test/java/org/apache/ca...
Author: davsclaus
Date: Fri Feb 13 14:30:17 2009
New Revision: 744124
URL: http://svn.apache.org/viewvc?rev=744124&view=rev
Log:
Fixed failing unit test, and added unit test for rare problem with file to jms on windows with TX manager. Upgraded to latest FTP server.
Added:
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/FileToJmsTest.java (with props)
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/FileToJmsTest-context.xml
- copied, changed from r744031, camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/mail/SpringMailEndpointTest-context.xml
Modified:
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpEndpoint.java
camel/trunk/tests/camel-itest/pom.xml
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesWsAddressingTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFileAntPathMatcherRemoteFileFilterTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFtpEndpointTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/GreeterImpl.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/SetExchangePatternProcessor.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/SetResponseProcessor.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsIntegrationTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/ftp/SpringFtpEndpointTest-context.xml
Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java?rev=744124&r1=744123&r2=744124&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java (original)
+++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java Fri Feb 13 14:30:17 2009
@@ -25,11 +25,13 @@
public class FtpEndpoint extends RemoteFileEndpoint<FTPFile> {
public FtpEndpoint() {
- this.operations = new FtpOperations();
+ FtpOperations operations = new FtpOperations();
+ operations.setEndpoint(this);
+ this.operations = operations;
}
public FtpEndpoint(String uri, FtpComponent component, FtpOperations operations,
- RemoteFileConfiguration configuration) {
+ RemoteFileConfiguration configuration) {
super(uri, component, operations, configuration);
}
Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpEndpoint.java?rev=744124&r1=744123&r2=744124&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpEndpoint.java (original)
+++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpEndpoint.java Fri Feb 13 14:30:17 2009
@@ -26,16 +26,19 @@
public class SftpEndpoint extends RemoteFileEndpoint<ChannelSftp.LsEntry> {
public SftpEndpoint() {
- this.operations = new SftpOperations();
+ SftpOperations operations = new SftpOperations();
+ operations.setEndpoint(this);
+ this.operations = operations;
}
public SftpEndpoint(String uri, SftpComponent component, RemoteFileOperations<ChannelSftp.LsEntry> operations,
- RemoteFileConfiguration configuration) {
+ RemoteFileConfiguration configuration) {
super(uri, component, operations, configuration);
}
@Override
- protected RemoteFileConsumer<ChannelSftp.LsEntry> buildConsumer(Processor processor, RemoteFileOperations<ChannelSftp.LsEntry> operations) {
+ protected RemoteFileConsumer<ChannelSftp.LsEntry> buildConsumer(Processor processor,
+ RemoteFileOperations<ChannelSftp.LsEntry> operations) {
return new SftpConsumer(this, processor, operations);
}
Modified: camel/trunk/tests/camel-itest/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/pom.xml?rev=744124&r1=744123&r2=744124&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/pom.xml (original)
+++ camel/trunk/tests/camel-itest/pom.xml Fri Feb 13 14:30:17 2009
@@ -45,6 +45,13 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cxf</artifactId>
+ <!-- conflicts with mockmail for unit testing, so we exclude this geronimo spec -->
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -75,23 +82,25 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.ftpserver</groupId>
- <artifactId>ftpserver-core</artifactId>
- <version>1.0.0-M3</version>
- <scope>test</scope>
+ <groupId>org.apache.ftpserver</groupId>
+ <artifactId>ftpserver-core</artifactId>
+ <version>1.0.0-RC2</version>
+ <scope>test</scope>
</dependency>
+
<dependency>
- <groupId>org.apache.ftpserver</groupId>
- <artifactId>ftplet-api</artifactId>
- <version>1.0.0-M3</version>
- <scope>test</scope>
+ <groupId>org.apache.ftpserver</groupId>
+ <artifactId>ftplet-api</artifactId>
+ <version>1.0.0-RC2</version>
+ <scope>test</scope>
</dependency>
- <!-- ftpserver using mina 2.0.0-M2 -->
+
+ <!-- ftpserver using mina 2.0.0-M4 -->
<dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <version>2.0.0-M2</version>
- <scope>test</scope>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ <version>2.0.0-M4</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesTest.java?rev=744124&r1=744123&r2=744124&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesTest.java Fri Feb 13 14:30:17 2009
@@ -16,16 +16,13 @@
*/
package org.apache.camel.itest.customerrelations;
-import java.lang.reflect.Proxy;
import java.util.List;
import java.util.Map;
import junit.framework.TestCase;
-
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.jaxws.EndpointImpl;
-import org.apache.cxf.jaxws.JaxWsClientProxy;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesWsAddressingTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesWsAddressingTest.java?rev=744124&r1=744123&r2=744124&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesWsAddressingTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesWsAddressingTest.java Fri Feb 13 14:30:17 2009
@@ -16,19 +16,7 @@
*/
package org.apache.camel.itest.customerrelations;
-import java.lang.reflect.Proxy;
-import java.util.List;
-import java.util.Map;
-
import junit.framework.TestCase;
-
-import org.apache.cxf.helpers.CastUtils;
-import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.jaxws.EndpointImpl;
-import org.apache.cxf.jaxws.JaxWsClientProxy;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.phase.AbstractPhaseInterceptor;
-import org.apache.cxf.phase.Phase;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class CustomerServicesWsAddressingTest extends TestCase {
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=744124&r1=744123&r2=744124&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 Fri Feb 13 14:30:17 2009
@@ -24,8 +24,12 @@
import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.ftpserver.FtpServer;
+import org.apache.ftpserver.FtpServerFactory;
+import org.apache.ftpserver.filesystem.nativefs.NativeFileSystemFactory;
+import org.apache.ftpserver.ftplet.UserManager;
+import org.apache.ftpserver.listener.ListenerFactory;
import org.apache.ftpserver.usermanager.ClearTextPasswordEncryptor;
-import org.apache.ftpserver.usermanager.PropertiesUserManager;
+import org.apache.ftpserver.usermanager.impl.PropertiesUserManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
@@ -70,17 +74,22 @@
}
protected void initFtpServer() throws Exception {
- ftpServer = new FtpServer();
+ FtpServerFactory serverFactory = new FtpServerFactory();
// setup user management to read our users.properties and use clear text passwords
- PropertiesUserManager uman = new PropertiesUserManager();
- uman.setFile(new File("./src/test/resources/users.properties").getAbsoluteFile());
- uman.setPasswordEncryptor(new ClearTextPasswordEncryptor());
- uman.setAdminName("admin");
- uman.configure();
- ftpServer.setUserManager(uman);
+ File file = new File("./src/test/resources/users.properties").getAbsoluteFile();
+ UserManager uman = new PropertiesUserManager(new ClearTextPasswordEncryptor(), file, "admin");
+ serverFactory.setUserManager(uman);
+
+ NativeFileSystemFactory fsf = new NativeFileSystemFactory();
+ fsf.setCreateHome(true);
+ serverFactory.setFileSystem(fsf);
+
+ ListenerFactory factory = new ListenerFactory();
+ factory.setPort(20123);
+ serverFactory.addListener("default", factory.createListener());
- ftpServer.getListener("default").setPort(20123);
+ ftpServer = serverFactory.createServer();
}
}
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=744124&r1=744123&r2=744124&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 Fri Feb 13 14:30:17 2009
@@ -24,8 +24,12 @@
import org.apache.camel.component.file.FileComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.ftpserver.FtpServer;
+import org.apache.ftpserver.FtpServerFactory;
+import org.apache.ftpserver.filesystem.nativefs.NativeFileSystemFactory;
+import org.apache.ftpserver.ftplet.UserManager;
+import org.apache.ftpserver.listener.ListenerFactory;
import org.apache.ftpserver.usermanager.ClearTextPasswordEncryptor;
-import org.apache.ftpserver.usermanager.PropertiesUserManager;
+import org.apache.ftpserver.usermanager.impl.PropertiesUserManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
@@ -67,17 +71,22 @@
}
protected void initFtpServer() throws Exception {
- ftpServer = new FtpServer();
+ FtpServerFactory serverFactory = new FtpServerFactory();
// setup user management to read our users.properties and use clear text passwords
- PropertiesUserManager uman = new PropertiesUserManager();
- uman.setFile(new File("./src/test/resources/users.properties").getAbsoluteFile());
- uman.setPasswordEncryptor(new ClearTextPasswordEncryptor());
- uman.setAdminName("admin");
- uman.configure();
- ftpServer.setUserManager(uman);
+ File file = new File("./src/test/resources/users.properties").getAbsoluteFile();
+ UserManager uman = new PropertiesUserManager(new ClearTextPasswordEncryptor(), file, "admin");
+ serverFactory.setUserManager(uman);
+
+ NativeFileSystemFactory fsf = new NativeFileSystemFactory();
+ fsf.setCreateHome(true);
+ serverFactory.setFileSystem(fsf);
+
+ ListenerFactory factory = new ListenerFactory();
+ factory.setPort(20125);
+ serverFactory.addListener("default", factory.createListener());
- ftpServer.getListener("default").setPort(20125);
+ ftpServer = serverFactory.createServer();
}
}
\ No newline at end of file
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java?rev=744124&r1=744123&r2=744124&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java Fri Feb 13 14:30:17 2009
@@ -17,7 +17,6 @@
package org.apache.camel.itest.greeter;
import java.util.List;
-
import javax.xml.ws.Endpoint;
import org.apache.camel.CamelContext;
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/GreeterImpl.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/GreeterImpl.java?rev=744124&r1=744123&r2=744124&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/GreeterImpl.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/GreeterImpl.java Fri Feb 13 14:30:17 2009
@@ -17,6 +17,7 @@
package org.apache.camel.itest.greeter;
import java.util.logging.Logger;
+
import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.PingMeFault;
import org.apache.hello_world_soap_http.types.FaultDetail;
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorTest.java?rev=744124&r1=744123&r2=744124&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorTest.java Fri Feb 13 14:30:17 2009
@@ -16,14 +16,9 @@
*/
package org.apache.camel.itest.jetty;
-import java.io.IOException;
import java.io.InputStream;
-import java.util.Map;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Exchange;
-import org.apache.camel.Message;
-import org.apache.camel.Processor;
import org.apache.camel.ValidationException;
import org.apache.camel.builder.RouteBuilder;
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/SetExchangePatternProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/SetExchangePatternProcessor.java?rev=744124&r1=744123&r2=744124&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/SetExchangePatternProcessor.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/SetExchangePatternProcessor.java Fri Feb 13 14:30:17 2009
@@ -19,7 +19,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
-import org.apache.camel.converter.stream.StreamCache;
public class SetExchangePatternProcessor implements Processor {
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/SetResponseProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/SetResponseProcessor.java?rev=744124&r1=744123&r2=744124&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/SetResponseProcessor.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/SetResponseProcessor.java Fri Feb 13 14:30:17 2009
@@ -17,9 +17,7 @@
package org.apache.camel.itest.jetty;
import org.apache.camel.Exchange;
-import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
-import org.apache.camel.converter.stream.StreamCache;
public class SetResponseProcessor implements Processor {
Added: 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=744124&view=auto
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/FileToJmsTest.java (added)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/FileToJmsTest.java Fri Feb 13 14:30:17 2009
@@ -0,0 +1,30 @@
+package org.apache.camel.itest.jms;
+
+import org.apache.camel.EndpointInject;
+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;
+import org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
+
+/**
+ *
+ */
+@ContextConfiguration
+public class FileToJmsTest extends AbstractJUnit38SpringContextTests {
+
+ @Autowired
+ protected ProducerTemplate template;
+ @EndpointInject(uri = "mock:result")
+ protected MockEndpoint result;
+
+ public void testFileToJms() throws Exception {
+ result.expectedBodiesReceived("Hello World");
+
+ template.sendBodyAndHeader("file://target/jmsfile?append=false", "Hello World", FileComponent.HEADER_FILE_NAME, "hello.txt");
+
+ result.assertIsSatisfied();
+ }
+
+}
Propchange: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/FileToJmsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/FileToJmsTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsIntegrationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsIntegrationTest.java?rev=744124&r1=744123&r2=744124&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsIntegrationTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsIntegrationTest.java Fri Feb 13 14:30:17 2009
@@ -18,7 +18,6 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-
import javax.jms.ConnectionFactory;
import javax.naming.Context;
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java?rev=744124&r1=744123&r2=744124&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java Fri Feb 13 14:30:17 2009
@@ -18,10 +18,8 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-
import javax.naming.Context;
-import org.apache.activemq.broker.Broker;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.util.jndi.JndiContext;
Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/ftp/SpringFtpEndpointTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/ftp/SpringFtpEndpointTest-context.xml?rev=744124&r1=744123&r2=744124&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/ftp/SpringFtpEndpointTest-context.xml (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/ftp/SpringFtpEndpointTest-context.xml Fri Feb 13 14:30:17 2009
@@ -26,9 +26,11 @@
<bean id="myFTPEndpoint" class="org.apache.camel.component.file.remote.FtpEndpoint">
<property name="camelContext" ref="camel"/>
<property name="configuration" ref="ftpConfig"/>
+ <property name="directory" value="true"/>
<property name="consumerProperties">
<map key-type="java.lang.String">
<entry key="initialDelay" value="1000"/>
+ <entry key="delay" value="5000"/>
</map>
</property>
</bean>
Copied: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/FileToJmsTest-context.xml (from r744031, camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/mail/SpringMailEndpointTest-context.xml)
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/FileToJmsTest-context.xml?p2=camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/FileToJmsTest-context.xml&p1=camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/mail/SpringMailEndpointTest-context.xml&r1=744031&r2=744124&rev=744124&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/mail/SpringMailEndpointTest-context.xml (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/FileToJmsTest-context.xml Fri Feb 13 14:30:17 2009
@@ -17,36 +17,50 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:broker="http://activemq.apache.org/schema/core"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- ">
+ http://activemq.apache.org/schema/core http://activemq.org/config/1.0/1.0.xsd">
- <bean id="myMailEndpoint" class="org.apache.camel.component.mail.MailEndpoint">
- <property name="camelContext" ref="camel"/>
- <property name="configuration" ref="mailConfig"/>
- <property name="consumerProperties">
- <map key-type="java.lang.String">
- <entry key="delay" value="1000"/>
- </map>
- </property>
+ <!-- activemq broker -->
+ <broker:broker useJmx="false" persistent="false" brokerName="localhost">
+ <broker:transportConnectors>
+ <broker:transportConnector name="tcp" uri="tcp://localhost:61616"/>
+ </broker:transportConnectors>
+ </broker:broker>
+
+ <!-- camel stuff below to send and listen to broker with a spring JMS transaction manager -->
+ <bean id="jmsFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
+ <property name="brokerURL" value="tcp://localhost:61616"/>
+ </bean>
+
+ <bean id="jmsTransactionManager" class="org.springframework.jms.connection.JmsTransactionManager">
+ <property name="connectionFactory" ref="jmsFactory"/>
+ </bean>
+
+ <bean id="jmsConfig" class="org.apache.camel.component.jms.JmsConfiguration">
+ <property name="connectionFactory" ref="jmsFactory"/>
+ <property name="transactionManager" ref="jmsTransactionManager"/>
+ <property name="transacted" value="true"/>
+ <property name="concurrentConsumers" value="1"/>
</bean>
- <bean id="mailConfig" class="org.apache.camel.component.mail.MailConfiguration">
- <property name="host" value="localhost"/>
- <property name="port" value="110"/>
- <property name="username" value="james2"/>
- <property name="password" value="james2"/>
- <property name="protocol" value="pop3"/>
- <property name="processOnlyUnseenMessages" value="false"/>
+ <bean id="activemq" class="org.apache.activemq.camel.component.ActiveMQComponent">
+ <property name="connectionFactory" ref="jmsFactory"/>
</bean>
- <!-- START SNIPPET: example -->
+
<camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
<template id="camelTemplate"/>
<route>
- <from ref="myMailEndpoint"/>
+ <from uri="file://target/jmsfile?initialDelay=1000&delay=5000"/>
+ <to uri="activemq:queue:foo"/>
+ </route>
+
+ <route>
+ <from uri="activemq:queue:foo"/>
<to uri="mock:result"/>
</route>
</camelContext>