[jboss-cvs] JBossAS SVN: r74322 - in projects/aop/trunk: build and 1 other directory.

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

Author: flavia.rainone at jboss.com
Date: 2008-06-09 18:51:30 -0400 (Mon, 09 Jun 2008)
New Revision: 74322

Modified:
   projects/aop/trunk/aop/build.xml
   projects/aop/trunk/build/build-release.xml
Log:
[JBAOP-533] Added script that generates a single jar.

Modified: projects/aop/trunk/aop/build.xml
===================================================================
--- projects/aop/trunk/aop/build.xml	2008-06-09 22:13:07 UTC (rev 74321)
+++ projects/aop/trunk/aop/build.xml	2008-06-09 22:51:30 UTC (rev 74322)
@@ -448,6 +448,19 @@
          </fileset>
          <fileset file ="${source.etc}/jbossorg-eula.txt"/>
       </jar>
+      
+      <jar jarfile="${build.lib}/jboss-aop-jdk50-single.jar" manifest="${build.etc}/default.mf">
+         <zipfileset src="${build.lib}/jboss-aop-jdk50.jar"/>
+         <zipfileset src="${javassist.javassist.lib}/javassist.jar"/>
+         <zipfileset src="${jboss/common.core.lib}/jboss-common-core.jar"/>
+         <zipfileset src="${jboss/jboss.reflect.lib}/jboss-reflect.jar"/>
+         <zipfileset src="${jboss/jboss.mdr.lib}/jboss-mdr.jar"/>
+         <zipfileset src="${jboss/common.logging.log4j.lib}/jboss-logging-log4j.jar"/>
+         <zipfileset src="${jboss/common.logging.spi.lib}/jboss-logging-spi.jar"/>
+         <zipfileset src="${apache.log4j.lib}/log4j.jar"/>
+         <zipfileset src="${trove.trove.lib}/trove.jar"/>
+         <fileset file ="${source.etc}/jbossorg-eula.txt"/>
+      </jar>
    </target>
 
 	<target name="source-jar" depends="compile-etc">
@@ -580,7 +593,6 @@
          <source file="${source.java}/org/jboss/aop/MethodByConInfo.java"/>
          <source file="${source.java}/org/jboss/aop/MethodByMethodInfo.java"/>
          <source file="${source.java}/org/jboss/aop/MethodInfo.java"/>
-         <source file="${source.java}/org/jboss/aop/GeneratedAdvised.java"/>
          <source file="${source.java}/org/jboss/aop/InstanceAdvised.java"/>
          <source file="${source.java}/org/jboss/aop/InstanceAdvisor.java"/>
          <source file="${source.java}/org/jboss/aop/InstanceDomain.java"/> <!--?? Keep this one here?? -->

Modified: projects/aop/trunk/build/build-release.xml
===================================================================
--- projects/aop/trunk/build/build-release.xml	2008-06-09 22:13:07 UTC (rev 74321)
+++ projects/aop/trunk/build/build-release.xml	2008-06-09 22:51:30 UTC (rev 74322)
@@ -125,6 +125,7 @@
       &libraries;
 
       <property name="aop.50.location" value="${project.root}/aop/output/lib/jboss-aop-jdk50.jar"/>
+      <property name="aop.50.single.location" value="${project.root}/aop/output/lib/jboss-aop-jdk50-single.jar"/>
       <property name="aop.aspect-library50.location" value="${project.root}/aspects/output/lib/jboss-standalone-aspect-library-jdk50.jar"/>
       <property name="aop.as4-deployer.location" value="${project.root}/asintegration/output/lib/jboss-aop-as4-deployer.jar"/>
       <property name="aop.jboss4.jdk50.location" value="${project.root}/asintegration/output/lib/jboss-aop-jboss4-jdk50.jar"/>
@@ -154,6 +155,7 @@
 
       <!-- The JDK 5 libs -->
       <copy todir="${project.release}/lib-50" file="${aop.50.location}"/>
+      <copy todir="${project.release}/lib-50" file="${aop.50.single.location}"/>
       <copy todir="${project.release}/lib-50" file="${project.root}/aop/output/lib/jboss-aop-jdk50-client.jar"/>
       <copy todir="${project.release}/lib-50" file="${aop.aspect-library50.location}"/>
       <copy todir="${project.release}/lib-50" file="${aop.jrockit-pluggable-instrumentor.location}"/>