Author: dblevins
Date: Tue Jul 12 00:05:01 2011
New Revision: 1145400

URL: http://svn.apache.org/viewvc?rev=1145400&view=rev
Log:
OPENEJB-1630: @RequestScoped tracking and cleanup for callbacks

Modified:
    
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java
    
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiInterceptor.java
    
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/RequestScopedThreadContextListener.java
    openejb/trunk/openejb3/examples/application-composer/build.xml
    
openejb/trunk/openejb3/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/Report.java
    
openejb/trunk/openejb3/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/RequestScopeTestListener.java
    openejb/trunk/openejb3/tck/cdi-embedded/src/test/resources/all-failing.xml
    openejb/trunk/openejb3/tck/cdi-embedded/src/test/resources/failing.xml
    openejb/trunk/openejb3/tck/cdi-embedded/src/test/resources/passing.xml

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java?rev=1145400&r1=1145399&r2=1145400&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java
 Tue Jul 12 00:05:01 2011
@@ -147,13 +147,13 @@ public class CdiAppContextsService exten
 
     private Context getRequestContext() {
         RequestContext context = requestContext.get();
-        if (context == null) {
-
-            context = new RequestContext();
-            context.setActive(true);
-
-            requestContext.set(context);
-        }
+//        if (context == null) {
+//
+//            context = new RequestContext();
+//            context.setActive(true);
+//
+//            requestContext.set(context);
+//        }
         return context;
     }
 

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiInterceptor.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiInterceptor.java?rev=1145400&r1=1145399&r2=1145400&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiInterceptor.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiInterceptor.java
 Tue Jul 12 00:05:01 2011
@@ -33,6 +33,7 @@ import javax.enterprise.context.RequestS
 import javax.enterprise.context.spi.Context;
 import javax.enterprise.context.spi.CreationalContext;
 import javax.interceptor.AroundInvoke;
+import javax.interceptor.AroundTimeout;
 import javax.interceptor.InvocationContext;
 import java.io.ObjectStreamException;
 import java.io.Serializable;
@@ -57,6 +58,7 @@ public class CdiInterceptor implements S
         this.webBeansContext = bean.getWebBeansContext();
     }
 
+    @AroundTimeout
     @AroundInvoke
     public Object aroundInvoke(final InvocationContext ejbContext) throws 
