[jboss-cvs] JBossAS SVN: r61429 - in projects/ejb3/trunk: ejb3-core and 2 other directories.

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

Author: wolfc
Date: 2007-03-19 06:57:27 -0400 (Mon, 19 Mar 2007)
New Revision: 61429

Added:
   projects/ejb3/trunk/ejb3-core/
Modified:
   projects/ejb3/trunk/ejb3-core/.project
   projects/ejb3/trunk/ejb3-core/src/main/org/jboss/ejb3/EJBContainer.java
   projects/ejb3/trunk/ejb3-core/src/resources/test-configs/libdeployment/lib/libdeployment.jar
Log:
Raw commit, doesn't compile

Copied: projects/ejb3/trunk/ejb3-core (from rev 61425, trunk/ejb3)

Modified: projects/ejb3/trunk/ejb3-core/.project
===================================================================
--- trunk/ejb3/.project	2007-03-19 10:04:38 UTC (rev 61425)
+++ projects/ejb3/trunk/ejb3-core/.project	2007-03-19 10:57:27 UTC (rev 61429)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>ejb3</name>
+	<name>ejb3-core</name>
 	<comment></comment>
 	<projects>
 	</projects>

Modified: projects/ejb3/trunk/ejb3-core/src/main/org/jboss/ejb3/EJBContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java	2007-03-19 10:04:38 UTC (rev 61425)
+++ projects/ejb3/trunk/ejb3-core/src/main/org/jboss/ejb3/EJBContainer.java	2007-03-19 10:57:27 UTC (rev 61429)
@@ -544,30 +544,7 @@
 
    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

Modified: projects/ejb3/trunk/ejb3-core/src/resources/test-configs/libdeployment/lib/libdeployment.jar
===================================================================
(Binary files differ)