You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2010/05/11 05:22:11 UTC
svn commit: r942993 - in /camel/trunk/components/camel-jms/src:
main/java/org/apache/camel/component/jms/requestor/
test/java/org/apache/camel/component/jms/
test/java/org/apache/camel/component/jms/discovery/
test/java/org/apache/camel/component/jms/i...
Author: ningjiang
Date: Tue May 11 03:22:09 2010
New Revision: 942993
URL: http://svn.apache.org/viewvc?rev=942993&view=rev
Log:
Fixed some eclipse warning of camel-jms
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/requestor/DeferredRequestReplyMap.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/requestor/PersistentReplyToFutureHandler.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/requestor/Requestor.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsCustomHeaderFilterStrategyTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsHeaderFilteringTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageTypeTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRemoveHeaderTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteToFileTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithDefaultKeyFormatStrategyTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransferExceptionTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsUseOriginalBodyTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/TransactedJmsRouteTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/MyService.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHeaderAsObjectTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithDLCErrorHandlerTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionWithoutDefineTransactionManagerTest.java
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/requestor/DeferredRequestReplyMap.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/requestor/DeferredRequestReplyMap.java?rev=942993&r1=942992&r2=942993&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/requestor/DeferredRequestReplyMap.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/requestor/DeferredRequestReplyMap.java Tue May 11 03:22:09 2010
@@ -32,8 +32,8 @@ public class DeferredRequestReplyMap {
private static final transient Log LOG = LogFactory.getLog(DeferredRequestReplyMap.class);
private Requestor requestor;
private JmsProducer producer;
- private TimeoutMap deferredRequestMap;
- private TimeoutMap deferredReplyMap;
+ private TimeoutMap<String, Object> deferredRequestMap;
+ private TimeoutMap<String, Object> deferredReplyMap;
public static class DeferredMessageSentCallback implements MessageSentCallback {
private DeferredRequestReplyMap map;
@@ -67,8 +67,8 @@ public class DeferredRequestReplyMap {
public DeferredRequestReplyMap(Requestor requestor,
JmsProducer producer,
- TimeoutMap deferredRequestMap,
- TimeoutMap deferredReplyMap) {
+ TimeoutMap<String, Object> deferredRequestMap,
+ TimeoutMap<String, Object> deferredReplyMap) {
this.requestor = requestor;
this.producer = producer;
this.deferredRequestMap = deferredRequestMap;
@@ -93,8 +93,8 @@ public class DeferredRequestReplyMap {
}
public static void processDeferredRequests(Object monitor,
- TimeoutMap requestMap,
- TimeoutMap replyMap,
+ TimeoutMap<String, Object> requestMap,
+ TimeoutMap<String, Object> replyMap,
String correlationID,
long timeout,
Message inMessage) {
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/requestor/PersistentReplyToFutureHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/requestor/PersistentReplyToFutureHandler.java?rev=942993&r1=942992&r2=942993&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/requestor/PersistentReplyToFutureHandler.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/requestor/PersistentReplyToFutureHandler.java Tue May 11 03:22:09 2010
@@ -24,12 +24,9 @@ import javax.jms.Message;
import org.apache.camel.component.jms.requestor.DeferredRequestReplyMap.DeferredMessageSentCallback;
import org.apache.camel.component.jms.requestor.PersistentReplyToRequestor.MessageSelectorComposer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
public class PersistentReplyToFutureHandler extends FutureHandler {
- private static final transient Log LOG = LogFactory.getLog(PersistentReplyToFutureHandler.class);
protected PersistentReplyToRequestor requestor;
protected DeferredMessageSentCallback callback;
protected String correlationID;
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/requestor/Requestor.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/requestor/Requestor.java?rev=942993&r1=942992&r2=942993&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/requestor/Requestor.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/requestor/Requestor.java Tue May 11 03:22:09 2010
@@ -53,10 +53,10 @@ public class Requestor extends ServiceSu
private final JmsConfiguration configuration;
private ScheduledExecutorService executorService;
private AbstractMessageListenerContainer listenerContainer;
- private TimeoutMap requestMap;
+ private TimeoutMap<String, Object> requestMap;
private Map<JmsProducer, DeferredRequestReplyMap> producerDeferredRequestReplyMap;
- private TimeoutMap deferredRequestMap;
- private TimeoutMap deferredReplyMap;
+ private TimeoutMap<String, Object> deferredRequestMap;
+ private TimeoutMap<String, Object> deferredReplyMap;
private Destination replyTo;
private long maxRequestTimeout = -1;
private long replyToResolverTimeout = 5000;
@@ -65,10 +65,10 @@ public class Requestor extends ServiceSu
public Requestor(JmsConfiguration configuration, ScheduledExecutorService executorService) {
this.configuration = configuration;
this.executorService = executorService;
- requestMap = new DefaultTimeoutMap(executorService, configuration.getRequestMapPurgePollTimeMillis());
+ requestMap = new DefaultTimeoutMap<String, Object>(executorService, configuration.getRequestMapPurgePollTimeMillis());
producerDeferredRequestReplyMap = new HashMap<JmsProducer, DeferredRequestReplyMap>();
- deferredRequestMap = new DefaultTimeoutMap(executorService, configuration.getRequestMapPurgePollTimeMillis());
- deferredReplyMap = new DefaultTimeoutMap(executorService, configuration.getRequestMapPurgePollTimeMillis());
+ deferredRequestMap = new DefaultTimeoutMap<String, Object>(executorService, configuration.getRequestMapPurgePollTimeMillis());
+ deferredReplyMap = new DefaultTimeoutMap<String, Object>(executorService, configuration.getRequestMapPurgePollTimeMillis());
}
public synchronized DeferredRequestReplyMap getDeferredRequestReplyMap(JmsProducer producer) {
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsCustomHeaderFilterStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsCustomHeaderFilterStrategyTest.java?rev=942993&r1=942992&r2=942993&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsCustomHeaderFilterStrategyTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsCustomHeaderFilterStrategyTest.java Tue May 11 03:22:09 2010
@@ -44,7 +44,7 @@ public class JmsCustomHeaderFilterStrate
mock.message(0).header("foo").isEqualTo("bar");
mock.message(0).header("skipme").isNull();
- Map headers = new HashMap();
+ Map<String, Object> headers = new HashMap<String, Object>();
headers.put("foo", "bar");
headers.put("skipme", 123);
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java?rev=942993&r1=942992&r2=942993&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java Tue May 11 03:22:09 2010
@@ -71,14 +71,14 @@ public class JmsEndpointConfigurationTes
@Test
public void testNotSetUsernameOrPassword() {
try {
- JmsEndpoint endpoint = (JmsEndpoint) resolveMandatoryEndpoint("jms:topic:Foo.Bar?username=James");
+ resolveMandatoryEndpoint("jms:topic:Foo.Bar?username=James");
fail("Expect the exception here");
} catch (ResolveEndpointFailedException exception) {
// Expect the exception here
}
try {
- JmsEndpoint endpoint = (JmsEndpoint) resolveMandatoryEndpoint("jms:topic:Foo.Bar?password=ABC");
+ resolveMandatoryEndpoint("jms:topic:Foo.Bar?password=ABC");
fail("Expect the exception here");
} catch (ResolveEndpointFailedException exception) {
// Expect the exception here
@@ -130,6 +130,7 @@ public class JmsEndpointConfigurationTes
endpoint.getConfiguration().setDeliveryPersistent(true);
endpoint.getConfiguration().setReplyToDeliveryPersistent(false);
JmsProducer producer = endpoint.createProducer();
+ assertNotNull("The producer should not be null", producer);
JmsConsumer consumer = endpoint.createConsumer(dummyProcessor);
JmsOperations operations = consumer.getEndpointMessageListener().getTemplate();
assertTrue(operations instanceof JmsTemplate);
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsHeaderFilteringTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsHeaderFilteringTest.java?rev=942993&r1=942992&r2=942993&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsHeaderFilteringTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsHeaderFilteringTest.java Tue May 11 03:22:09 2010
@@ -57,7 +57,7 @@ public class JmsHeaderFilteringTest exte
MockEndpoint errors = this.resolveMandatoryEndpoint(assertionReceiver, MockEndpoint.class);
errors.expectedMessageCount(0);
- Exchange exchange = template.send(testQueueEndpointA, ExchangePattern.InOnly, new Processor() {
+ template.send(testQueueEndpointA, ExchangePattern.InOnly, new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getIn().setHeader("org.apache.camel.jms", 10000);
exchange.getIn().setHeader("org.apache.camel.test.jms", 20000);
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageTypeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageTypeTest.java?rev=942993&r1=942992&r2=942993&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageTypeTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageTypeTest.java Tue May 11 03:22:09 2010
@@ -155,7 +155,7 @@ public class JmsMessageTypeTest extends
mock.expectedMessageCount(1);
mock.message(0).body().isInstanceOf(Map.class);
- Map body = new HashMap();
+ Map<String, Object> body = new HashMap<String, Object>();
body.put("name", "Claus");
template.sendBody("direct:map", body);
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java?rev=942993&r1=942992&r2=942993&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java Tue May 11 03:22:09 2010
@@ -141,7 +141,7 @@ public class JmsProducerWithJMSHeaderTes
mock.message(0).header("JMSPriority").isEqualTo(3);
mock.message(0).header("JMSDeliveryMode").isEqualTo(2);
- Map headers = new HashMap();
+ Map<String, Object> headers = new HashMap<String, Object>();
headers.put("JMSPriority", 3);
headers.put("JMSDeliveryMode", 2);
template.sendBodyAndHeaders("activemq:queue:foo?preserveMessageQos=true", "Hello World", headers);
@@ -157,7 +157,7 @@ public class JmsProducerWithJMSHeaderTes
mock.message(0).header("JMSDeliveryMode").isEqualTo(2);
long ttl = System.currentTimeMillis() + 2000;
- Map headers = new HashMap();
+ Map<String, Object> headers = new HashMap<String, Object>();
headers.put("JMSPriority", 3);
headers.put("JMSDeliveryMode", 2);
headers.put("JMSExpiration", ttl);
@@ -182,7 +182,7 @@ public class JmsProducerWithJMSHeaderTes
mock.expectedMessageCount(1);
long ttl = System.currentTimeMillis() + 2000;
- Map headers = new HashMap();
+ Map<String, Object> headers = new HashMap<String, Object>();
headers.put("JMSPriority", 3);
headers.put("JMSDeliveryMode", 2);
headers.put("JMSExpiration", ttl);
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRemoveHeaderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRemoveHeaderTest.java?rev=942993&r1=942992&r2=942993&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRemoveHeaderTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRemoveHeaderTest.java Tue May 11 03:22:09 2010
@@ -42,7 +42,7 @@ public class JmsRemoveHeaderTest extends
// but only the bar header
mock.expectedHeaderReceived("bar", 123);
- Map headers = new HashMap();
+ Map<String, Object> headers = new HashMap<String, Object>();
headers.put("foo", "cheese");
headers.put("bar", 123);
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteToFileTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteToFileTest.java?rev=942993&r1=942992&r2=942993&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteToFileTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteToFileTest.java Tue May 11 03:22:09 2010
@@ -54,7 +54,7 @@ public class JmsRouteToFileTest extends
assertTrue("Should be directory", dir.isDirectory());
File file = dir.listFiles()[0];
assertTrue("File should exists", file.exists());
- String body = IOConverter.toString(file);
+ String body = IOConverter.toString(file, null);
assertEquals("Hello World", body);
}
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithDefaultKeyFormatStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithDefaultKeyFormatStrategyTest.java?rev=942993&r1=942992&r2=942993&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithDefaultKeyFormatStrategyTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithDefaultKeyFormatStrategyTest.java Tue May 11 03:22:09 2010
@@ -77,7 +77,7 @@ public class JmsRouteWithDefaultKeyForma
mock.expectedHeaderReceived("Content-Type", "text/plain");
mock.expectedHeaderReceived("org.apache.camel.MyKey", "foo");
- Map headers = new HashMap();
+ Map<String, Object> headers = new HashMap<String, Object>();
headers.put("foo", "cheese");
headers.put("Content-Type", "text/plain");
headers.put("org.apache.camel.MyKey", "foo");
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransferExceptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransferExceptionTest.java?rev=942993&r1=942992&r2=942993&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransferExceptionTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransferExceptionTest.java Tue May 11 03:22:09 2010
@@ -93,7 +93,7 @@ public class JmsTransferExceptionTest ex
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- errorHandler(deadLetterChannel("mock:dead").maximumRedeliveries(2).redeliverDelay(0).logStackTrace(false).handled(false));
+ errorHandler(deadLetterChannel("mock:dead").maximumRedeliveries(2).redeliveryDelay(0).logStackTrace(false).handled(false));
from(getUri())
.process(new Processor() {
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsUseOriginalBodyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsUseOriginalBodyTest.java?rev=942993&r1=942992&r2=942993&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsUseOriginalBodyTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsUseOriginalBodyTest.java Tue May 11 03:22:09 2010
@@ -61,11 +61,11 @@ public class JmsUseOriginalBodyTest exte
public void configure() throws Exception {
// will use original
ErrorHandlerBuilder a = deadLetterChannel("mock:a")
- .maximumRedeliveries(2).redeliverDelay(0).logStackTrace(false).useOriginalMessage().handled(true);
+ .maximumRedeliveries(2).redeliveryDelay(0).logStackTrace(false).useOriginalMessage().handled(true);
// will NOT use original
ErrorHandlerBuilder b = deadLetterChannel("mock:b")
- .maximumRedeliveries(2).redeliverDelay(0).logStackTrace(false).handled(true);
+ .maximumRedeliveries(2).redeliveryDelay(0).logStackTrace(false).handled(true);
from("activemq:queue:a")
.errorHandler(a)
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java?rev=942993&r1=942992&r2=942993&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java Tue May 11 03:22:09 2010
@@ -200,7 +200,7 @@ public class JmsXMLRouteTest extends Cam
// enable stream caching
context.setStreamCaching(true);
- errorHandler(deadLetterChannel("mock:error").redeliverDelay(0));
+ errorHandler(deadLetterChannel("mock:error").redeliveryDelay(0));
// no need to convert to String as JMS producer can handle XML streams now
from("direct:object").to("activemq:queue:object?jmsMessageType=Object");
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/TransactedJmsRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/TransactedJmsRouteTest.java?rev=942993&r1=942992&r2=942993&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/TransactedJmsRouteTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/TransactedJmsRouteTest.java Tue May 11 03:22:09 2010
@@ -34,13 +34,10 @@ import org.apache.camel.spring.SpringCam
import org.apache.camel.spring.SpringRouteBuilder;
import org.apache.camel.spring.spi.SpringTransactionPolicy;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
-
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.support.TransactionTemplate;
@@ -54,8 +51,6 @@ import static org.apache.camel.component
public class TransactedJmsRouteTest extends CamelTestSupport {
// TODO: This is not a nice unit test. Please do not do like this. Big, confusing and takes long time to run
-
- private static final transient Log LOG = LogFactory.getLog(TransactedJmsRouteTest.class);
protected int assertTimeoutSeconds = 10;
private MockEndpoint mockEndpointA;
private MockEndpoint mockEndpointB;
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/MyService.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/MyService.java?rev=942993&r1=942992&r2=942993&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/MyService.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/MyService.java Tue May 11 03:22:09 2010
@@ -31,7 +31,7 @@ public class MyService {
}
public Map status() {
- Map answer = new HashMap();
+ Map<String, Object> answer = new HashMap<String, Object>();
answer.put("name", name);
answer.put("time", new Date().getTime());
return answer;
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHeaderAsObjectTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHeaderAsObjectTest.java?rev=942993&r1=942992&r2=942993&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHeaderAsObjectTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHeaderAsObjectTest.java Tue May 11 03:22:09 2010
@@ -36,7 +36,7 @@ public class JmsHeaderAsObjectTest exten
mock.message(0).header("foo").isEqualTo("bar");
mock.message(0).header("number").isEqualTo(23);
- Map headers = new HashMap();
+ Map<String, Object> headers = new HashMap<String, Object>();
headers.put("foo", "bar");
headers.put("number", 23);
template.sendBodyAndHeaders("activemq:in", "Hello World", headers);
@@ -56,7 +56,7 @@ public class JmsHeaderAsObjectTest exten
order.setOrderId(333);
order.setQuantity(2);
- Map headers = new HashMap();
+ Map<String, Object> headers = new HashMap<String, Object>();
headers.put("foo", "bar");
headers.put("order", order);
template.sendBodyAndHeaders("activemq:in", "Hello World", headers);
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithDLCErrorHandlerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithDLCErrorHandlerTest.java?rev=942993&r1=942992&r2=942993&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithDLCErrorHandlerTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithDLCErrorHandlerTest.java Tue May 11 03:22:09 2010
@@ -117,7 +117,7 @@ public class JMXTXUseOriginalBodyWithDLC
onException(Exception.class)
.handled(true)
.useOriginalBody()
- .redeliverDelay(0)
+ .redeliveryDelay(0)
.maximumRedeliveries(2)
.to("mock:error");
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionTest.java?rev=942993&r1=942992&r2=942993&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionTest.java Tue May 11 03:22:09 2010
@@ -19,7 +19,6 @@ package org.apache.camel.component.jms.t
import org.apache.camel.spi.Policy;
import org.apache.camel.spring.SpringRouteBuilder;
import org.apache.camel.spring.spi.SpringTransactionPolicy;
-import org.apache.log4j.Logger;
import org.junit.Test;
/**
@@ -32,8 +31,7 @@ import org.junit.Test;
* Transaction classes can be joined into one.
*/
public class QueueToQueueTransactionTest extends AbstractTransactionTest {
-
- private Logger log = Logger.getLogger(getClass());
+
protected int getExpectedRouteCount() {
return 0;
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionWithoutDefineTransactionManagerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionWithoutDefineTransactionManagerTest.java?rev=942993&r1=942992&r2=942993&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionWithoutDefineTransactionManagerTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionWithoutDefineTransactionManagerTest.java Tue May 11 03:22:09 2010
@@ -18,15 +18,13 @@ package org.apache.camel.component.jms.t
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.SpringRouteBuilder;
-import org.apache.log4j.Logger;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
public class QueueToQueueTransactionWithoutDefineTransactionManagerTest extends AbstractTransactionTest {
-
- private Logger log = Logger.getLogger(getClass());
+
protected int getExpectedRouteCount() {
return 0;