svn commit: r1395506 - in /openejb/trunk/openejb: container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java pom.xml tomee/apache-tomcat/pom.xml tomee/pom.xml

[rm...@apache.org]

Author: rmannibucau
Date: Mon Oct  8 10:28:57 2012
New Revision: 1395506

URL: http://svn.apache.org/viewvc?rev=1395506&view=rev
Log:
TOMEE-445 TOMEE-453 passivating option is only available for normal scoped + tomcat 7.0.32

Modified:
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
    openejb/trunk/openejb/pom.xml
    openejb/trunk/openejb/tomee/apache-tomcat/pom.xml
    openejb/trunk/openejb/tomee/pom.xml

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java?rev=1395506&r1=1395505&r2=1395506&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java Mon Oct  8 10:28:57 2012
@@ -59,11 +59,13 @@ import javax.ejb.LockType;
 import javax.ejb.MessageDrivenBean;
 import javax.ejb.TimedObject;
 import javax.ejb.Timer;
+import javax.enterprise.context.Dependent;
 import javax.enterprise.context.spi.Contextual;
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;
 import javax.naming.Context;
 import javax.persistence.EntityManagerFactory;
+import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -1591,10 +1593,17 @@ public class BeanContext extends Deploym
         final BeanManagerImpl bm = moduleContext.getAppContext().getWebBeansContext().getBeanManagerImpl();
         if (!bm.isInUse()) {
             isPassivatingScope = true;
+            return;
         }
 
         final CdiEjbBean<?> bean = get(CdiEjbBean.class);
-        isPassivatingScope =  bean == null || bm.isPassivatingScope(bean.getScope());
+        if (bean == null) {
+            isPassivatingScope = true;
+            return;
+        }
+
+        final Class<? extends Annotation> scope = bean.getScope();
+        isPassivatingScope =  !bm.isNormalScope(scope) || bm.isPassivatingScope(scope);
     }
 
     public boolean isPassivatingScope() {

Modified: openejb/trunk/openejb/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/pom.xml?rev=1395506&r1=1395505&r2=1395506&view=diff
==============================================================================
--- openejb/trunk/openejb/pom.xml (original)
+++ openejb/trunk/openejb/pom.xml Mon Oct  8 10:28:57 2012
@@ -117,8 +117,8 @@
     <javaee-api.version>6.0-4</javaee-api.version>
 
     <!-- Used mainly in assembly/openejb-tomcat* projects  -->
-    <tomcat.bundle.version>7.0.30</tomcat.bundle.version> <!-- don't merge with tomcat.version since we can release it ourself -->
-    <tomcat.version>7.0.30</tomcat.version>
+    <tomcat.bundle.version>7.0.32-SNAPSHOT</tomcat.bundle.version> <!-- don't merge with tomcat.version since we can release it ourself -->
+    <tomcat.version>7.0.32</tomcat.version>
 
     <!-- used mainly by jetty modules -->
     <cxf.version>2.6.2</cxf.version>

Modified: openejb/trunk/openejb/tomee/apache-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/apache-tomcat/pom.xml?rev=1395506&r1=1395505&r2=1395506&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/apache-tomcat/pom.xml (original)
+++ openejb/trunk/openejb/tomee/apache-tomcat/pom.xml Mon Oct  8 10:28:57 2012
@@ -24,7 +24,7 @@ http://maven.apache.org/xsd/maven-4.0.0.
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.5.i1-SNAPSHOT</version>
+    <version>1.5.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

Modified: openejb/trunk/openejb/tomee/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/pom.xml?rev=1395506&r1=1395505&r2=1395506&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/pom.xml (original)
+++ openejb/trunk/openejb/tomee/pom.xml Mon Oct  8 10:28:57 2012
@@ -43,7 +43,7 @@
     <module>tomee-embedded</module>
     <module>tomee-jaxrs</module>
     <module>tomee-jaxrs-webapp</module>
-    <!--<module>apache-tomcat</module>-->
+    <module>apache-tomcat</module>
     <module>apache-tomee</module>
     <module>apache-tomee-deb</module>
     <module>apache-tomee-deb-package</module>