[jboss-cvs] JBossAS SVN: r57398 - branches/Branch_4_0/aspects

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

Author: kabir.khan at jboss.com
Date: 2006-10-03 14:27:58 -0400 (Tue, 03 Oct 2006)
New Revision: 57398

Modified:
   branches/Branch_4_0/aspects/build.xml
Log:
[JBAOP-282] Make aspects build use the dist created by the aop build

Modified: branches/Branch_4_0/aspects/build.xml
===================================================================
--- branches/Branch_4_0/aspects/build.xml	2006-10-03 17:58:02 UTC (rev 57397)
+++ branches/Branch_4_0/aspects/build.xml	2006-10-03 18:27:58 UTC (rev 57398)
@@ -65,8 +65,8 @@
       <property name="module.name" value="aspects"/>
       <property name="module.Name" value="JBoss Aspects"/>
 
-   	<property name="aop.dist.jar" value="jboss-aop-dist.zip"/> 
-   	<property name="aop.dist.folder" value="jboss-aop-${version.suffix}"/> 
+   	<property name="aop.dist.jar" value="jboss-aop-dist.zip"/>
+   	<property name="aop.dist.folder" value="jboss-aop-${version.suffix}"/>
 
    	<!-- Configure thirdparty libraries -->
       <path id="library.classpath">
@@ -418,7 +418,7 @@
             <filter token="SERVICE_NAME" value="org.jboss.aop.deployment.AspectManagerServiceJDK5"/>
          </filterset>
   	  </copy>
-   	
+
    </target>
 
 
@@ -438,11 +438,11 @@
       depends="_buildmagic:clobber, clean">
    </target>
 
-   
+
    <!-- ================================================================== -->
    <!-- Install & Release                                                  -->
    <!-- ================================================================== -->
-   
+
    <target name="dist" depends="javadocs, init" description="Used for cutting the AOP releases - do not remove!">
       <delete file="${aop.version}.zip"/>
       <copy todir="docs" filtering="no">
@@ -450,9 +450,9 @@
             <include name="api/**"/>
          </fileset>
       </copy>
-      
+
       <mkdir dir="${build.unpacked}"/>
-      
+
 	  <copy todir="${build.unpacked}">
  	     <fileset dir="${build.lib}">
  	     	<include name="jboss-aop.deployer/**"/>
@@ -463,7 +463,7 @@
  	     	<include name="jboss-aop-jdk50.deployer/**"/>
  	     </fileset>
  	  </copy>
- 	  
+
  	  <!-- Files needed when installing in jboss pre 4.0.4 -->
       <copy todir="${build.unpacked}/jboss-aop.deployer" file="${jboss.aop.lib}/common-softvaluehashmap.jar"/>
       <copy todir="${build.unpacked}/jboss-aop.deployer" file="${javassist.lib}/javassist.jar"/>
@@ -471,12 +471,12 @@
       <copy todir="${build.unpacked}/jboss-aop-jdk50.deployer" file="${jboss.aop.lib}/common-softvaluehashmap.jar"/>
       <copy todir="${build.unpacked}/jboss-aop-jdk50.deployer" file="${javassist.lib}/javassist.jar"/>
       <copy todir="${build.unpacked}/jboss-aop-jdk50.deployer" file="${source.etc}/ReadMe.txt"/>
-      
+
    	<delete dir="output/aop"/>
    	<unzip src="${aop.dist.jar}" dest="output/aop"/>
-   	
+
       <zip zipfile="${aop.version}.zip">
-         <zipfileset dir="../aop/docs" prefix="${aop.version}/docs/aspect-framework">
+         <zipfileset dir="output/aop/${aop.dist.folder}/docs" prefix="${aop.version}/docs/aspect-framework">
             <include name="api/**"/>
             <include name="index.html"/>
             <include name="misc/*.html"/>
@@ -527,7 +527,7 @@
          <zipfileset dir="${beanshell.beanshell.lib}" prefix="${aop.version}/lib">
             <include name="bsh-1.3.0.jar"/>
          </zipfileset>
-         
+
          <zipfileset dir="${build.lib}" prefix="${aop.version}/jboss-32-install-jdk5">
             <include name="jboss-aspect-library-jdk50-jb32.jar"/>
          </zipfileset>
@@ -543,8 +543,8 @@
          <zipfileset dir="${jboss.aop.lib}" prefix="${aop.version}/jboss-32-install-jdk5">
             <include name="common-softvaluehashmap.jar"/>
          </zipfileset>
-         
-         
+
+
          <zipfileset dir="${build.lib}" prefix="${aop.version}/jboss-32-install">
             <include name="jboss-aspect-library32.jar"/>
          </zipfileset>
@@ -560,7 +560,7 @@
          <zipfileset dir="${jboss.aop.lib}" prefix="${aop.version}/jboss-32-install">
             <include name="common-softvaluehashmap.jar"/>
          </zipfileset>
-         
+
          <zipfileset dir="${build.lib}" prefix="${aop.version}/lib-50">
             <include name="jboss-aspect-library-jdk50.jar"/>
             <include name="jboss-aspect-jdk50-client.jar"/>
@@ -589,7 +589,7 @@
          <zipfileset dir="${beanshell.beanshell.lib}" prefix="${aop.version}/lib-50">
             <include name="bsh-1.3.0.jar"/>
          </zipfileset>
-         
+
          <zipfileset dir="output/aop/${aop.dist.folder}/src/resources/bin" prefix="${aop.version}/bin">
             <include name="*.sh"/>
             <include name="*.bat"/>
@@ -617,7 +617,7 @@
          </zipfileset>
       </zip>
    </target>
-   
+
    <!-- ================================================================== -->
    <!-- Misc.                                                              -->
    <!-- ================================================================== -->