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

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

Author: kabir.khan at jboss.com
Date: 2007-02-21 10:32:45 -0500 (Wed, 21 Feb 2007)
New Revision: 60766

Modified:
   branches/Branch_4_2/aspects/build.xml
Log:
Improve release build

Modified: branches/Branch_4_2/aspects/build.xml
===================================================================
--- branches/Branch_4_2/aspects/build.xml	2007-02-21 15:26:58 UTC (rev 60765)
+++ branches/Branch_4_2/aspects/build.xml	2007-02-21 15:32:45 UTC (rev 60766)
@@ -55,7 +55,7 @@
       &modules;
 
       <!-- Module name(s) & version -->
-   	<property name="version.suffix" value="1.5.4.GA"/>
+   	<property name="version.suffix" value="1.5.4.SP1"/>
       <property name="aspects.version" value="jboss-aspect-library-1.5"/>
    	<!--property name="version.suffix" value="2.0.0.alpha1"/>
       <property name="aspects.version" value="jboss-aspect-library-2.0"/-->
@@ -506,7 +506,7 @@
          <zipfileset dir="${build.lib}" prefix="${aop.version}/lib">
             <include name="jboss-aspect-library.jar"/>
          </zipfileset>
-         <zipfileset dir="${jboss.aop.lib}" prefix="${aop.version}/lib">
+         <zipfileset dir="output/aop/${aop.dist.folder}" prefix="${aop.version}/lib">
             <include name="jdk14-pluggable-instrumentor.jar"/>
             <include name="jboss-aop.jar"/>
             <include name="jrockit-pluggable-instrumentor.jar"/>
@@ -533,7 +533,7 @@
          <zipfileset dir="${build.lib}" prefix="${aop.version}/jboss-32-install-jdk5">
             <include name="jboss-aspect-library-jdk50-jb32.jar"/>
          </zipfileset>
-         <zipfileset dir="${jboss.aop.lib}" prefix="${aop.version}/jboss-32-install-jdk5">
+         <zipfileset dir="output/aop/${aop.dist.folder}" prefix="${aop.version}/jboss-32-install-jdk5">
             <include name="jboss-aop-jdk50.jar"/>
          </zipfileset>
          <zipfileset dir="${javassist.lib}" prefix="${aop.version}/jboss-32-install-jdk5">
@@ -550,7 +550,7 @@
          <zipfileset dir="${build.lib}" prefix="${aop.version}/jboss-32-install">
             <include name="jboss-aspect-library32.jar"/>
          </zipfileset>
-         <zipfileset dir="${jboss.aop.lib}" prefix="${aop.version}/jboss-32-install">
+         <zipfileset dir="output/aop/${aop.dist.folder}" prefix="${aop.version}/jboss-32-install">
             <include name="jboss-aop.jar"/>
          </zipfileset>
          <zipfileset dir="${javassist.lib}" prefix="${aop.version}/jboss-32-install">
@@ -567,7 +567,7 @@
             <include name="jboss-aspect-library-jdk50.jar"/>
             <include name="jboss-aspect-jdk50-client.jar"/>
          </zipfileset>
-         <zipfileset dir="${jboss.aop.lib}" prefix="${aop.version}/lib-50">
+         <zipfileset dir="output/aop/${aop.dist.folder}" prefix="${aop.version}/lib-50">
             <include name="jboss-aop-jdk50.jar"/>
             <include name="jboss-aop-jdk50-client.jar"/>
             <include name="pluggable-instrumentor.jar"/>