Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix for failing test case 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@643439 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
James Strachan 2008-04-01 15:21:13 +00:00
parent a818270040
commit 80722e4c9d
3 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
activemq-core/src/main/java/org/apache/activemq/camel/component/ActiveMQComponent.java
View File

@ -85,6 +85,14 @@ public class ActiveMQComponent extends JmsComponent {
this.exposeAllQueues = exposeAllQueues; this.exposeAllQueues = exposeAllQueues;
} }
public void setUsePooledConnection(boolean usePooledConnection) {
getConfiguration().setUsePooledConnection(usePooledConnection);
}
public void setUseSingleConnection(boolean useSingleConnection) {
getConfiguration().setUseSingleConnection(useSingleConnection);
}
@Override @Override
protected void doStart() throws Exception { protected void doStart() throws Exception {
super.doStart(); super.doStart();

3
activemq-core/src/main/java/org/apache/activemq/camel/component/ActiveMQConfiguration.java
View File

@ -97,7 +97,6 @@ public class ActiveMQConfiguration extends JmsConfiguration {
} }
else if (isUseSingleConnection()) { else if (isUseSingleConnection()) {
return new SingleConnectionFactory(answer); return new SingleConnectionFactory(answer);
//return new PooledConnectionFactory(answer);
} }
else { else {
return answer; return answer;
@ -109,7 +108,7 @@ public class ActiveMQConfiguration extends JmsConfiguration {
// for folks not using this option // for folks not using this option
try { try {
Class type = loadClass("org.apache.activemq.pool.PooledConnectionFactory", getClass().getClassLoader()); Class type = loadClass("org.apache.activemq.pool.PooledConnectionFactory", getClass().getClassLoader());
Constructor constructor = type.getConstructor(ActiveMQConnectionFactory.class); Constructor constructor = type.getConstructor(org.apache.activemq.ActiveMQConnectionFactory.class);
return (ConnectionFactory) constructor.newInstance(connectionFactory); return (ConnectionFactory) constructor.newInstance(connectionFactory);
} }
catch (Exception e) { catch (Exception e) {

27
activemq-core/src/test/java/org/apache/activemq/camel/component/ActiveMQConfigureTest.java
View File

@ -17,6 +17,7 @@
package org.apache.activemq.camel.component; package org.apache.activemq.camel.component;
import org.apache.activemq.spring.ActiveMQConnectionFactory; import org.apache.activemq.spring.ActiveMQConnectionFactory;
import org.apache.activemq.pool.PooledConnectionFactory;
import org.apache.camel.ContextTestSupport; import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint; import org.apache.camel.Endpoint;
import org.apache.camel.component.jms.JmsConsumer; import org.apache.camel.component.jms.JmsConsumer;
@ -25,6 +26,7 @@ import org.apache.camel.component.jms.JmsProducer;
import org.apache.camel.processor.Logger; import org.apache.camel.processor.Logger;
import org.springframework.jms.core.JmsTemplate; import org.springframework.jms.core.JmsTemplate;
import org.springframework.jms.listener.AbstractMessageListenerContainer; import org.springframework.jms.listener.AbstractMessageListenerContainer;
import org.springframework.jms.connection.SingleConnectionFactory;
/** /**
* @version $Revision$ * @version $Revision$
@ -32,12 +34,31 @@ import org.springframework.jms.listener.AbstractMessageListenerContainer;
public class ActiveMQConfigureTest extends ContextTestSupport { public class ActiveMQConfigureTest extends ContextTestSupport {
public void testJmsTemplateUsesPoolingConnectionFactory() throws Exception { public void testJmsTemplateUsesPoolingConnectionFactory() throws Exception {
JmsEndpoint endpoint = resolveMandatoryEndpoint("activemq:test.foo?usePooledConnection=true");
JmsProducer producer = endpoint.createProducer();
JmsTemplate template = assertIsInstanceOf(JmsTemplate.class, producer.getTemplate());
assertEquals("pubSubDomain", false, template.isPubSubDomain());
assertIsInstanceOf(PooledConnectionFactory.class, template.getConnectionFactory());
}
public void testJmsTemplateUsesSingleConnectionFactory() throws Exception {
JmsEndpoint endpoint = resolveMandatoryEndpoint("activemq:test.foo"); JmsEndpoint endpoint = resolveMandatoryEndpoint("activemq:test.foo");
JmsProducer producer = endpoint.createProducer(); JmsProducer producer = endpoint.createProducer();
JmsTemplate template = assertIsInstanceOf(JmsTemplate.class, producer.getTemplate()); JmsTemplate template = assertIsInstanceOf(JmsTemplate.class, producer.getTemplate());
assertIsInstanceOf(ActiveMQConnectionFactory.class, template.getConnectionFactory());
assertEquals("pubSubDomain", false, template.isPubSubDomain()); assertEquals("pubSubDomain", false, template.isPubSubDomain());
SingleConnectionFactory connectionFactory = assertIsInstanceOf(SingleConnectionFactory.class, template.getConnectionFactory());
assertIsInstanceOf(ActiveMQConnectionFactory.class, connectionFactory.getTargetConnectionFactory());
}
public void testJmsTemplateDoesNotUsePoolingConnectionFactory() throws Exception {
JmsEndpoint endpoint = resolveMandatoryEndpoint("activemq:test.foo?useSingleConnection=false");
JmsProducer producer = endpoint.createProducer();
JmsTemplate template = assertIsInstanceOf(JmsTemplate.class, producer.getTemplate());
assertEquals("pubSubDomain", false, template.isPubSubDomain());
assertIsInstanceOf(ActiveMQConnectionFactory.class, template.getConnectionFactory());
} }
public void testListenerContainerUsesSpringConnectionFactory() throws Exception { public void testListenerContainerUsesSpringConnectionFactory() throws Exception {
@ -45,9 +66,9 @@ public class ActiveMQConfigureTest extends ContextTestSupport {
JmsConsumer consumer = endpoint.createConsumer(new Logger()); JmsConsumer consumer = endpoint.createConsumer(new Logger());
AbstractMessageListenerContainer listenerContainer = consumer.getListenerContainer(); AbstractMessageListenerContainer listenerContainer = consumer.getListenerContainer();
assertIsInstanceOf(ActiveMQConnectionFactory.class, listenerContainer.getConnectionFactory());
assertEquals("pubSubDomain", true, listenerContainer.isPubSubDomain()); assertEquals("pubSubDomain", true, listenerContainer.isPubSubDomain());
SingleConnectionFactory connectionFactory = assertIsInstanceOf(SingleConnectionFactory.class, listenerContainer.getConnectionFactory());
assertIsInstanceOf(ActiveMQConnectionFactory.class, connectionFactory.getTargetConnectionFactory());
} }
@Override @Override