[jboss-cvs] JBossAS SVN: r66538 - in projects/aop/trunk: asintegration/src/main/org/jboss/aop/asintegration and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Oct 29 12:48:38 EDT 2007
Author: kabir.khan at jboss.com
Date: 2007-10-29 12:48:38 -0400 (Mon, 29 Oct 2007)
New Revision: 66538
Removed:
projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/
Modified:
projects/aop/trunk/asintegration/build.xml
projects/aop/trunk/build/build-release.xml
projects/aop/trunk/build/build.xml
Log:
[JBAOP-107] Move jboss 5 integration code out of aop source
Break out jar for integration with jboss 4
Modified: projects/aop/trunk/asintegration/build.xml
===================================================================
--- projects/aop/trunk/asintegration/build.xml 2007-10-29 16:35:29 UTC (rev 66537)
+++ projects/aop/trunk/asintegration/build.xml 2007-10-29 16:48:38 UTC (rev 66538)
@@ -211,12 +211,11 @@
<mkdir dir="${build.lib}"/>
<!-- Build jboss-aspect-deployer.jar for jboss 5 -->
- <!-- TODO I would like to call this jboss-aop-deployer.jar instead, and update name in appserver trunk -->
<jar destfile="${build.lib}/jboss-aop-deployer-jdk50.jar" manifest="${build.etc}/default.mf"
update="${jar.update}" index="${jar.index}">
<fileset dir="${build.classes}">
<!-- Include everything else -->
- <include name="org/jboss/aop/asintegration/**"/>
+ <include name="org/jboss/aop/asintegration/*"/>
<include name="org/jboss/aop/classpool/**"/>
<include name="org/jboss/aop/deploy*/**"/>
<include name="org/jboss/aop/domain/**"/>
@@ -229,7 +228,7 @@
update="${jar.update}" index="${jar.index}">
<fileset dir="${build.classes}">
<!-- Include everything else -->
- <include name="org/jboss/aop/asintegration/**"/>
+ <include name="org/jboss/aop/asintegration/*"/>
<include name="org/jboss/aop/classpool/**"/>
<include name="org/jboss/aop/deploy*/**"/>
<include name="org/jboss/aop/domain/**"/>
@@ -237,6 +236,15 @@
</fileset>
<fileset file ="${project.root}/aop/src/etc/jbossorg-eula.txt"/>
</jar>
+
+ <jar destfile="${build.lib}/jboss-aop-jboss4-jdk50.jar" manifest="${build.etc}/default.mf"
+ update="${jar.update}" index="${jar.index}">
+ <fileset dir="${build.classes}">
+ <!-- Include everything else -->
+ <include name="org/jboss/aop/asintegration/jboss4/**"/>
+ </fileset>
+ <fileset file ="${project.root}/aop/src/etc/jbossorg-eula.txt"/>
+ </jar>
</target>
@@ -257,7 +265,16 @@
<fileset file ="${project.root}/aop/src/etc/jbossorg-eula.txt"/>
</jar>
- <!-- Generate checksums -->
+ <jar destfile="${build.lib}/jboss-aop-jboss4-jdk14.jar" manifest="${build.etc}/default.mf"
+ update="${jar.update}" index="${jar.index}">
+ <fileset dir="${build.classes.retro}">
+ <!-- Include everything else -->
+ <include name="org/jboss/aop/asintegration/jboss4/**"/>
+ </fileset>
+ <fileset file ="${project.root}/aop/src/etc/jbossorg-eula.txt"/>
+ </jar>
+
+ <!-- Generate checksums -->
<call target="_default:compile-checksums"/>
</target>
Modified: projects/aop/trunk/build/build-release.xml
===================================================================
--- projects/aop/trunk/build/build-release.xml 2007-10-29 16:35:29 UTC (rev 66537)
+++ projects/aop/trunk/build/build-release.xml 2007-10-29 16:48:38 UTC (rev 66538)
@@ -102,6 +102,8 @@
<property name="aop.aspect-library-beans.location" value="${project.root}/asintegration/src/resources/META-INF/jboss-aspect-library-beans.xml"/>
<property name="aop.as4-deployer.location" value="${project.root}/asintegration/output/lib/jboss-aop-as4-deployer.jar"/>
<property name="aop.as4-deployer-jdk14.location" value="${project.root}/asintegration/output/lib/jboss-aop-as4-deployer-jdk14.jar"/>
+ <property name="aop.jboss4.jdk50.location" value="${project.root}/asintegration/output/lib/jboss-aop-jboss4-jdk50.jar"/>
+ <property name="aop.jboss4.jdk14.location" value="${project.root}/asintegration/output/lib/jboss-aop-jboss4-jdk14.jar"/>
<!-- TODO I would like to call this jboss-aop-deployer.jar instead, and update name in appserver trunk -->
<property name="aop.as5-deployer.location" value="${project.root}/asintegration/output/lib/jboss-aop-deployer-jdk50.jar"/>
<property name="aop.jrockit-pluggable-instrumentor.location" value="${project.root}/aop/output/lib/jrockit-pluggable-instrumentor.jar"/>
@@ -200,7 +202,6 @@
<copy todir="${project.release}/lib-14" file="${trove.location}"/>
<!-- The JBoss 4.0.x libs for JDK 1.4 (JBoss 4.2.x needs JDK 5)-->
-
<copy file="${aop.jboss-service.location}" tofile="output/temp/jboss-service-jdk4.xml" filtering="true">
<filterset>
<filter token="SERVICE_NAME" value="org.jboss.aop.deployment.AspectManagerService"/>
@@ -212,6 +213,7 @@
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer" file="${aop.14.location}"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer" file="${aop.aspect-library14.location}"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer" file="${aop.as4-deployer-jdk14.location}"/>
+ <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer" file="${aop.jboss4.jdk14.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}"/>
@@ -232,6 +234,7 @@
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${aop.50.location}"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${aop.aspect-library50.location}"/>
<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.jboss4.jdk50.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="${jboss-container-annotation.location}"/>
Modified: projects/aop/trunk/build/build.xml
===================================================================
--- projects/aop/trunk/build/build.xml 2007-10-29 16:35:29 UTC (rev 66537)
+++ projects/aop/trunk/build/build.xml 2007-10-29 16:48:38 UTC (rev 66538)
@@ -350,6 +350,7 @@
<fileset dir="../asintegration/output/lib">
<include name="jboss-aop-as4-deployer.jar"/>
<include name="jboss-aop-deployer-jdk50.jar"/>
+ <include name="jboss-aop-jboss4-jdk50.jar"/>
<include name="jboss-asintegration-src.zip"/>
</fileset>
<fileset dir="../aspects/output/lib">
@@ -372,6 +373,7 @@
</fileset>
<fileset dir="../asintegration/output/lib">
<include name="jboss-aop-as4-deployer-jdk14.jar"/>
+ <include name="jboss-aop-jboss4-jdk14.jar"/>
<include name="jboss-asintegration-src.zip"/>
</fileset>
<fileset dir="../aspects/output/lib">
More information about the jboss-cvs-commits
mailing list