[jboss-cvs] JBossAS SVN: r62997 - trunk/build.

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

Author: kabir.khan at jboss.com
Date: 2007-05-11 12:27:15 -0400 (Fri, 11 May 2007)
New Revision: 62997

Modified:
   trunk/build/build-distr.xml
   trunk/build/build-thirdparty.xml
Log:
[JBAS-4414] Move AS integration code out of trunk and into aop

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2007-05-11 16:26:56 UTC (rev 62996)
+++ trunk/build/build-distr.xml	2007-05-11 16:27:15 UTC (rev 62997)
@@ -199,44 +199,17 @@
     <property name="_module.name" value="aspects" override="true"/>
     <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
 
-    <!--
-    <condition property="aop.deployer" value="jboss-aop-jdk50.deployer">
-    <isset property="HAVE_JDK_1.5"/>
-    </condition>
-
-    <condition property="aop.deployer" value="jboss-aop.deployer">
-    <not>
-    <isset property="HAVE_JDK_1.5"/>
-    </not>
-    </condition>
-    -->
     <property name="aop.deployer" value="jboss-aop-jboss5.deployer"/>
     <!-- Copy the generated libraries -->
     <unjar src="${_module.output}/lib/${aop.deployer}" dest="${install.server}/all/deployers/${aop.deployer}"/>
 
-    <!--
-    <copy todir="${install.server}/all/deployers" filtering="no">
-      <fileset dir="${project.root}/${_module.name}/src/resources/META-INF">
-        <include name="aop-mc-int-aspect-beans.xml"/>
-      </fileset>
-    </copy>
-    -->
-
     <mkdir dir="${install.lib}"/>
     <copy todir="${install.lib}" filtering="no">
-      <fileset dir="${_module.output}/lib">
+      <fileset dir="${jboss.aop.lib}">
         <include name="jboss-aop-deployer-jdk50.jar"/>
       </fileset>
     </copy>
 
-    <!--
-    <copy todir="${install.server}/all/deployers/${aop.deployer}" filtering="no">
-      <fileset dir="${jboss.microcontainer.lib}">
-        <include name="jboss-aop-mc-int-deployer.jar"/>
-      </fileset>
-    </copy>
-    -->
-
     <!-- Copy across client jars -->
     <mkdir dir="${install.client}"/>
     <copy todir="${install.client}" filtering="no">

Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml	2007-05-11 16:26:56 UTC (rev 62996)
+++ trunk/build/build-thirdparty.xml	2007-05-11 16:27:15 UTC (rev 62997)
@@ -84,7 +84,7 @@
       <componentref name="jacorb" version="2.2.4jboss.patch1"/>
       <componentref name="javassist" version="3.5.0.CR1"/>
       <componentref name="jaxen" version="1.1-beta-10"/>
-      <componentref name="jboss/aop" version="2.0.0.alpha4"/>
+      <componentref name="jboss/aop" version="snapshot-repackage"/>
       <componentref name="jboss/backport-concurrent" version="2.1.0.GA"/>
       <componentref name="jboss/cache" version="2.0.0.BETA1"/>
       <componentref name="jboss/common-core" version="2.0.4.Alpha"/>