You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by st...@apache.org on 2018/02/19 10:48:01 UTC

[16/50] tomee git commit: fix test AppInfoBuilderTest.testShouldCreateContainer

fix test AppInfoBuilderTest.testShouldCreateContainer


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/cf668262
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/cf668262
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/cf668262

Branch: refs/heads/fb_tomee8
Commit: cf668262298992e4b2cd6f547300d49f4e3ebe6e
Parents: ea22ace
Author: Thiago Veronezi <th...@veronezi.org>
Authored: Thu Jan 4 20:41:47 2018 -0500
Committer: Thiago Veronezi <th...@veronezi.org>
Committed: Thu Jan 4 20:41:47 2018 -0500

----------------------------------------------------------------------
 .../java/org/apache/openejb/core/mdb/PoolEndpointHandler.java     | 1 -
 .../main/resources/META-INF/org.apache.openejb/service-jar.xml    | 3 ++-
 .../test/java/org/apache/openejb/config/AppInfoBuilderTest.java   | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/cf668262/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/PoolEndpointHandler.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/PoolEndpointHandler.java b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/PoolEndpointHandler.java
index 1e5ef82..18b5216 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/PoolEndpointHandler.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/PoolEndpointHandler.java
@@ -116,7 +116,6 @@ public class PoolEndpointHandler extends AbstractEndpointHandler {
         } finally {
             if (instance != null) {
                 try {
-
                     instanceManager.poolInstance(new ThreadContext(deployment, null), instance);
                 } catch (OpenEJBException e) {
                     LOGGER.error("Unable to add instance back to the pool", e);

http://git-wip-us.apache.org/repos/asf/tomee/blob/cf668262/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 16ac3b6..69efe0f 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
@@ -476,7 +476,8 @@
     ResourceAdapter Default JMS Resource Adapter
     MessageListenerInterface javax.jms.MessageListener
     ActivationSpecClass org.apache.openejb.resource.activemq.TomEEMessageActivationSpec
-    FailOnUnknownActivationSpec false
+    InstanceLimit 10
+    FailOnUnknownActivationSpec true
     AccessTimeout 5 minutes
     CloseTimeout 5 minutes
     CallbackThreads 5

http://git-wip-us.apache.org/repos/asf/tomee/blob/cf668262/container/openejb-core/src/test/java/org/apache/openejb/config/AppInfoBuilderTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/AppInfoBuilderTest.java b/container/openejb-core/src/test/java/org/apache/openejb/config/AppInfoBuilderTest.java
index 6a65694..8597bb7 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/config/AppInfoBuilderTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/config/AppInfoBuilderTest.java
@@ -23,6 +23,7 @@ import org.apache.openejb.assembler.classic.EjbJarInfo;
 import org.apache.openejb.assembler.classic.PortInfo;
 import org.apache.openejb.config.sys.Container;
 import org.apache.openejb.core.mdb.MdbContainer;
+import org.apache.openejb.core.mdb.MdbContainerFactory;
 import org.apache.openejb.jee.EjbJar;
 import org.apache.openejb.jee.SessionBean;
 import org.apache.openejb.jee.oejb2.AuthMethodType;
@@ -167,7 +168,7 @@ public class AppInfoBuilderTest extends TestCase {
         assertEquals(appInfo.appId + "/my-container", containerInfo.id);
         assertEquals(1, containerInfo.types.size());
         assertEquals("MESSAGE", containerInfo.types.get(0));
-        assertEquals(MdbContainer.class.getName(), containerInfo.className);
+        assertEquals(MdbContainerFactory.class.getName(), containerInfo.className);
         assertEquals("Default JMS Resource Adapter", containerInfo.properties.get("ResourceAdapter"));
         assertEquals(MessageListener.class.getName(), containerInfo.properties.get("MessageListenerInterface"));
         assertEquals(TomEEMessageActivationSpec.class.getName(), containerInfo.properties.get("ActivationSpecClass"));