Exception {
 
@@ -85,14 +87,11 @@ public class CdiInterceptor implements S
         public Object call() throws Exception {
 
             Context ctx = contextService.getCurrentContext(scopeType);
-            boolean active = false;
 
             if (ctx == null) {
                 contextService.startContext(scopeType, null);
             } else if (!ctx.isActive()) {
                 contextService.activateContext(scopeType);
-            } else {
-                active = true;
             }
 
             try {
@@ -100,8 +99,6 @@ public class CdiInterceptor implements S
             } finally {
                 if (ctx == null) {
                     contextService.endContext(scopeType, null);
-                } else if (!active) {
-                    contextService.deActivateContext(scopeType);
                 }
             }
         }

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/RequestScopedThreadContextListener.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/RequestScopedThreadContextListener.java?rev=1145400&r1=1145399&r2=1145400&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/RequestScopedThreadContextListener.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/RequestScopedThreadContextListener.java
 Tue Jul 12 00:05:01 2011
@@ -16,9 +16,14 @@
  */
 package org.apache.openejb.cdi;
 
+import org.apache.openejb.BeanContext;
 import org.apache.openejb.core.ThreadContext;
 import org.apache.openejb.core.ThreadContextListener;
-import org.apache.webbeans.context.RequestContext;
+import org.apache.webbeans.config.WebBeansContext;
+import org.apache.webbeans.spi.ContextsService;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.context.spi.Context;
 
 /**
  * @version $Rev$ $Date$
@@ -28,45 +33,38 @@ public class RequestScopedThreadContextL
 
     @Override
     public void contextEntered(ThreadContext oldContext, ThreadContext 
newContext) {
-        Request request = getRequestData(oldContext);
 
-        if (request == null) {
-            request = new Request(newContext);
-        }
+        final BeanContext beanContext = newContext.getBeanContext();
 
-        request.propogate(newContext);
-    }
+        final WebBeansContext webBeansContext = 
beanContext.getModuleContext().getAppContext().getWebBeansContext();
+        final ContextsService contextsService = 
webBeansContext.getContextsService();
 
-    @Override
-    public void contextExited(ThreadContext exitedContext, ThreadContext 
reenteredContext) {
-        final Request request = getRequestData(exitedContext);
+        final Context requestContext = 
contextsService.getCurrentContext(RequestScoped.class);
 
-        if (request.start == exitedContext) request.complete();
+        if (requestContext == null) {
+            contextsService.startContext(RequestScoped.class, null);
+            newContext.set(DestroyContext.class, new 
DestroyContext(contextsService, newContext));
+        }
     }
 
-    private Request getRequestData(ThreadContext threadContext) {
-        if (threadContext == null) return null;
-        return threadContext.get(Request.class);
-    }
+    @Override
+    public void contextExited(ThreadContext exitedContext, ThreadContext 
reenteredContext) {
+        if (exitedContext == null) return;
 
+        final DestroyContext destroyContext = 
exitedContext.get(DestroyContext.class);
 
-    private static class Request {
-        private final ThreadContext start;
-        private final RequestContext context;
-
-        public Request(ThreadContext start) {
-            this.start = start;
-            this.context = new RequestContext();
-            this.context.setActive(true);
-        }
+        if (destroyContext == null || destroyContext.threadContext != 
exitedContext) return;
 
-        public void propogate(ThreadContext threadContext) {
-            threadContext.set(Request.class, this);
-            threadContext.set(RequestContext.class, context);
-        }
+        destroyContext.contextsService.endContext(RequestScoped.class, null);
+    }
 
-        public void complete() {
-            context.destroy();
+    private static class DestroyContext {
+        private final ContextsService contextsService;
+        private final ThreadContext threadContext;
+
+        private DestroyContext(ContextsService contextsService, ThreadContext 
threadContext) {
+            this.contextsService = contextsService;
+            this.threadContext = threadContext;
         }
     }
 }

Modified: openejb/trunk/openejb3/examples/application-composer/build.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/application-composer/build.xml?rev=1145400&r1=1145399&r2=1145400&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/application-composer/build.xml (original)
+++ openejb/trunk/openejb3/examples/application-composer/build.xml Tue Jul 12 
00:05:01 2011
@@ -50,7 +50,7 @@
   <!-- Test Build Classpath -->
   <artifact:dependencies pathId="classpath.test.build">
     <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
-    <dependency groupId="org.apache.openejb" artifactId="openejb-api" 
version="3.2.0-SNAPSHOT"/>
+    <dependency groupId="org.apache.openejb" artifactId="openejb-api" 
version="4.0.0-SNAPSHOT"/>
   </artifact:dependencies>
 
   <!-- Test Run Classpath -->
@@ -58,7 +58,7 @@
     <remoteRepository refid="apache.snapshot.repository" />
     <remoteRepository refid="m2.repository" />
 
-    <dependency groupId="org.apache.openejb" artifactId="openejb-core" 
version="3.2.0-SNAPSHOT"/>
+    <dependency groupId="org.apache.openejb" artifactId="openejb-core" 
version="4.0.0-SNAPSHOT"/>
     <dependency groupId="junit" artifactId="junit" version="4.3.1"/>
   </artifact:dependencies>
 

Modified: 
openejb/trunk/openejb3/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/Report.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/Report.java?rev=1145400&r1=1145399&r2=1145400&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/Report.java
 (original)
+++ 
openejb/trunk/openejb3/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/Report.java
 Tue Jul 12 00:05:01 2011
@@ -71,6 +71,7 @@ public class Report {
         textReport(file);
         passingXml(file);
         failingXml(file);
+//        printResults(System.out);
 
     }
 
@@ -90,7 +91,7 @@ public class Report {
                 "  <listeners>\n" +
                 "    <listener 
class-name=\"org.apache.openejb.tck.cdi.embedded.RequestScopeTestListener\" 
/>\n" +
                 "  </listeners>\n" +
-                "  <test name=\"CDI TCK\">" +
+                "  <test name=\"CDI TCK\">\n" +
                 "    <packages>\n" +
                 "        <package name=\"org.jboss.jsr299.tck.tests.*\"/>\n" +
                 "        <package 
name=\"org.jboss.jsr299.tck.interceptors.tests.*\"/>\n" +
@@ -124,7 +125,11 @@ public class Report {
         final File report = new File(file.getParentFile(), 
file.getName().replaceAll(".xml$", "-failing.xml"));
         final PrintStream out = new PrintStream(new FileOutputStream(report));
 
-        out.println("<suite name=\"CDI TCK\" verbose=\"0\">");
+        out.println("<suite name=\"CDI TCK\" verbose=\"0\">\n"+
+        "  <listeners>\n" +
+        "    <listener 
class-name=\"org.apache.openejb.tck.cdi.embedded.RequestScopeTestListener\" 
/>\n" +
+        "  </listeners>");
+
         out.println("  <test name=\"CDI TCK\">");
         out.println("    <!--<packages>-->\n" +
                 "        <!--<package 
name=\"org.jboss.jsr299.tck.tests.*\"/>-->\n" +
@@ -198,7 +203,7 @@ public class Report {
     public static enum Status {
         PASS, FAIL, ERROR;
     }
-    public static class TestResult {
+    public static class TestResult implements Comparable<TestResult> {
         private final String name;
         private final Status status;
 
@@ -206,6 +211,11 @@ public class Report {
             this.name = name;
             this.status = status;
         }
+
+        @Override
+        public int compareTo(TestResult testResult) {
+            return this.name.compareTo(testResult.name);
+        }
     }
 
     public static class TestClass implements Comparable<TestClass>{
@@ -228,6 +238,7 @@ public class Report {
         }
 
         public List<TestResult> getResults() {
+            Collections.sort(results);
             return results;
         }
 

Modified: 
openejb/trunk/openejb3/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/RequestScopeTestListener.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/RequestScopeTestListener.java?rev=1145400&r1=1145399&r2=1145400&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/RequestScopeTestListener.java
 (original)
+++ 
openejb/trunk/openejb3/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/RequestScopeTestListener.java
 Tue Jul 12 00:05:01 2011
@@ -21,14 +21,19 @@ import org.apache.openejb.BeanType;
 import org.apache.openejb.core.ThreadContext;
 import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.spi.ContainerSystem;
+import org.apache.webbeans.config.WebBeansContext;
+import org.apache.webbeans.spi.ContextsService;
 import org.testng.ITestContext;
 import org.testng.ITestListener;
 import org.testng.ITestResult;
 
+import javax.enterprise.context.RequestScoped;
+
 public class RequestScopeTestListener implements ITestListener {
 
     private boolean entered = false;
     private ThreadContext oldContext;
+    private ContextsService contextsService;
 
     @Override
     public void onTestStart(ITestResult iTestResult) {
@@ -48,9 +53,10 @@ public class RequestScopeTestListener im
 
         if (context == null) return;
 
-        ThreadContext newContext = new ThreadContext(context, null);
-        oldContext = ThreadContext.enter(newContext);
+        final WebBeansContext webBeansContext = 
context.getModuleContext().getAppContext().getWebBeansContext();
+        contextsService = webBeansContext.getContextsService();
 
+        contextsService.startContext(RequestScoped.class, null);
     }
 
     @Override
@@ -60,7 +66,7 @@ public class RequestScopeTestListener im
 
     private void exit() {
         try {
-            ThreadContext.exit(oldContext);
+            contextsService.endContext(RequestScoped.class, null);
         } catch (Exception e) {
         }
     }

Modified: 
openejb/trunk/openejb3/tck/cdi-embedded/src/test/resources/all-failing.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/cdi-embedded/src/test/resources/all-failing.xml?rev=1145400&r1=1145399&r2=1145400&view=diff
==============================================================================
--- openejb/trunk/openejb3/tck/cdi-embedded/src/test/resources/all-failing.xml 
(original)
+++ openejb/trunk/openejb3/tck/cdi-embedded/src/test/resources/all-failing.xml 
Tue Jul 12 00:05:01 2011
@@ -18,15 +18,12 @@
       <class 
name="org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean.EnterpriseBeanWithIllegalDependencyTest"/>
       <class 
name="org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingDecorator.EnterpriseBeanWithNonPassivatingDecoratorTest"/>
       <class 
name="org.jboss.jsr299.tck.tests.context.request.RequestContextTest"/>
-      <class 
name="org.jboss.jsr299.tck.tests.context.request.ejb.EJBRequestContextTest"/>
       <class 
name="org.jboss.jsr299.tck.tests.context.session.SessionContextTest"/>
       <class 
name="org.jboss.jsr299.tck.tests.definition.stereotype.broken.nonEmptyNamed.NonEmptyNamedTest"/>
       <class 
name="org.jboss.jsr299.tck.tests.definition.stereotype.broken.tooManyScopes.TooManyScopeTypesTest"/>
       <class 
name="org.jboss.jsr299.tck.tests.deployment.packaging.bundledLibrary.LibraryInEarTest"/>
       <class 
name="org.jboss.jsr299.tck.tests.deployment.packaging.bundledLibrary.LibraryInWarTest"/>
       <class 
name="org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest"/>
-      <class 
name="org.jboss.jsr299.tck.tests.implementation.enterprise.remove.EnterpriseBeanRemoveMethodTest"/>
-      <class 
name="org.jboss.jsr299.tck.tests.implementation.producer.method.definition.enterprise.EnterpriseProducerMethodDefinitionTest"/>
       <class 
name="org.jboss.jsr299.tck.tests.implementation.simple.resource.env.EnvInjectionTest"/>
       <class 
name="org.jboss.jsr299.tck.tests.implementation.simple.resource.persistenceContext.PersistenceContextInjectionTest"/>
       <class 
name="org.jboss.jsr299.tck.tests.implementation.simple.resource.resource.InjectionOfResourceTest"/>
@@ -36,7 +33,7 @@
       <class 
name="org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.directlyExtendsSimpleBean.DirectlyExtendsSimpleBeanTest"/>
       <class 
name="org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.implementInterfaceAndExtendsNothing.ImplementsInterfaceAndExtendsNothingTest"/>
       <class 
name="org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.sameName.SameNameTest"/>
-      <class 
name="org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.nonContextualReference.SessionBeanInterceptorOnNonContextualEjbReferenceTest"/>
+      <class 
name="org.jboss.jsr299.tck.tests.interceptors.definition.broken.nonExistantClassInBeansXml.NonExistantClassInBeansXmlTest"/>
       <class 
name="org.jboss.jsr299.tck.tests.lookup.clientProxy.incontainer.ClientProxyTest"/>
       <class name="org.jboss.jsr299.tck.tests.lookup.el.ResolutionByNameTest"/>
       <class 
name="org.jboss.jsr299.tck.tests.lookup.el.integration.IntegrationWithUnifiedELTest"/>

Modified: openejb/trunk/openejb3/tck/cdi-embedded/src/test/resources/failing.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/cdi-embedded/src/test/resources/failing.xml?rev=1145400&r1=1145399&r2=1145400&view=diff
==============================================================================
--- openejb/trunk/openejb3/tck/cdi-embedded/src/test/resources/failing.xml 
(original)
+++ openejb/trunk/openejb3/tck/cdi-embedded/src/test/resources/failing.xml Tue 
Jul 12 00:05:01 2011
@@ -11,7 +11,7 @@
       <!--<class 
name="org.jboss.jsr299.tck.tests.context.dependent.ejb.DependentContextEjbTest"/>-->
       <!--<class 
name="org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean.EnterpriseBeanWithIllegalDependencyTest"/>-->
       <!--<class 
name="org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean.EnterpriseBeanWithIllegalDependencyTest"/>-->
-      <!--<class 
name="org.jboss.jsr299.tck.tests.context.request.ejb.EJBRequestContextTest"/>-->
+      <class 
name="org.jboss.jsr299.tck.tests.context.request.ejb.EJBRequestContextTest"/>
       <!--<class 
name="org.jboss.jsr299.tck.tests.extensions.producer.ProducerTest"/>-->
       <!--<class 
name="org.jboss.jsr299.tck.tests.implementation.builtin.BuiltInBeansTest"/>-->
       <!--<class 
name="org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest">-->
@@ -19,7 +19,8 @@
           <!--<exclude name="testCreateSFSB"/>-->
         <!--</methods>-->
       <!--</class>-->
-      <class 
name="org.jboss.jsr299.tck.tests.implementation.producer.method.definition.enterprise.EnterpriseProducerMethodDefinitionTest"/>
+      <!--<class 
name="org.jboss.jsr299.tck.tests.context.dependent.ejb.DependentContextEjbTest"/>-->
+      <!--<class 
name="org.jboss.jsr299.tck.tests.implementation.producer.method.definition.enterprise.EnterpriseProducerMethodDefinitionTest"/>-->
       <!--<class 
name="org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb.EjbInjectionTest"/>-->
       <!--<class 
name="org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.nonContextualReference.SessionBeanInterceptorOnNonContextualEjbReferenceTest"/>-->
       <!--<class 
name="org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.InjectionIntoWebServiceEndPointTest"/>-->

Modified: openejb/trunk/openejb3/tck/cdi-embedded/src/test/resources/passing.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/cdi-embedded/src/test/resources/passing.xml?rev=1145400&r1=1145399&r2=1145400&view=diff
==============================================================================
--- openejb/trunk/openejb3/tck/cdi-embedded/src/test/resources/passing.xml 
(original)
+++ openejb/trunk/openejb3/tck/cdi-embedded/src/test/resources/passing.xml Tue 
Jul 12 00:05:01 2011
@@ -1,16 +1,13 @@
 <suite name="CDI TCK" verbose="0">
-
   <listeners>
     <listener 
class-name="org.apache.openejb.tck.cdi.embedded.RequestScopeTestListener" />
   </listeners>
-
   <test name="CDI TCK">
     <packages>
         <package name="org.jboss.jsr299.tck.tests.*"/>
         <package name="org.jboss.jsr299.tck.interceptors.tests.*"/>
     </packages>
     <classes>
-      <class 
name="org.jboss.jsr299.tck.tests.context.DestroyForSameCreationalContext2Test"/>
       <class 
name="org.jboss.jsr299.tck.tests.context.application.ApplicationContextTest">
         <methods>
           <exclude name="testApplicationContextSharedBetweenServletRequests"/>
@@ -88,11 +85,6 @@
           <exclude name="testRequestScopeIsDestroyedAfterServletRequest"/>
         </methods>
       </class>
-      <class 
name="org.jboss.jsr299.tck.tests.context.request.ejb.EJBRequestContextTest">
-        <methods>
-          <exclude 
name="testRequestScopeDestroyedAfterCallToEjbTimeoutMethod"/>
-        </methods>
-      </class>
       <class 
name="org.jboss.jsr299.tck.tests.context.session.SessionContextTest">
         <methods>
           <exclude 
name="testSessionContextDestroyedWhenHttpSessionInvalidated"/>
@@ -125,17 +117,6 @@
       <class 
name="org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest">
         <methods>
           <exclude name="testCreateSFSB"/>
-          <exclude name="testSerializeSFSB"/>
-        </methods>
-      </class>
-      <class 
name="org.jboss.jsr299.tck.tests.implementation.enterprise.remove.EnterpriseBeanRemoveMethodTest">
-        <methods>
-          <exclude 
name="testApplicationCannotCallRemoveMethodOnNonDependentScopedSessionEnterpriseBean"/>
-        </methods>
-      </class>
-      <class 
name="org.jboss.jsr299.tck.tests.implementation.producer.method.definition.enterprise.EnterpriseProducerMethodDefinitionTest">
-        <methods>
-          <exclude 
name="testNonStaticProducerMethodInheritedBySpecializingSubclass"/>
         </methods>
       </class>
       <class 
name="org.jboss.jsr299.tck.tests.implementation.simple.resource.env.EnvInjectionTest">
@@ -147,9 +128,9 @@
       <class 
name="org.jboss.jsr299.tck.tests.implementation.simple.resource.persistenceContext.PersistenceContextInjectionTest">
         <methods>
           <exclude name="testBeanTypesAndBindingTypesOfPersistenceContext"/>
+          <exclude name="testInjectionOfPersistenceContext"/>
           <exclude name="testInjectionOfPersistenceUnit"/>
           <exclude name="testPassivationOfPersistenceContext"/>
-          <exclude name="testInjectionOfPersistenceContext"/>
           <exclude name="testPassivationOfPersistenceUnit"/>
         </methods>
       </class>
@@ -191,9 +172,9 @@
           <exclude name="testSpecializingAndSpecializedBeanHasName"/>
         </methods>
       </class>
-      <class 
name="org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.nonContextualReference.SessionBeanInterceptorOnNonContextualEjbReferenceTest">
+      <class 
name="org.jboss.jsr299.tck.tests.interceptors.definition.broken.nonExistantClassInBeansXml.NonExistantClassInBeansXmlTest">
         <methods>
-          <exclude name="testNonContextualSessionBeanReferenceIsIntercepted"/>
+          <exclude name="testNonExistantClassInBeansXmlNotOk"/>
         </methods>
       </class>
       <class 
name="org.jboss.jsr299.tck.tests.lookup.clientProxy.incontainer.ClientProxyTest">


Reply via email to