[jboss-cvs] JBossAS SVN: r60772 - branches/Branch_4_2/aspects.

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

Author: kabir.khan at jboss.com
Date: 2007-02-21 11:39:40 -0500 (Wed, 21 Feb 2007)
New Revision: 60772

Modified:
   branches/Branch_4_2/aspects/build.xml
Log:
[JBAOP-364] Make sure that the jboss-aop.deployer has classes compatible with JDK 1.4. This is there the aop releases come from and building the jboss-aop.deployer with JDK 5 breaks up the releases

Modified: branches/Branch_4_2/aspects/build.xml
===================================================================
--- branches/Branch_4_2/aspects/build.xml	2007-02-21 16:29:55 UTC (rev 60771)
+++ branches/Branch_4_2/aspects/build.xml	2007-02-21 16:39:40 UTC (rev 60772)
@@ -181,8 +181,8 @@
       </path>
       <javac destdir="${build.classes}"
          optimize="${javac.optimize}"
-         target="${javac.target}"
-         source="${javac.source}"
+         target="1.4"
+         source="1.4"
          debug="${javac.debug}"
          depend="${javac.depend}"
          verbose="${javac.verbose}"
@@ -476,6 +476,16 @@
    	<delete dir="output/aop"/>
    	<unzip src="${aop.dist.jar}" dest="output/aop"/>
 
+
+      <!-- Make sure we use the aop jars from the dist rather than thirdparty -->
+      <delete file="${build.unpacked}/jboss-aop.deployer/jboss-aop.jar"/>
+      <delete file="${build.unpacked}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
+      <!--
+      <copy todir="${build.unpacked}/jboss-aop.deployer" file="output/aop/${aop.dist.folder}/jboss-aop.jar"/>
+      <copy todir="${build.unpacked}/jboss-aop-jdk50.deployer" file="output/aop/${aop.dist.folder}/jboss-aop-jdk50.jar"/>
+      -->
+
+
       <zip zipfile="${aop.version}.zip">
          <zipfileset file="output/aop/jbossorg-eula.txt" prefix="${aop.version}"/>
          <zipfileset dir="output/aop/${aop.dist.folder}/docs" prefix="${aop.version}/docs/aspect-framework">