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

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

Author: wolfc
Date: 2010-12-07 09:27:27 -0500 (Tue, 07 Dec 2010)
New Revision: 109752

Modified:
   projects/ejb3/trunk/core/pom.xml
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainerInvocation.java
Log:
EJBTHREE-2179: implement effigy-aop-int


Modified: projects/ejb3/trunk/core/pom.xml
===================================================================
--- projects/ejb3/trunk/core/pom.xml	2010-12-07 14:12:03 UTC (rev 109751)
+++ projects/ejb3/trunk/core/pom.xml	2010-12-07 14:27:27 UTC (rev 109752)
@@ -48,7 +48,7 @@
     <version.org.jboss.ejb3.tx2>0.0.1</version.org.jboss.ejb3.tx2>
     <version.sun-jaxws>2.1.1</version.sun-jaxws>
     <version.org.jboss.ejb3.instantiator>1.0.0-alpha-3</version.org.jboss.ejb3.instantiator>
-    <version.org.jboss.ejb3.effigy>0.1.0</version.org.jboss.ejb3.effigy>
+    <version.org.jboss.ejb3.effigy>0.2.0-SNAPSHOT</version.org.jboss.ejb3.effigy>
     <version.org.jboss.ejb3.ejbref.resolver>1.0.0-alpha-1</version.org.jboss.ejb3.ejbref.resolver>
     <version.switchboard>1.0.0-alpha-9</version.switchboard>
     <version.org.jboss.injection>1.0.0-alpha-3</version.org.jboss.injection>
@@ -505,6 +505,12 @@
 
     <dependency>
        <groupId>org.jboss.ejb3.effigy</groupId>
+       <artifactId>jboss-ejb3-effigy-aop-int</artifactId>
+       <version>${version.org.jboss.ejb3.effigy}</version>
+    </dependency>
+
+    <dependency>
+       <groupId>org.jboss.ejb3.effigy</groupId>
        <artifactId>jboss-ejb3-effigy-common</artifactId>
        <version>${version.org.jboss.ejb3.effigy}</version>
     </dependency>

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainerInvocation.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainerInvocation.java	2010-12-07 14:12:03 UTC (rev 109751)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainerInvocation.java	2010-12-07 14:27:27 UTC (rev 109752)
@@ -24,6 +24,8 @@
 import org.jboss.aop.Advisor;
 import org.jboss.aop.MethodInfo;
 import org.jboss.aop.advice.Interceptor;
+import org.jboss.ejb3.context.spi.InvocationContext;
+import org.jboss.ejb3.effigy.EnterpriseBeanEffigy;
 import org.jboss.ejb3.interceptors.container.ContainerMethodInvocation;
 
 import java.lang.reflect.Method;
@@ -35,7 +37,7 @@
  * @version $Revision$
  */
 public abstract class EJBContainerInvocation<A extends EJBContainer, T extends BeanContext<?>> extends ContainerMethodInvocation
-   implements org.jboss.ejb3.core.context.EJBInvocation, org.jboss.ejb3.tx2.aop.EJBInvocation
+   implements org.jboss.ejb3.core.context.EJBInvocation, org.jboss.ejb3.effigy.aop.EJBInvocation, org.jboss.ejb3.tx2.aop.EJBInvocation
 {
    private static final long serialVersionUID = 4941832732679380382L;
    
@@ -61,8 +63,16 @@
    {
       return (T) super.getBeanContext();
    }
-   
+
    @Override
+   public EnterpriseBeanEffigy getEffigy()
+   {
+      // you've got to love the compiler
+      InvocationContext ctx = ((org.jboss.ejb3.core.context.EJBInvocation) this).getInvocationContext();
+      return ((EJBContainer) ctx.getEJBContext().getManager()).getEffigy();
+   }
+
+   @Override
    public void setBeanContext(org.jboss.ejb3.interceptors.container.BeanContext<?> beanCtx)
    {
       if(beanCtx != null)