fix conflicts
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/b68f2281 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/b68f2281 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/b68f2281 Branch: refs/heads/tomee-1.7.x Commit: b68f22812b43780db711b46bf18b2511a8b0d364 Parents: 69e7287 Author: Jonathan Gallimore <j...@jrg.me.uk> Authored: Tue Dec 19 13:37:12 2017 +0000 Committer: Thiago Veronezi <thi...@veronezi.org> Committed: Wed Jan 17 13:08:18 2018 -0500 ---------------------------------------------------------------------- .../openejb/core/mdb/PoolEndpointHandlerTest.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/b68f2281/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/PoolEndpointHandlerTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/PoolEndpointHandlerTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/PoolEndpointHandlerTest.java index 5863042..f5e36e5 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/PoolEndpointHandlerTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/PoolEndpointHandlerTest.java @@ -16,6 +16,12 @@ */ package org.apache.openejb.core.mdb; +import org.apache.openejb.core.mdb.connector.api.InboundListener; +import org.apache.openejb.core.mdb.connector.api.SampleConnection; +import org.apache.openejb.core.mdb.connector.api.SampleConnectionFactory; +import org.apache.openejb.core.mdb.connector.impl.SampleActivationSpec; +import org.apache.openejb.core.mdb.connector.impl.SampleManagedConnectionFactory; +import org.apache.openejb.core.mdb.connector.impl.SampleResourceAdapter; import org.apache.openejb.jee.MessageDrivenBean; import org.apache.openejb.junit.ApplicationComposer; import org.apache.openejb.monitoring.LocalMBeanServer; @@ -31,8 +37,6 @@ import javax.annotation.Resource; import javax.ejb.ActivationConfigProperty; import javax.ejb.MessageDriven; import javax.jms.Queue; -import javax.jms.Session; -import javax.jms.TextMessage; import javax.management.ObjectName; import java.util.List; import java.util.Properties; @@ -62,9 +66,10 @@ public class PoolEndpointHandlerTest { .p("mdbs.ActivationSpecClass", SampleActivationSpec.class.getName()) .p("mdbs.MessageListenerInterface", InboundListener.class.getName()) - .p("cf", "new://Resource?type=" + ConnectionFactory.class.getName()) - .p("cf.ResourceAdapter", "amq") - .build(); + .p("cf", "new://Resource?type=" + SampleConnectionFactory.class.getName() + "&class-name=" + SampleManagedConnectionFactory.class.getName()) + .p("cf.ResourceAdapter", "sra") + .p("cf.TransactionSupport", "none") + .build(); } @Module @@ -110,8 +115,6 @@ public class PoolEndpointHandlerTest { } @MessageDriven(activationConfig = { - @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"), - @ActivationConfigProperty(propertyName = "destination", propertyValue = "target"), @ActivationConfigProperty(propertyName = "DeliveryActive", propertyValue = "false"), @ActivationConfigProperty(propertyName = "MdbJMXControl", propertyValue = "default:type=test") })
