Author: dkulp
Date: Sat Jul 30 03:05:32 2011
New Revision: 1152423
URL: http://svn.apache.org/viewvc?rev=1152423&view=rev
Log:
Undo commit of stuff that wasn't supposed to be committed. Work in
progress.
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/BrowsableQueueTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeMessageConverterTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsToFileTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAutoStartupTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBatchResequencerJMSPriorityTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsConsumerRestartPickupConfigurationChangesTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProduerConcurrentTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProduerConcurrentWithReplyTest.java
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/BrowsableQueueTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/BrowsableQueueTest.java?rev=1152423&r1=1152422&r2=1152423&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/BrowsableQueueTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/BrowsableQueueTest.java
Sat Jul 30 03:05:32 2011
@@ -24,14 +24,11 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
-
-import org.junit.After;
-import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.camel.component.jms.JmsComponent.jmsComponent;
+import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
/**
* @version
@@ -44,29 +41,16 @@ public class BrowsableQueueTest extends
protected int counter;
protected Object[] expectedBodies = {"body1", "body2"};
- @Before
- public void setUp() throws Exception {
- long start = System.currentTimeMillis();
- super.setUp();
- System.out.println("Start: " + (System.currentTimeMillis() - start));
- }
- @After
- public void tearDown() throws Exception {
- long start = System.currentTimeMillis();
- super.tearDown();
- System.out.println("Stop: " + (System.currentTimeMillis() - start));
- }
-
@Test
public void testSendMessagesThenBrowseQueue() throws Exception {
// send some messages
for (int i = 0; i < expectedBodies.length; i++) {
Object expectedBody = expectedBodies[i];
- template.sendBodyAndHeader("activemq:BrowsableQueueTest.b",
expectedBody, "counter", i);
+ template.sendBodyAndHeader("activemq:test.b", expectedBody,
"counter", i);
}
// now lets browse the queue
- JmsQueueEndpoint endpoint =
getMandatoryEndpoint("activemq:BrowsableQueueTest.b?maximumBrowseSize=6",
JmsQueueEndpoint.class);
+ JmsQueueEndpoint endpoint =
getMandatoryEndpoint("activemq:test.b?maximumBrowseSize=6",
JmsQueueEndpoint.class);
assertEquals(6, endpoint.getMaximumBrowseSize());
List<Exchange> list = endpoint.getExchanges();
LOG.debug("Received: " + list);
@@ -96,8 +80,8 @@ public class BrowsableQueueTest extends
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
- JmsComponent comp = jmsComponent(CamelJmsTestHelper.getSharedConfig());
- camelContext.addComponent(componentName, comp);
+ ConnectionFactory connectionFactory =
CamelJmsTestHelper.createConnectionFactory();
+ camelContext.addComponent(componentName,
jmsComponentAutoAcknowledge(connectionFactory));
return camelContext;
}
@@ -105,7 +89,7 @@ public class BrowsableQueueTest extends
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
-
from("activemq:BrowsableQueueTest.a").to("activemq:BrowsableQueueTest.b");
+ from("activemq:test.a").to("activemq:test.b");
}
};
}
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeMessageConverterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeMessageConverterTest.java?rev=1152423&r1=1152422&r2=1152423&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeMessageConverterTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeMessageConverterTest.java
Sat Jul 30 03:05:32 2011
@@ -32,7 +32,7 @@ import org.junit.Test;
import org.springframework.jms.support.converter.MessageConversionException;
import org.springframework.jms.support.converter.MessageConverter;
-import static org.apache.camel.component.jms.JmsComponent.jmsComponent;
+import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
/**
* @version
@@ -49,7 +49,8 @@ public class ConsumeMessageConverterTest
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
- camelContext.addComponent("activemq",
jmsComponent(CamelJmsTestHelper.getSharedConfig()));
+ ConnectionFactory connectionFactory =
CamelJmsTestHelper.createConnectionFactory();
+ camelContext.addComponent("activemq",
jmsComponentAutoAcknowledge(connectionFactory));
return camelContext;
}
@@ -60,7 +61,7 @@ public class ConsumeMessageConverterTest
mock.expectedMessageCount(1);
mock.message(0).body().isInstanceOf(TextMessage.class);
- template.sendBody("activemq:queue:ConsumeMessageConverterTest.hello",
"Hello World");
+ template.sendBody("activemq:queue:hello", "Hello World");
assertMockEndpointsSatisfied();
}
@@ -71,7 +72,7 @@ public class ConsumeMessageConverterTest
mock.expectedMessageCount(1);
mock.message(0).body().isInstanceOf(BytesMessage.class);
- template.sendBody("activemq:queue:ConsumeMessageConverterTest.hello",
"Hello World".getBytes());
+ template.sendBody("activemq:queue:hello", "Hello World".getBytes());
assertMockEndpointsSatisfied();
}
@@ -79,7 +80,7 @@ public class ConsumeMessageConverterTest
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
-
from("activemq:queue:ConsumeMessageConverterTest.hello?messageConverter=#myMessageConverter").to("mock:result");
+
from("activemq:queue:hello?messageConverter=#myMessageConverter").to("mock:result");
}
};
}
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=1152423&r1=1152422&r2=1152423&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
Sat Jul 30 03:05:32 2011
@@ -27,7 +27,7 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-import static org.apache.camel.component.jms.JmsComponent.jmsComponent;
+import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
/**
* Unit test that we can do file over JMS to file.
@@ -39,7 +39,7 @@ public class FileRouteToJmsToFileTest ex
@Test
public void testRouteFileToFile() throws Exception {
deleteDirectory("target/file2file");
- NotifyBuilder notify = new
NotifyBuilder(context).from("activemq:queue:FileRouteToJmsToFileTest.hello").whenDone(1).create();
+ NotifyBuilder notify = new
NotifyBuilder(context).from("activemq:queue:hello").whenDone(1).create();
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
@@ -58,7 +58,8 @@ public class FileRouteToJmsToFileTest ex
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
- camelContext.addComponent(componentName,
jmsComponent(CamelJmsTestHelper.getSharedConfig()));
+ ConnectionFactory connectionFactory =
CamelJmsTestHelper.createConnectionFactory();
+ camelContext.addComponent(componentName,
jmsComponentAutoAcknowledge(connectionFactory));
return camelContext;
}
@@ -66,9 +67,9 @@ public class FileRouteToJmsToFileTest ex
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
-
from("file://target/file2file/in").to("activemq:queue:FileRouteToJmsToFileTest.hello");
+ from("file://target/file2file/in").to("activemq:queue:hello");
-
from("activemq:queue:FileRouteToJmsToFileTest.hello").to("file://target/file2file/out",
"mock:result");
+ from("activemq:queue:hello").to("file://target/file2file/out",
"mock:result");
}
};
}
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAutoStartupTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAutoStartupTest.java?rev=1152423&r1=1152422&r2=1152423&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAutoStartupTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAutoStartupTest.java
Sat Jul 30 03:05:32 2011
@@ -44,7 +44,7 @@ public class JmsAutoStartupTest extends
// should be stopped by default
mock.expectedMessageCount(0);
- template.sendBody("activemq:queue:JmsAutoStartupTest.foo", "Hello
World");
+ template.sendBody("activemq:queue:foo", "Hello World");
Thread.sleep(2000);
@@ -64,7 +64,7 @@ public class JmsAutoStartupTest extends
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- endpoint =
context.getEndpoint("activemq:queue:JmsAutoStartupTest.foo?autoStartup=false",
JmsEndpoint.class);
+ endpoint =
context.getEndpoint("activemq:queue:foo?autoStartup=false", JmsEndpoint.class);
from(endpoint).to("mock:result");
}
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBatchResequencerJMSPriorityTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBatchResequencerJMSPriorityTest.java?rev=1152423&r1=1152422&r2=1152423&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBatchResequencerJMSPriorityTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBatchResequencerJMSPriorityTest.java
Sat Jul 30 03:05:32 2011
@@ -40,14 +40,14 @@ public class JmsBatchResequencerJMSPrior
mock.expectedBodiesReceived("G", "A", "B", "E", "H", "C", "D", "F");
// must use preserveMessageQos=true to be able to specify the
JMSPriority to be used
-
template.sendBodyAndHeader("jms:queue:JmsBatchResequencerJMSPriorityTest.foo?preserveMessageQos=true",
"A", "JMSPriority", 6);
-
template.sendBodyAndHeader("jms:queue:JmsBatchResequencerJMSPriorityTest.foo?preserveMessageQos=true",
"B", "JMSPriority", 6);
-
template.sendBodyAndHeader("jms:queue:JmsBatchResequencerJMSPriorityTest.foo?preserveMessageQos=true",
"C", "JMSPriority", 4);
-
template.sendBodyAndHeader("jms:queue:JmsBatchResequencerJMSPriorityTest.foo?preserveMessageQos=true",
"D", "JMSPriority", 4);
-
template.sendBodyAndHeader("jms:queue:JmsBatchResequencerJMSPriorityTest.foo?preserveMessageQos=true",
"E", "JMSPriority", 6);
-
template.sendBodyAndHeader("jms:queue:JmsBatchResequencerJMSPriorityTest.foo?preserveMessageQos=true",
"F", "JMSPriority", 4);
-
template.sendBodyAndHeader("jms:queue:JmsBatchResequencerJMSPriorityTest.foo?preserveMessageQos=true",
"G", "JMSPriority", 8);
-
template.sendBodyAndHeader("jms:queue:JmsBatchResequencerJMSPriorityTest.foo?preserveMessageQos=true",
"H", "JMSPriority", 6);
+ template.sendBodyAndHeader("jms:queue:foo?preserveMessageQos=true",
"A", "JMSPriority", 6);
+ template.sendBodyAndHeader("jms:queue:foo?preserveMessageQos=true",
"B", "JMSPriority", 6);
+ template.sendBodyAndHeader("jms:queue:foo?preserveMessageQos=true",
"C", "JMSPriority", 4);
+ template.sendBodyAndHeader("jms:queue:foo?preserveMessageQos=true",
"D", "JMSPriority", 4);
+ template.sendBodyAndHeader("jms:queue:foo?preserveMessageQos=true",
"E", "JMSPriority", 6);
+ template.sendBodyAndHeader("jms:queue:foo?preserveMessageQos=true",
"F", "JMSPriority", 4);
+ template.sendBodyAndHeader("jms:queue:foo?preserveMessageQos=true",
"G", "JMSPriority", 8);
+ template.sendBodyAndHeader("jms:queue:foo?preserveMessageQos=true",
"H", "JMSPriority", 6);
assertMockEndpointsSatisfied();
}
@@ -55,7 +55,7 @@ public class JmsBatchResequencerJMSPrior
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
- ConnectionFactory connectionFactory =
CamelJmsTestHelper.getSharedConnectionFactory();
+ ConnectionFactory connectionFactory =
CamelJmsTestHelper.createConnectionFactory();
camelContext.addComponent("jms",
jmsComponentAutoAcknowledge(connectionFactory));
return camelContext;
@@ -67,7 +67,7 @@ public class JmsBatchResequencerJMSPrior
@Override
public void configure() throws Exception {
// START SNIPPET: e1
- from("jms:queue:JmsBatchResequencerJMSPriorityTest.foo")
+ from("jms:queue:foo")
// sort by JMSPriority by allowing duplicates (message can
have same JMSPriority)
// and use reverse ordering so 9 is first output (most
important), and 0 is last
// use batch mode and fire every 3th second
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentTest.java?rev=1152423&r1=1152422&r2=1152423&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentTest.java
Sat Jul 30 03:05:32 2011
@@ -34,7 +34,7 @@ public class JmsComponentTest extends Ca
@Test
public void testComponentOptions() throws Exception {
- String reply =
template.requestBody("activemq123:queue:JmsComponentTest.hello?requestTimeout=5000",
"Hello World", String.class);
+ String reply =
template.requestBody("activemq123:queue:hello?requestTimeout=5000", "Hello
World", String.class);
assertEquals("Bye World", reply);
assertEquals(true, endpoint.isAcceptMessagesWhileStopping());
@@ -60,7 +60,7 @@ public class JmsComponentTest extends Ca
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
- ConnectionFactory connectionFactory =
CamelJmsTestHelper.getSharedConnectionFactory();
+ ConnectionFactory connectionFactory =
CamelJmsTestHelper.createConnectionFactory();
JmsComponent comp = jmsComponentAutoAcknowledge(connectionFactory);
comp.setAcceptMessagesWhileStopping(true);
@@ -84,7 +84,7 @@ public class JmsComponentTest extends Ca
camelContext.addComponent(componentName, comp);
- endpoint = (JmsEndpoint)
comp.createEndpoint("queue:JmsComponentTest.hello");
+ endpoint = (JmsEndpoint) comp.createEndpoint("queue:hello");
return camelContext;
}
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsConsumerRestartPickupConfigurationChangesTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsConsumerRestartPickupConfigurationChangesTest.java?rev=1152423&r1=1152422&r2=1152423&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsConsumerRestartPickupConfigurationChangesTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsConsumerRestartPickupConfigurationChangesTest.java
Sat Jul 30 03:05:32 2011
@@ -33,7 +33,7 @@ public class JmsConsumerRestartPickupCon
@Test
public void testRestartJmsConsumerPickupChanges() throws Exception {
- JmsEndpoint endpoint =
context.getEndpoint("activemq:queue:JmsConsumerRestartPickupConfigurationChangesTest.foo",
JmsEndpoint.class);
+ JmsEndpoint endpoint = context.getEndpoint("activemq:queue:foo",
JmsEndpoint.class);
JmsConsumer consumer = endpoint.createConsumer(new Processor() {
public void process(Exchange exchange) throws Exception {
template.send("mock:result", exchange);
@@ -44,7 +44,7 @@ public class JmsConsumerRestartPickupCon
MockEndpoint result = getMockEndpoint("mock:result");
result.expectedBodiesReceived("Hello World");
-
template.sendBody("activemq:queue:JmsConsumerRestartPickupConfigurationChangesTest.foo",
"Hello World");
+ template.sendBody("activemq:queue:foo", "Hello World");
assertMockEndpointsSatisfied();
consumer.stop();
@@ -58,7 +58,7 @@ public class JmsConsumerRestartPickupCon
result.reset();
result.expectedBodiesReceived("Bye World");
-
template.sendBody("activemq:queue:JmsConsumerRestartPickupConfigurationChangesTest.bar",
"Bye World");
+ template.sendBody("activemq:queue:bar", "Bye World");
assertMockEndpointsSatisfied();
consumer.stop();
@@ -67,7 +67,7 @@ public class JmsConsumerRestartPickupCon
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
- ConnectionFactory connectionFactory =
CamelJmsTestHelper.getSharedConnectionFactory();
+ ConnectionFactory connectionFactory =
CamelJmsTestHelper.createConnectionFactory();
camelContext.addComponent("activemq",
jmsComponentAutoAcknowledge(connectionFactory));
return camelContext;
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProduerConcurrentTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProduerConcurrentTest.java?rev=1152423&r1=1152422&r2=1152423&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProduerConcurrentTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProduerConcurrentTest.java
Sat Jul 30 03:05:32 2011
@@ -64,7 +64,7 @@ public class JmsProduerConcurrentTest ex
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
- ConnectionFactory connectionFactory =
CamelJmsTestHelper.getSharedConnectionFactory();
+ ConnectionFactory connectionFactory =
CamelJmsTestHelper.createConnectionFactory();
camelContext.addComponent("jms",
jmsComponentAutoAcknowledge(connectionFactory));
return camelContext;
@@ -75,9 +75,9 @@ public class JmsProduerConcurrentTest ex
return new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("direct:start").to("jms:queue:foo-JmsProducerConcurrentTest");
+ from("direct:start").to("jms:queue:foo");
-
from("jms:queue:foo-JmsProducerConcurrentTest").to("mock:result");
+ from("jms:queue:foo").to("mock:result");
}
};
}
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProduerConcurrentWithReplyTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProduerConcurrentWithReplyTest.java?rev=1152423&r1=1152422&r2=1152423&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProduerConcurrentWithReplyTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProduerConcurrentWithReplyTest.java
Sat Jul 30 03:05:32 2011
@@ -73,7 +73,7 @@ public class JmsProduerConcurrentWithRep
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
- ConnectionFactory connectionFactory =
CamelJmsTestHelper.getSharedConnectionFactory();
+ ConnectionFactory connectionFactory =
CamelJmsTestHelper.createConnectionFactory();
camelContext.addComponent("jms",
jmsComponentAutoAcknowledge(connectionFactory));
return camelContext;
@@ -84,9 +84,9 @@ public class JmsProduerConcurrentWithRep
return new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("direct:start").to("jms:queue:foo-JmsProduerConcurrentWithReplyTest");
+ from("direct:start").to("jms:queue:foo");
-
from("jms:queue:foo-JmsProduerConcurrentWithReplyTest?concurrentConsumers=5").transform(simple("Bye
${in.body}")).to("mock:result");
+
from("jms:queue:foo?concurrentConsumers=5").transform(simple("Bye
${in.body}")).to("mock:result");
}
};
}
