[jboss-cvs] JBossAS SVN: r62967 - projects/aop/trunk/build.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu May 10 11:37:44 EDT 2007
Author: kabir.khan at jboss.com
Date: 2007-05-10 11:37:44 -0400 (Thu, 10 May 2007)
New Revision: 62967
Modified:
projects/aop/trunk/build/build-release.xml
Log:
[JBAOP-397] Create a subset metadata jar from the jboss-container.jar and add to the AS 4.x deployers so that we can run there
Modified: projects/aop/trunk/build/build-release.xml
===================================================================
--- projects/aop/trunk/build/build-release.xml 2007-05-10 13:16:55 UTC (rev 62966)
+++ projects/aop/trunk/build/build-release.xml 2007-05-10 15:37:44 UTC (rev 62967)
@@ -9,7 +9,7 @@
>
<delete dir="output/temp"/>
<mkdir dir="output/temp"/>
-
+
<!-- ================================================== -->
<!-- Add the files from 'aop' -->
<!-- ================================================== -->
@@ -78,8 +78,6 @@
&libraries;
- <!-- TODO Do I need to include ant, junit, jboss-test? -->
-
<property name="aop.50.location" value="${project.root}/aop/output/lib/jboss-aop-jdk50.jar"/>
<property name="aop.14.location" value="${project.root}/aop/output/lib/jboss-aop.jar"/>
<property name="aop.aspect-library-beans.location" value="${project.root}/asintegration/src/resources/META-INF/jboss-aspect-library-beans.xml"/>
@@ -109,7 +107,41 @@
<property name="qdox.location" value="${qdox.qdox.lib}/qdox.jar"/>
<property name="trove.location" value="${trove.trove.lib}/trove.jar"/>
- <!-- TODO We used to need common-softvalue-hashmap.jar but I cannot find any occurences in the code any more -->
+ <!--
+ Create the MC container.jar subset with org.jboss.metadata.spi since those files do not exist in JBoss 4.0.x or 4.2.x. This
+ should be redundant once the mc is properly released. The maven build for container MC already creates the
+ jboss-container-metadata-spi.jar, but does not exist in any repository yet.
+ http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4044342#4044342
+ -->
+ <mkdir dir="output/temp/jboss-container-metadata-spi"/>
+ <mkdir dir="output/temp/jboss-container-metadata-spi14"/>
+ <unjar src="${jboss-container.location}" dest="output/temp/jboss-container-metadata-spi"/>
+ <unjar src="${jboss-container14.location}" dest="output/temp/jboss-container-metadata-spi14"/>
+ <!-- delete>
+ <fileset dir="output/temp/jboss-container-metadata-spi">
+ <exclude name="org/jboss/metadata/spi/**"/>
+ <include name="**/*"/>
+ </fileset>
+ </delete>
+ <delete>
+ <fileset dir="output/temp/jboss-container-metadata-spi14">
+ <exclude name="org/jboss/metadata/spi/**"/>
+ <include name="**/*"/>
+ </fileset>
+ </delete -->
+ <jar
+ destfile="output/temp/jboss-container-metadata-spi.jar"
+ basedir="output/temp/jboss-container-metadata-spi"
+ includes="org/jboss/metadata/spi/**"
+ manifest="output/temp/jboss-container-metadata-spi/META-INF/MANIFEST.MF"/>
+ <jar
+ destfile="output/temp/jboss-container-metadata-spi14.jar"
+ basedir="output/temp/jboss-container-metadata-spi14"
+ includes="org/jboss/metadata/spi/**"
+ manifest="output/temp/jboss-container-metadata-spi14/META-INF/MANIFEST.MF"/>
+
+ <property name="jboss-container-metadata-spi.location" value="output/temp/jboss-container-metadata-spi.jar"/>
+ <property name="jboss-container-metadata-spi14.location" value="output/temp/jboss-container-metadata-spi14.jar"/>
<!-- Copy across the eula -->
<copy todir="${project.release}" file="${project.root}/aop/src/etc/jbossorg-eula.txt"/>
@@ -121,7 +153,7 @@
<copy todir="${project.release}/lib-50" file="${aop.pluggable-instrumentor.location}"/>
<copy todir="${project.release}/lib-50" file="${javassist.location}"/>
<copy todir="${project.release}/lib-50" file="${jboss-common-core.location}"/>
- <copy todir="${project.release}/lib-50" file="${jboss-container.location}"/>
+ <copy todir="${project.release}/lib-50" file="${jboss-container-metadata-spi.location}"/>
<copy todir="${project.release}/lib-50" file="${jboss-logging-log4j.location}"/>
<copy todir="${project.release}/lib-50" file="${jboss-logging-spi.location}"/>
<copy todir="${project.release}/lib-50" file="${log4j.location}"/>
@@ -134,7 +166,7 @@
<copy todir="${project.release}/lib-14" file="${aop.jdk14-pluggable-instrumentor.location}"/>
<copy todir="${project.release}/lib-14" file="${javassist.location}"/>
<copy todir="${project.release}/lib-14" file="${jboss-backport-concurrent.location}"/>
- <copy todir="${project.release}/lib-14" file="${jboss-common-core14.location}"/>
+ <copy todir="${project.release}/lib-14" file="${jboss-container-metadata-spi14.location}"/>
<copy todir="${project.release}/lib-14" file="${jboss-container14.location}"/>
<copy todir="${project.release}/lib-14" file="${jboss-logging-log4j.location}"/>
<copy todir="${project.release}/lib-14" file="${jboss-logging-spi.location}"/>
@@ -155,6 +187,7 @@
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer/" file="${aop.base-aop.location}"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer/" file="${aop.readme-as4.location}"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer" file="${jboss-backport-concurrent.location}"/><!-- TODO figure out for what versions of jboss this is necessary, and if it exists in other locations -->
+ <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer" file="${jboss-container-metadata-spi14.location}"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer" file="${javassist.location}"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer" file="${jbossretro.location}"/><!-- TODO figure out for what versions of jboss this is necessary, and if it exists in other locations -->
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer" file="${trove.location}"/>
@@ -170,6 +203,7 @@
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${aop.as4-deployer.location}"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/" file="${aop.base-aop.location}"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/" file="${aop.readme-as4.location}"/>
+ <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${jboss-container-metadata-spi.location}"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${javassist.location}"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${trove.location}"/>
<copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/META-INF/jboss-service.xml" file="output/temp/jboss-service-jdk50.xml"/>
@@ -183,6 +217,7 @@
<copy tofile="${project.release}/jboss-50-install/jboss-aop-jboss5.deployer/base-aspects.xml" file="${aop.base-aop.location}"/>
<copy todir="${project.release}/jboss-50-install/jboss-aop-jboss5.deployer/META-INF/" file="${aop.aspect-library-beans.location}"/>
+ <delete dir="output/temp"/>
</target>
</project>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list