[jboss-cvs] JBossAS SVN: r73151 - trunk/aspects.

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

Author: dimitris at jboss.org
Date: 2008-05-08 08:58:36 -0400 (Thu, 08 May 2008)
New Revision: 73151

Modified:
   trunk/aspects/build.xml
Log:
JBAS-5411, Remove org.jboss.aspects.asynch.* from jbossas/trunk/aspects

Modified: trunk/aspects/build.xml
===================================================================
--- trunk/aspects/build.xml	2008-05-08 12:30:56 UTC (rev 73150)
+++ trunk/aspects/build.xml	2008-05-08 12:58:36 UTC (rev 73151)
@@ -232,6 +232,10 @@
          <fileset dir="${build.etc}">
             <include name="org/jboss/**/*.xml"/>
          </fileset>
+         <!-- include the broken out asynch aspects in the lib -->
+         <zipfileset src="${org.jboss.ejb3.lib}/jboss-ejb3-async.jar">
+            <include name="org/jboss/aspects/asynch/**.class"/>
+         </zipfileset>         
          <!-- include the current invocation aspects in the lib -->
          <zipfileset src="${org.jboss.aspects.lib}/jboss-current-invocation-aspects.jar">
            <include name="org/jboss/aspects/currentinvocation/**.class"/>
@@ -278,19 +282,12 @@
          update="${jar.update}" index="${jar.index}">
          <fileset dir="${build.classes}">
             <!-- Include everything else -->
-            <include name="org/jboss/aspects/asynch/AsynchExecutor.class"/>
-            <include name="org/jboss/aspects/asynch/AsynchProvider.class"/>
-            <include name="org/jboss/aspects/asynch/AsynchProxyInterceptor.class"/>
-            <include name="org/jboss/aspects/asynch/AsynchMixin.class"/>
-            <include name="org/jboss/aspects/asynch/Future.class"/>
-            <include name="org/jboss/aspects/asynch/FutureImpl.class"/>
-            <include name="org/jboss/aspects/asynch/FutureHolder.class"/>
-            <include name="org/jboss/aspects/asynch/FutureInvocationHandler.class"/>
-            <include name="org/jboss/aspects/asynch/RemotableFuture.class"/>
-            <include name="org/jboss/aspects/asynch/TimeoutException.class"/>
-            <include name="org/jboss/aspects/asynch/ThreadPoolExecutor*.class"/>
             <include name="org/jboss/aspects/security/*.*"/>
          </fileset>
+         <!-- include the broken out asynch aspects in the client lib -->
+         <zipfileset src="${org.jboss.ejb3.lib}/jboss-ejb3-async.jar">
+            <include name="org/jboss/aspects/asynch/**.class"/>
+         </zipfileset>
          <!-- include the broken out remoting aspects in the client lib -->
          <zipfileset src="${org.jboss.aspects.lib}/jboss-remoting-aspects.jar">
             <include name="org/jboss/aspects/remoting/InvokeRemoteInterceptor.class"/>