Repository: tomee Updated Branches: refs/heads/tomee-1.7.x 37e2eacf1 -> 1eeaaf7a3
don't add new ejb bean in bean manager Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/1eeaaf7a Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/1eeaaf7a Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/1eeaaf7a Branch: refs/heads/tomee-1.7.x Commit: 1eeaaf7a34cff5b68c7f7232c123e3b87f73a46f Parents: 37e2eac Author: Romain Manni-Bucau <[email protected]> Authored: Tue Nov 25 19:18:08 2014 +0100 Committer: Romain Manni-Bucau <[email protected]> Committed: Tue Nov 25 19:18:08 2014 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/openejb/cdi/CdiPlugin.java | 4 +--- pom.xml | 2 +- tck/cdi-embedded/pom.xml | 2 +- tck/cdi-embedded/src/test/resources/failing.xml | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/1eeaaf7a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java index f9ba827..7b2ae31 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java @@ -413,9 +413,7 @@ public class CdiPlugin extends AbstractOwbPlugin implements OpenWebBeansJavaEEPl @Override public <T> Bean<T> defineNewSessionBean(final Class<T> clazz) { - final NewCdiEjbBean<T> newBean = new NewCdiEjbBean<T>(findBeanContext(webBeansContext, clazz).get(CdiEjbBean.class)); - webBeansContext.getBeanManagerImpl().addBean(newBean); - return newBean; + return new NewCdiEjbBean<T>(findBeanContext(webBeansContext, clazz).get(CdiEjbBean.class)); } private static Map<Class<?>, BeanContext> pluginBeans(final WebBeansContext ctx) { http://git-wip-us.apache.org/repos/asf/tomee/blob/1eeaaf7a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 1ce1ee3..0e37f8c 100644 --- a/pom.xml +++ b/pom.xml @@ -100,7 +100,7 @@ <tomee.version>1.7.2-SNAPSHOT</tomee.version> <openjpa.version>2.4.0-nonfinal-1598334</openjpa.version> - <org.apache.openwebbeans.version>1.2.6</org.apache.openwebbeans.version> + <org.apache.openwebbeans.version>1.2.7-SNAPSHOT</org.apache.openwebbeans.version> <!-- Maven module versions --> <maven-bundle-plugin.version>2.3.7</maven-bundle-plugin.version> http://git-wip-us.apache.org/repos/asf/tomee/blob/1eeaaf7a/tck/cdi-embedded/pom.xml ---------------------------------------------------------------------- diff --git a/tck/cdi-embedded/pom.xml b/tck/cdi-embedded/pom.xml index aa43d24..d46ceba 100644 --- a/tck/cdi-embedded/pom.xml +++ b/tck/cdi-embedded/pom.xml @@ -48,7 +48,7 @@ <dependency> <groupId>org.jboss.jsr299.tck</groupId> <artifactId>jsr299-tck-impl</artifactId> - <version>1.0.4.SP1</version> + <version>1.0.6.Final</version> <exclusions> <exclusion> <groupId>org.testng</groupId> http://git-wip-us.apache.org/repos/asf/tomee/blob/1eeaaf7a/tck/cdi-embedded/src/test/resources/failing.xml ---------------------------------------------------------------------- diff --git a/tck/cdi-embedded/src/test/resources/failing.xml b/tck/cdi-embedded/src/test/resources/failing.xml index 6906ecf..9d10110 100644 --- a/tck/cdi-embedded/src/test/resources/failing.xml +++ b/tck/cdi-embedded/src/test/resources/failing.xml @@ -18,7 +18,7 @@ <suite name="CDI TCK" verbose="0"> <test name="CDI TCK"> <classes> - <class name="org.jboss.jsr299.tck.tests.decorators.invocation.EJBDecoratorInvocationTest"/> + <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanTest"/> </classes> </test> </suite>
