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/03/30 09:32:11 UTC
git commit: DELTASPIKE-318 remove workaround again.
Updated Branches:
refs/heads/master 756cbe48c -> ae8e60443
DELTASPIKE-318 remove workaround again.
This got properly fixed in OpenEJB.
See TOMEE-840 for more information
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/ae8e6044
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/ae8e6044
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/ae8e6044
Branch: refs/heads/master
Commit: ae8e604436ac52b99a5fbacfce93da1186445b2f
Parents: 756cbe4
Author: Mark Struberg <st...@apache.org>
Authored: Sat Mar 30 09:27:54 2013 +0100
Committer: Mark Struberg <st...@apache.org>
Committed: Sat Mar 30 09:29:47 2013 +0100
----------------------------------------------------------------------
.../cdise/openejb/OpenEjbContainerControl.java | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/ae8e6044/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 a1dea15..c23cd5d 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,7 +18,6 @@
*/
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;
@@ -29,7 +28,6 @@ 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;
@@ -39,7 +37,6 @@ 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;
@@ -87,8 +84,6 @@ public class OpenEjbContainerControl implements CdiContainer
{
Map<String, String> config = new HashMap<String, String>();
- config.put(OpenEjbContainer.Provider.OPENEJB_ADDITIONNAL_CALLERS_KEY, "");
-
return config;
}