[jboss-cvs] JBossAS SVN: r62796 - in projects/aop/trunk: build and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu May 3 16:42:40 EDT 2007
Author: kabir.khan at jboss.com
Date: 2007-05-03 16:42:40 -0400 (Thu, 03 May 2007)
New Revision: 62796
Modified:
projects/aop/trunk/asintegration/build.xml
projects/aop/trunk/build/build.xml
Log:
[JBAOP-397] I think pretty much everything is where is should be for a future release now. I still need to verify that, and to test it in the app server
Modified: projects/aop/trunk/asintegration/build.xml
===================================================================
--- projects/aop/trunk/asintegration/build.xml 2007-05-03 20:38:54 UTC (rev 62795)
+++ projects/aop/trunk/asintegration/build.xml 2007-05-03 20:42:40 UTC (rev 62796)
@@ -236,6 +236,7 @@
<include name="org/jboss/aop/deploy*/**"/>
<exclude name="org/jboss/aop/deployers/JBossAspectLibrary.class"/>
</fileset>
+ <fileset file ="${project.root}/aop/src/etc/jbossorg-eula.txt"/>
</jar>
<!-- Build jboss-aop-as4deployer.jar for Jboss 4 with JDK 5 -->
@@ -246,6 +247,7 @@
<include name="org/jboss/aop/deploy*/**"/>
<exclude name="org/jboss/aop/deployers/*.class"/>
</fileset>
+ <fileset file ="${project.root}/aop/src/etc/jbossorg-eula.txt"/>
</jar>
<!--
@@ -292,6 +294,7 @@
<include name="org/jboss/aop/deploy*/**"/>
<exclude name="org/jboss/aop/deployers/*.class"/>
</fileset>
+ <fileset file ="${project.root}/aop/src/etc/jbossorg-eula.txt"/>
</jar>
<!--
Modified: projects/aop/trunk/build/build.xml
===================================================================
--- projects/aop/trunk/build/build.xml 2007-05-03 20:38:54 UTC (rev 62795)
+++ projects/aop/trunk/build/build.xml 2007-05-03 20:42:40 UTC (rev 62796)
@@ -208,18 +208,9 @@
depends="modules-release"
>
<delete dir="${project.release}"/>
- <mkdir dir="${project.release}"/>
- <mkdir dir="${project.release}"/>
- <mkdir dir="${project.release}/bin"/>
- <mkdir dir="${project.release}/docs/aspect-framework"/>
- <mkdir dir="${project.release}/etc"/>
- <mkdir dir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer"/>
- <mkdir dir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer"/>
- <mkdir dir="${project.release}/jboss-50-install/jboss-aop-jdk50.deployer"/>
- <mkdir dir="${project.release}/jboss-50-install/lib"/>
- <mkdir dir="${project.release}/lib-14"/>
- <mkdir dir="${project.release}/lib-50"/>
- <mkdir dir="${project.release}/src/aspect-framework"/>
+
+ <delete dir="output/temp"/>
+ <mkdir dir="output/temp"/>
<!-- ================================================== -->
<!-- Add the files from 'aop' -->
@@ -262,18 +253,52 @@
</fileset>
</copy>
+ <!-- ================================================== -->
+ <!-- Add the files from 'asintegration' -->
+ <!-- ================================================== -->
+
+ <copy todir="${project.release}/docs/aspect-deployer" filtering="no">
+ <fileset dir="${project.root}/asintegration/output">
+ <include name="api/**"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${project.release}/src/aspect-deployer" filtering="no">
+ <fileset dir="${project.root}/asintegration/src">
+ <include name="main/**/*.java"/>
+ <include name="etc/**"/>
+ <include name="resources/**"/>
+ <exclude name="**/.svn/**"/>
+ <exclude name="**/CVS/**"/>
+ </fileset>
+ </copy>
+
+ <!-- ================================================== -->
+ <!-- Now pull everything together -->
+ <!-- ================================================== -->
+
+
&libraries;
- <!-- TODO Do I need to include ant, junit, jboss-test? -->
-
+
+ <!-- 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"/>
+ <property name="aop.base-aop.location" value="${project.root}/asintegration/src/etc/base-aop.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.as5-deployer.location" value="${project.root}/asintegration/output/lib/jboss-aop-deployer.jar"/>
<property name="aop.jrockit-pluggable-instrumentor.location" value="${project.root}/aop/output/lib/jrockit-pluggable-instrumentor.jar"/>
<property name="aop.pluggable-instrumentor.location" value="${project.root}/aop/output/lib/pluggable-instrumentor.jar"/>
<property name="aop.jdk14-pluggable-instrumentor.location" value="${project.root}/aop/output/lib/jdk14-pluggable-instrumentor.jar"/>
-
+ <property name="aop.readme-as4.location" value="${project.root}/asintegration/src/etc/ReadMe-AS4.txt"/>
+ <property name="aop.readme-as5.location" value="${project.root}/asintegration/src/etc/ReadMe-AS5.txt"/>
+ <property name="aop.jboss-service.location" value="${project.root}/asintegration/src/resources/META-INF/jboss-service.xml"/>
+
<property name="javassist.location" value="${javassist.javassist.lib}/javassist.jar"/>
<property name="jboss-backport-concurrent.location" value="${jboss/backport.concurrent.lib}/jboss-backport-concurrent.jar"/>
- <!-- TODO Need a JDK 1.4 version -->
+ <!-- TODO Need a JDK 1.4 version of common-core -->
<property name="jboss-common-core.location" value="${jboss/common.core.lib}/jboss-common-core.jar"/>
<property name="jboss-logging-log4j.location" value="${jboss/common.logging.log4j.lib}/jboss-logging-log4j.jar"/>
<property name="jboss-logging-spi.location" value="${jboss/common.logging.spi.lib}/jboss-logging-spi.jar"/>
@@ -282,8 +307,12 @@
<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 -->
+ <!-- TODO We used to need common-softvalue-hashmap.jar but I cannot find any occurences in the code any more -->
+
+ <!-- Copy across the eula -->
+ <copy todir="${project.release}" file="${project.root}/aop/src/etc/jbossorg-eula.txt"/>
+ <!-- The JDK 5 libs -->
<copy todir="${project.release}/lib-50" file="${aop.50.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.jrockit-pluggable-instrumentor.location}"/>
@@ -295,6 +324,7 @@
<copy todir="${project.release}/lib-50" file="${log4j.location}"/>
<copy todir="${project.release}/lib-50" file="${trove.location}"/>
+ <!-- The JDK 1.4 libs -->
<copy todir="${project.release}/lib-14" file="${aop.14.location}"/>
<copy todir="${project.release}/lib-14" file="${aop.jdk14-pluggable-instrumentor.location}"/>
<copy todir="${project.release}/lib-14" file="${javassist.location}"/>
@@ -306,29 +336,48 @@
<copy todir="${project.release}/lib-14" file="${log4j.location}"/>
<copy todir="${project.release}/lib-14" file="${qdox.location}"/>
<copy todir="${project.release}/lib-14" file="${trove.location}"/>
-
- <!-- Need the deployer.jar -->
+
+ <!-- The JBoss 4.0.x libs for JDK 1.4 (JBoss 4.2.0 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"/>
+ </filterset>
+ </copy>
<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.as4-deployer-jdk14.location}"/>
+ <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="${javassist.location}"/><!-- Only for older jboss versions -->
+ <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}"/>
+ <copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer/META-INF/jboss-service.xml" file="output/temp/jboss-service-jdk4.xml"/>
+ <!-- The JBoss 4.0.x and 4.2.0x libs for JDK 5 -->
+ <copy file="${aop.jboss-service.location}" tofile="output/temp/jboss-service-jdk50.xml" filtering="true">
+ <filterset>
+ <filter token="SERVICE_NAME" value="org.jboss.aop.deployment.AspectManagerServiceJDK5"/>
+ </filterset>
+ </copy>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${project.root}/aop/output/lib/jboss-aop-jdk50.jar"/>
- <!-- Need the deployer.jar -->
- <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${javassist.location}"/><!-- Only for older jboss versions -->
+ <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="${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"/>
- <!-- Need the deployer.jar -->
+ <!-- The JBoss 5 libs for JDK 5 (JBoss 5 needs JDK 5) -->
<copy todir="${project.release}/jboss-50-install/lib" file="${aop.50.location}"/>
+ <copy todir="${project.release}/jboss-50-install/lib" file="${aop.as5-deployer.location}"/>
+ <copy todir="${project.release}/jboss-50-install" file="${aop.readme-as4.location}"/>
<copy todir="${project.release}/jboss-50-install/lib" file="${javassist.location}"/>
<copy todir="${project.release}/jboss-50-install/lib" file="${trove.location}"/>
+ <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}"/>
+
- <!-- ================================================== -->
- <!-- Add the files from 'asintegration' -->
- <!-- ================================================== -->
-
-
</target>
<target name="release-zip"
More information about the jboss-cvs-commits
mailing list