fix conflicts
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/69e7287d Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/69e7287d Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/69e7287d Branch: refs/heads/tomee-1.7.x Commit: 69e7287dfbf3d16f084d284ea3893d3dea47ad50 Parents: 9e027fe Author: Jonathan Gallimore <[email protected]> Authored: Tue Dec 19 12:47:58 2017 +0000 Committer: Thiago Veronezi <[email protected]> Committed: Wed Jan 17 13:05:14 2018 -0500 ---------------------------------------------------------------------- .../openejb/core/mdb/PoolEndpointHandlerTest.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/69e7287d/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 f5e36e5..5863042 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,12 +16,6 @@ */ 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; @@ -37,6 +31,8 @@ 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; @@ -66,10 +62,9 @@ public class PoolEndpointHandlerTest { .p("mdbs.ActivationSpecClass", SampleActivationSpec.class.getName()) .p("mdbs.MessageListenerInterface", InboundListener.class.getName()) - .p("cf", "new://Resource?type=" + SampleConnectionFactory.class.getName() + "&class-name=" + SampleManagedConnectionFactory.class.getName()) - .p("cf.ResourceAdapter", "sra") - .p("cf.TransactionSupport", "none") - .build(); + .p("cf", "new://Resource?type=" + ConnectionFactory.class.getName()) + .p("cf.ResourceAdapter", "amq") + .build(); } @Module @@ -115,6 +110,8 @@ 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") })
