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

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

Author: wolfc
Date: 2007-03-29 09:11:25 -0400 (Thu, 29 Mar 2007)
New Revision: 61845

Modified:
   trunk/build/build-thirdparty.xml
   trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
Log:
EJBTHREE-840: using aop 2.0.0.alpha4

Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml	2007-03-29 12:33:52 UTC (rev 61844)
+++ trunk/build/build-thirdparty.xml	2007-03-29 13:11:25 UTC (rev 61845)
@@ -83,7 +83,7 @@
       <componentref name="jacorb" version="2.2.4jboss.patch1"/>
       <componentref name="javassist" version="3.5.0.CR1"/>
       <componentref name="jaxen" version="1.1-beta-10"/>
-      <componentref name="jboss/aop" version="2.0.0.alpha3"/>
+      <componentref name="jboss/aop" version="2.0.0.alpha4"/>
       <componentref name="jboss/backport-concurrent" version="2.1.0.GA"/>
       <componentref name="jboss/cache" version="2.0.0.BETA1"/>
       <componentref name="jboss/common-core" version="2.0.4.Alpha"/>
@@ -135,7 +135,7 @@
       <componentref name="wutka-dtdparser" version="1.2.1"/>
       <componentref name="xdoclet" version="1.2b3"/>
       <componentref name="xmlunit-xmlunit" version="1.0"/>
-
+	  <componentref name="stax-api" version="1.0"/>
    </build>
 
    <synchronizeinfo/>

Modified: trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java	2007-03-29 12:33:52 UTC (rev 61844)
+++ trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java	2007-03-29 13:11:25 UTC (rev 61845)
@@ -177,9 +177,9 @@
       this.deployment = deployment;
       this.beanClassName = beanClassName;
       this.classloader = cl;
-
+         
       super.setChainOverridingForInheritedMethods( true );
-
+      
       try
       {
          clazz = classloader.loadClass(beanClassName);
@@ -243,7 +243,7 @@
    {
       encFactory.popEnc(this);
    }
-
+   
    public EnvironmentRefGroup getEnvironmentRefGroup()
    {
       return xml;
@@ -264,12 +264,12 @@
    {
       this.jaccContextId = jaccContextId;
    }
-
+   
    public VirtualFile getRootFile()
    {
       return getDeploymentUnit().getRootFile();
    }
-
+   
    public DeploymentUnit getDeploymentUnit()
    {
       return deployment.getDeploymentUnit();
@@ -560,7 +560,7 @@
 
       for (EncInjector injector : encInjectors.values())
       {
-         injector.inject(this);
+         injector.inject(this);   
       }
 
       // creating of injector array should come after injection into ENC as an ENC injector
@@ -583,42 +583,19 @@
    public void stop() throws Exception
    {
       encFactory.cleanupEnc(this);
-
+      
       if (pool != null)
       {
          pool.destroy();
          pool = null;
       }
-
+      
       log.info("STOPPED EJB: " + clazz.getName() + " ejbName: " + ejbName);
    }
 
    public void destroy() throws Exception
    {
-      // FIXME: temporary hack: cleanup all references from aop to here
-
-      @SuppressWarnings("unchecked")
-      Set<AspectDefinition> set = (Set<AspectDefinition>) perInstanceAspectDefinitions;
-      for(AspectDefinition def : set)
-      {
-         removePerInstanceAspect(def);
-         def.advisors.remove(this);
-      }
-      for(AspectDefinition def : ((Map<AspectDefinition,?>) perInstanceJoinpointAspectDefinitions).keySet())
-      {
-         removePerInstanceJoinpointAspect(def);
-         def.advisors.remove(this);
-      }
-      // weirdness, add/removePerClassAspect are not mirror images
-      @SuppressWarnings("unchecked")
-      Map<AspectDefinition, Interceptor> map = ((Map<AspectDefinition, Interceptor>) adviceInterceptors);
-      // without toArray, concurrent modification
-      for(AspectDefinition def : map.keySet().toArray(new AspectDefinition[0]))
-      {
-         assert def.getScope() == Scope.PER_CLASS;
-         removePerClassAspect(def);
-         def.advisors.remove(this);
-      }
+      super.cleanup();
    }
 
    protected void initializePool() throws Exception
@@ -930,7 +907,7 @@
       }
       return method.getAnnotation(annotationType);
    }
-
+   
    public <T extends Annotation> T getAnnotation(Class<T> annotationType, Method method)
    {
       return (T) resolveAnnotation(method, annotationType);
@@ -944,12 +921,12 @@
       }
       return field.getAnnotation(annotationType);
    }
-
+   
    public <T extends Annotation> T getAnnotation(Class<T> annotationType, Field field)
    {
       return (T) resolveAnnotation(field, annotationType);
    }
-
+   
    @Override
    public Object resolveAnnotation(Method m, Class annotation)
    {
@@ -957,7 +934,7 @@
       if (value == null && m.isBridge()) value = getBridgedAnnotation(m, annotation);
       return value;
    }
-
+   
    protected Object getBridgedAnnotation(Method bridgeMethod, Class annotation)
    {
       Method[] methods = bridgeMethod.getDeclaringClass().getMethods();
@@ -979,17 +956,17 @@
                      matches = false;
                   ++j;
                }
-
+               
                if (matches)
                   return resolveAnnotation(methods[i], annotation);
             }
          }
          ++i;
       }
-
+ 
       return null;
    }
-
+   
    public Object resolveAnnotation(Method m, Class[] annotationChoices)
    {
       Object value = null;
@@ -997,7 +974,7 @@
       while (value == null && i < annotationChoices.length){
          value = resolveAnnotation(m, annotationChoices[i++]);
       }
-
+      
       return value;
    }
 
@@ -1025,7 +1002,7 @@
    {
       return deployment.getEjbJndiName(link, businessInterface);
    }
-
+   
    public InvocationStatistics getInvokeStats()
    {
       return invokeStats;