[jboss-cvs] JBossAS SVN: r75962 - in projects/ejb3/trunk/interceptors: src/main/java/org/jboss/ejb3/interceptors/aop and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: wolfc
Date: 2008-07-17 11:03:39 -0400 (Thu, 17 Jul 2008)
New Revision: 75962

Modified:
   projects/ejb3/trunk/interceptors/pom.xml
   projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/aop/LifecycleCallbacks.java
Log:
Have a CurrentInvocation during lifecycle callbacks

Modified: projects/ejb3/trunk/interceptors/pom.xml
===================================================================
--- projects/ejb3/trunk/interceptors/pom.xml	2008-07-17 15:02:48 UTC (rev 75961)
+++ projects/ejb3/trunk/interceptors/pom.xml	2008-07-17 15:03:39 UTC (rev 75962)
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jboss.ejb3</groupId>
     <artifactId>jboss-ejb3-build</artifactId>
-    <version>0.13.7</version>
+    <version>0.13.10</version>
     <relativePath>../build/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -52,6 +52,11 @@
       <version>2.0.0.Beta12</version>
     </dependency>
     <dependency>
+      <groupId>org.jboss.aspects</groupId>
+      <artifactId>jboss-current-invocation-aspects</artifactId>
+      <version>1.0.0.CR1</version>
+    </dependency>
+    <dependency>
       <groupId>org.jboss.logging</groupId>
       <artifactId>jboss-logging-spi</artifactId>
     </dependency>

Modified: projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/aop/LifecycleCallbacks.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/aop/LifecycleCallbacks.java	2008-07-17 15:02:48 UTC (rev 75961)
+++ projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/aop/LifecycleCallbacks.java	2008-07-17 15:03:39 UTC (rev 75962)
@@ -35,6 +35,7 @@
 import org.jboss.aop.Advisor;
 import org.jboss.aop.advice.Interceptor;
 import org.jboss.aop.advice.PerVmAdvice;
+import org.jboss.aspects.currentinvocation.CurrentInvocationInterceptor;
 import org.jboss.ejb3.interceptors.container.BeanContext;
 import org.jboss.ejb3.interceptors.lang.ClassHelper;
 
@@ -49,6 +50,11 @@
    public static Interceptor[] createLifecycleCallbackInterceptors(Advisor advisor, List<Class<?>> lifecycleInterceptorClasses, BeanContext<?> component, Class<? extends Annotation> lifecycleAnnotationType) throws Exception
    {
       List<Interceptor> interceptors = new ArrayList<Interceptor>();
+      
+      // TODO: these should come from aop.xml
+      interceptors.add(new CurrentInvocationInterceptor());
+      interceptors.add(PerVmAdvice.generateInterceptor(null, new InvocationContextInterceptor(), "setup"));
+      
       // 12.7 footnote 57: ignore method level interceptors
       // The lifecycle callbacks on the interceptors must be invoked in order
       for(Class<?> interceptorClass : lifecycleInterceptorClasses)
@@ -85,8 +91,6 @@
          }
       }
       
-      interceptors.add(0, PerVmAdvice.generateInterceptor(null, new InvocationContextInterceptor(), "setup"));
-      
       return interceptors.toArray(new Interceptor[0]);
    }