Fix test failures resulting from merge
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f41ccbfd Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f41ccbfd Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f41ccbfd Branch: refs/heads/tomee-1.7.x Commit: f41ccbfd4778c5a97135622237133a8b5e0e2b8e Parents: 437bbac Author: Jonathan Gallimore <[email protected]> Authored: Thu Jan 18 11:18:07 2018 +0000 Committer: Jonathan Gallimore <[email protected]> Committed: Thu Jan 18 11:18:07 2018 +0000 ---------------------------------------------------------------------- .../src/main/resources/META-INF/org.apache.openejb/service-jar.xml | 2 +- .../META-INF/org.apache.openejb.actpropfalse/service-jar.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/f41ccbfd/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml b/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml index a84fc19..ad89109 100644 --- a/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml +++ b/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml @@ -467,7 +467,7 @@ ResourceAdapter Default JMS Resource Adapter MessageListenerInterface javax.jms.MessageListener - ActivationSpecClass org.apache.openejb.resource.activemq.TomEEMessageActivationSpec + ActivationSpecClass org.apache.activemq.ra.ActiveMQActivationSpec InstanceLimit 10 FailOnUnknownActivationSpec true AccessTimeout 5 minutes http://git-wip-us.apache.org/repos/asf/tomee/blob/f41ccbfd/container/openejb-core/src/test/resources/META-INF/org.apache.openejb.actpropfalse/service-jar.xml ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/resources/META-INF/org.apache.openejb.actpropfalse/service-jar.xml b/container/openejb-core/src/test/resources/META-INF/org.apache.openejb.actpropfalse/service-jar.xml index 5b7c51e..d95c3c1 100644 --- a/container/openejb-core/src/test/resources/META-INF/org.apache.openejb.actpropfalse/service-jar.xml +++ b/container/openejb-core/src/test/resources/META-INF/org.apache.openejb.actpropfalse/service-jar.xml @@ -59,7 +59,7 @@ ResourceAdapter Default JMS Resource Adapter MessageListenerInterface javax.jms.MessageListener - ActivationSpecClass org.apache.openejb.resource.activemq.TomEEMessageActivationSpec + ActivationSpecClass org.apache.activemq.ra.ActiveMQActivationSpec InstanceLimit 10 FailOnUnknownActivationSpec false AccessTimeout 5 minutes
