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

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

Author: dimitris at jboss.org
Date: 2008-05-08 09:29:25 -0400 (Thu, 08 May 2008)
New Revision: 73152

Modified:
   trunk/aspects/build.xml
Log:
tidy up - remove unused constructs

Modified: trunk/aspects/build.xml
===================================================================
--- trunk/aspects/build.xml	2008-05-08 12:58:36 UTC (rev 73151)
+++ trunk/aspects/build.xml	2008-05-08 13:29:25 UTC (rev 73152)
@@ -225,8 +225,7 @@
       <jar destfile="${build.lib}/jboss-aspect-library-jdk50.jar" manifest="${build.etc}/default.mf"
          update="${jar.update}" index="${jar.index}">
          <fileset dir="${build.classes}">
-			   <!--include name="org/jboss/aop/deployers/JBossAspectLibrary.class"/-->
-			   <include name="org/jboss/aop/junit/**"/>
+            <include name="org/jboss/aop/junit/**"/>
             <include name="org/jboss/aspects/**"/>
          </fileset>
          <fileset dir="${build.etc}">
@@ -264,8 +263,7 @@
       <jar destfile="${build.lib}/jboss-aop-jboss5.jar" manifest="${build.etc}/default.mf"
          update="${jar.update}" index="${jar.index}">
          <fileset dir="${build.classes}">
-			   <!--include name="org/jboss/aop/deployers/JBossAspectLibrary.class"/-->
-			   <include name="org/jboss/aop/asintegration/jboss5/**"/>
+            <include name="org/jboss/aop/asintegration/jboss5/**"/>
          </fileset>
       </jar>
 
@@ -277,13 +275,9 @@
          </fileset>
       </jar>
 
-      <!-- Build client jar containing the minimum needed for ejb 3 -->
+      <!-- Build client jar containing the minimum needed for ejb3 -->
       <jar destfile="${build.lib}/jboss-aspect-jdk50-client.jar" manifest="${build.etc}/default.mf"
          update="${jar.update}" index="${jar.index}">
-         <fileset dir="${build.classes}">
-            <!-- Include everything else -->
-            <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"/>
@@ -319,28 +313,6 @@
          </fileset>
       </jar>
       <delete dir="${build.meta.inf}"/>
-
-   	<!-- FIXME Temporary until after JBoss AOP 2.0.0.beta2
-   		1) Make jboss-aop-jboss4-jdk50.jar
-   		2) Get rid of the org.jboss.aop.asintegration.jboss5 classes from jboss-aop-deployer-jdk50.jar
-
-   		Use these jars in build-distr.xml under 'ASPECTS'
-   	-->
-      <!--
-   	<mkdir dir="${build.lib}/temp"/>
-   	<unjar dest="${build.lib}/temp" src="${jboss.aop.lib}/jboss-aop-deployer-jdk50.jar"/>
-   	<jar destfile="${build.lib}/jboss-aop-jboss4-jdk50.jar" manifest="${build.lib}/temp/META-INF/MANIFEST.MF">
-   		<fileset dir="${build.lib}/temp">
-   			<include name="org/jboss/aop/asintegration/jboss4/**"/>
-   		</fileset>
-   	</jar>
-   	<jar destfile="${build.lib}/jboss-aop-deployer-jdk50.jar" manifest="${build.lib}/temp/META-INF/MANIFEST.MF">
-   		<fileset dir="${build.lib}/temp">
-   			<exclude name="org/jboss/aop/asintegration/jboss*/**"/>
-   		</fileset>
-   	</jar>
-   	<delete dir="${build.lib}/temp"/>
-      -->
    </target>
 
 
@@ -402,7 +374,6 @@
       </java>
    </target>
 
-
    <target name="run-asynch-aspect" depends="compile">
       <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/>
       <taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC" classpathref="jboss.aop.classpath"/>