You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2013/02/26 13:03:28 UTC
git commit: DELTASPIKE-318 disable auto-scanning of bootstrap chain
for OpenEJB starting
Updated Branches:
refs/heads/master 40aa7b628 -> be1fd862f
DELTASPIKE-318 disable auto-scanning of bootstrap chain for OpenEJB starting
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/be1fd862
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/be1fd862
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/be1fd862
Branch: refs/heads/master
Commit: be1fd862f67623f2d69a87445a777486f1c84e9e
Parents: 40aa7b6
Author: Mark Struberg <st...@apache.org>
Authored: Tue Feb 26 13:02:30 2013 +0100
Committer: Mark Struberg <st...@apache.org>
Committed: Tue Feb 26 13:02:30 2013 +0100
----------------------------------------------------------------------
.../cdise/openejb/OpenEjbContainerControl.java | 16 ++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/be1fd862/deltaspike/cdictrl/impl-openejb/src/main/java/org/apache/deltaspike/cdise/openejb/OpenEjbContainerControl.java
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/impl-openejb/src/main/java/org/apache/deltaspike/cdise/openejb/OpenEjbContainerControl.java b/deltaspike/cdictrl/impl-openejb/src/main/java/org/apache/deltaspike/cdise/openejb/OpenEjbContainerControl.java
index c6fc974..a1dea15 100644
--- a/deltaspike/cdictrl/impl-openejb/src/main/java/org/apache/deltaspike/cdise/openejb/OpenEjbContainerControl.java
+++ b/deltaspike/cdictrl/impl-openejb/src/main/java/org/apache/deltaspike/cdise/openejb/OpenEjbContainerControl.java
@@ -18,14 +18,18 @@
*/
package org.apache.deltaspike.cdise.openejb;
+import javax.annotation.ManagedBean;
import javax.ejb.embeddable.EJBContainer;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
import javax.inject.Inject;
import javax.naming.NamingException;
+import java.util.HashMap;
+import java.util.Map;
import java.util.Set;
+import org.apache.openejb.OpenEjbContainer;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.deltaspike.cdise.api.CdiContainer;
@@ -35,6 +39,7 @@ import org.apache.deltaspike.cdise.api.ContextControl;
* OpenWebBeans specific implementation of {@link org.apache.deltaspike.cdise.api.CdiContainer}.
*/
@SuppressWarnings("UnusedDeclaration")
+@ManagedBean // we need this annotation to force OpenEJB to pickup this class
public class OpenEjbContainerControl implements CdiContainer
{
private ContextControl ctxCtrl = null;
@@ -58,7 +63,7 @@ public class OpenEjbContainerControl implements CdiContainer
if (openEjbContainer == null)
{
// this immediately boots the container
- openEjbContainer = EJBContainer.createEJBContainer();
+ openEjbContainer = EJBContainer.createEJBContainer(getConfiguration());
// this magic code performs injection
try
@@ -78,6 +83,15 @@ public class OpenEjbContainerControl implements CdiContainer
}
}
+ protected Map<?,?> getConfiguration()
+ {
+ Map<String, String> config = new HashMap<String, String>();
+
+ config.put(OpenEjbContainer.Provider.OPENEJB_ADDITIONNAL_CALLERS_KEY, "");
+
+ return config;
+ }
+
@Override
public synchronized void shutdown()
{