[jboss-cvs] JBossAS SVN: r62782 - in projects/aop/trunk: asintegration and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu May 3 11:44:34 EDT 2007
Author: kabir.khan at jboss.com
Date: 2007-05-03 11:44:34 -0400 (Thu, 03 May 2007)
New Revision: 62782
Modified:
projects/aop/trunk/aop/build.xml
projects/aop/trunk/asintegration/build.xml
projects/aop/trunk/asintegration/src/etc/default.mf
projects/aop/trunk/build/build.xml
projects/aop/trunk/tools/etc/buildmagic/buildmagic.ent
Log:
[JBAOP-397] Start getting the dist build together. AOP part is largely done, asintegration still to come
Modified: projects/aop/trunk/aop/build.xml
===================================================================
--- projects/aop/trunk/aop/build.xml 2007-05-03 13:03:54 UTC (rev 62781)
+++ projects/aop/trunk/aop/build.xml 2007-05-03 15:44:34 UTC (rev 62782)
@@ -57,8 +57,6 @@
-->
<target name="configure" unless="configure.disable">
- <property name="aop.version" value="jboss-aop-snapshot"/>
- <property name="aop.title" value="JBoss AOP Framework"/>
<!-- =================== -->
<!-- Basic Configuration -->
@@ -67,7 +65,6 @@
<!-- Module name(s) & version -->
<property name="module.name" value="aop"/>
<property name="module.Name" value="JBoss AOP"/>
- <property name="module.version" value="2.0.0.alpha3"/>
<!-- ========= -->
<!-- Libraries -->
@@ -435,52 +432,45 @@
<!-- ================================================================== -->
<target name="dist" depends="javadocs, init">
+<!--
<fail unless="JROCKIT_API_AVAILABLE">
To build a distribution you must have a version of JRockit available and set the jrockit.home property.
</fail>
- <copy todir="${build.lib}" filtering="no">
- <fileset dir="${jboss/common.core.lib}">
- <include name="jboss-common-core.jar"/>
+ <copy todir="${output.root}/bin" filtering="no">
+ <fileset dir="${source.res}">
+ <include name="**/*"/>
</fileset>
</copy>
- <copy todir="${build.lib}" filtering="no">
- <fileset dir="${jboss.jbossretro.lib}">
- <include name="jbossretro.jar"/>
- <include name="jbossretro-rt.jar"/>
+ <copy todir="${output.root}/docs/aspect-framework" filtering="no">
+ <fileset dir="docs">
+ <include name="api/**"/>
+ <include name="**/*.html"/>
+ <include name="**/*.pdf"/>
+ <include name="**/*.jpg"/>
+ <include name="**/*.pdf"/>
+ <include name="**/*.css"/>
+ <include name="examples/**"/>
+ <exclude name="**/CVS/**"/>
+ <exclude name="**/.svn/**"/>
+ <exclude name="**/*.wiki"/>
</fileset>
</copy>
- <copy todir="${build.lib}" filtering="no">
- <fileset dir="${jboss/backport.concurrent.lib}">
- <include name="jboss-backport-concurrent.jar"/>
+
+ <copy todir="${output.root}/src/aspect-framework" filtering="no">
+ <fileset dir="src">
+ <include name="main/**/*.java"/>
+ <include name="main/**/*.jjt"/>
+ <include name="test/**/*.java"/>
+ <include name="resources/test/**/*.xml"/>
+ <include name="resources/bin/**/*"/>
+ <exclude name="**/.svn/**"/>
+ <exclude name="**/CVS/**"/>
</fileset>
</copy>
- <copy todir="${build.lib}" filtering="no">
- <fileset dir="${javassist.lib}">
- <include name="javassist.jar"/>
- </fileset>
- </copy>
- <copy todir="${build.lib}" filtering="no">
- <fileset dir="${trove.lib}">
- <include name="trove.jar"/>
- </fileset>
- </copy>
- <copy todir="${build.lib}" filtering="no">
- <fileset dir="${qdox.qdox.lib}">
- <include name="qdox.jar"/>
- </fileset>
- </copy>
- <copy todir="${build.lib}" filtering="no">
- <fileset dir="${junit.junit.lib}">
- <include name="junit.jar"/>
- </fileset>
- </copy>
- <copy todir="docs" filtering="no">
- <fileset dir="output">
- <include name="api/**"/>
- </fileset>
- </copy>
- <delete file="jboss-aop-dist.zip"/>
+ -->
+<!--
+ <delete file="jboss-aop-dist.zip"/>
<zip zipfile="jboss-aop-dist.zip">
<zipfileset dir="${build.lib}" prefix="${aop.version}">
<include name="*.jar"/>
@@ -512,13 +502,16 @@
<zipfileset file="src/build.xml" prefix="${aop.version}"/>
<zipfileset file ="${source.etc}/jbossorg-eula.txt"/>
</zip>
+ -->
</target>
<target name="install"
description="Install the structure for a release."
- depends="all, _buildmagic:install:default"/>
+ depends="all, _buildmagic:install:default, dist"/>
- <target name="release" depends="install"/>
+ <target name="release" depends="install">
+ <echo>RELEASE</echo>
+ </target>
<target name="release-zip"
description="Builds a ZIP distribution."
Modified: projects/aop/trunk/asintegration/build.xml
===================================================================
--- projects/aop/trunk/asintegration/build.xml 2007-05-03 13:03:54 UTC (rev 62781)
+++ projects/aop/trunk/asintegration/build.xml 2007-05-03 15:44:34 UTC (rev 62782)
@@ -55,8 +55,6 @@
&modules;
<!-- Module name(s) & version -->
- <property name="aop.version" value="jboss-aop-anapshot"/>
- <property name="aop.title" value="JBoss AOP Framework"/>
<property name="aspects.title" value="JBoss Application Server integration"/>
<property name="module.name" value="asintegration"/>
@@ -343,7 +341,8 @@
<!-- Install & Release -->
<!-- ================================================================== -->
- <!-- target name="dist" depends="javadocs, init">
+ <target name="dist" depends="javadocs, init">
+ <!--
<delete file="${aop.version}.zip"/>
<copy todir="docs" filtering="no">
<fileset dir="output">
@@ -458,8 +457,33 @@
<exclude name="**/CVS/**"/>
</zipfileset>
</zip>
- </target-->
+ -->
+ </target>
+ <target name="install"
+ description="Install the structure for a release."
+ depends="all, _buildmagic:install:default, dist"/>
+
+ <target name="release" depends="install">
+ </target>
+
+ <target name="release-zip"
+ description="Builds a ZIP distribution."
+ depends="release"/>
+
+ <target name="release-tar"
+ description="Builds a TAR distribution."
+ depends="release"/>
+
+ <target name="release-tgz"
+ description="Builds a TAR-GZ distribution."
+ depends="release"/>
+
+ <target name="release-all"
+ description="Builds a distribution for each archive type."
+ depends="release-zip, release-tgz"/>
+
+
<!-- ================================================================== -->
<!-- Misc. -->
<!-- ================================================================== -->
Modified: projects/aop/trunk/asintegration/src/etc/default.mf
===================================================================
--- projects/aop/trunk/asintegration/src/etc/default.mf 2007-05-03 13:03:54 UTC (rev 62781)
+++ projects/aop/trunk/asintegration/src/etc/default.mf 2007-05-03 15:44:34 UTC (rev 62782)
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
Created-By: @java.vm.version@ (@java.vm.vendor@)
-Specification-Title: @aspects.title@
-Specification-Version: @aspects.version@
+Specification-Title: @aop.title@
+Specification-Version: @aop.version@
Specification-Vendor: @specification.vendor@
-Implementation-Title: @aspects.title@
+Implementation-Title: @aop.title@
Implementation-URL: @implementation.url@
-Implementation-Version: @aspects.version@
+Implementation-Version: @aop.version@
Implementation-Vendor: @implementation.vendor@
Implementation-Vendor-Id: @implementation.vendor.id@
Modified: projects/aop/trunk/build/build.xml
===================================================================
--- projects/aop/trunk/build/build.xml 2007-05-03 13:03:54 UTC (rev 62781)
+++ projects/aop/trunk/build/build.xml 2007-05-03 15:44:34 UTC (rev 62782)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE project [
<!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent">
+ <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
]>
<!-- ====================================================================== -->
@@ -149,16 +150,6 @@
implementation.url
</property>
- <!-- Install/Release structure -->
- <property name="install.id" value="${module.name}-${module.version}"/>
- <property name="release.id" value="${install.id}"/>
-
- <property name="install.root" value="${module.output}/${install.id}"/>
- <property name="install.bin" value="${install.root}/bin"/>
- <property name="install.docs" value="${install.root}/docs"/>
- <property name="install.etc" value="${install.root}/etc"/>
- <property name="install.lib" value="${install.root}/lib"/>
-
<!-- Bits for building source archives -->
<patternset id="source.ignore">
<exclude name="**/output/**"/>
@@ -207,14 +198,139 @@
<target name="install"
description="Install the structure for a release."
+ depends="init"
>
- <mkdir dir="output"/>
</target>
- <target name="release"
- description="Builds the default release structure."
- depends="modules-most, install"/>
+ <!-- READD THIS DEPENDENCY!!!! depends="modules-release" instead of "init" -->
+ <target name="release"
+ description="Builds the default release structure."
+ 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"/>
+
+ <!-- ================================================== -->
+ <!-- Add the files from 'aop' -->
+ <!-- ================================================== -->
+ <copy todir="${project.release}/bin" filtering="no">
+ <fileset dir="${project.root}/aop/src/resources/bin">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${project.release}/docs/aspect-framework" filtering="no">
+ <fileset dir="${project.root}/aop/docs">
+ <include name="api/**"/>
+ <include name="**/*.html"/>
+ <include name="**/*.pdf"/>
+ <include name="**/*.jpg"/>
+ <include name="**/*.pdf"/>
+ <include name="**/*.css"/>
+ <include name="examples/**"/>
+ <exclude name="**/CVS/**"/>
+ <exclude name="**/.svn/**"/>
+ <exclude name="**/*.wiki"/>
+ <exclude name="reference/**"/>
+ </fileset>
+ <fileset dir="${project.root}/aop/docs/reference/build">
+ <include name="**"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${project.release}/src/aspect-framework" filtering="no">
+ <fileset dir="${project.root}/aop/src">
+ <include name="main/**/*.java"/>
+ <include name="main/**/*.jjt"/>
+ <include name="test/**/*.java"/>
+ <include name="resources/test/**/*.xml"/>
+ <include name="resources/bin/**/*"/>
+ <exclude name="**/.svn/**"/>
+ <exclude name="**/CVS/**"/>
+ </fileset>
+ </copy>
+
+ &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.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="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 -->
+ <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"/>
+ <property name="jbossretro.location" value="${jboss.jbossretro.lib}/jbossretro.jar"/>
+ <property name="log4j.location" value="${apache.log4j.lib}/log4j.jar"/>
+ <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 -->
+
+ <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}"/>
+ <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-logging-log4j.location}"/>
+ <copy todir="${project.release}/lib-50" file="${jboss-logging-spi.location}"/>
+ <copy todir="${project.release}/lib-50" file="${log4j.location}"/>
+ <copy todir="${project.release}/lib-50" file="${trove.location}"/>
+
+ <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}"/>
+ <copy todir="${project.release}/lib-14" file="${jboss-backport-concurrent.location}"/>
+ <copy todir="${project.release}/lib-14" file="${jboss-common-core.location}"/> <!-- TODO: Needs to be JDK 1.4 version -->
+ <copy todir="${project.release}/lib-14" file="${jboss-logging-log4j.location}"/>
+ <copy todir="${project.release}/lib-14" file="${jboss-logging-spi.location}"/>
+ <copy todir="${project.release}/lib-14" file="${jbossretro.location}"/>
+ <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 -->
+ <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="${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="${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 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="${trove.location}"/>
+
+ <!-- Need the deployer.jar -->
+ <copy todir="${project.release}/jboss-50-install/lib" file="${aop.50.location}"/>
+ <copy todir="${project.release}/jboss-50-install/lib" file="${javassist.location}"/>
+ <copy todir="${project.release}/jboss-50-install/lib" file="${trove.location}"/>
+
+ <!-- ================================================== -->
+ <!-- Add the files from 'asintegration' -->
+ <!-- ================================================== -->
+
+
+ </target>
+
<target name="release-zip"
description="Builds a ZIP distribution."
depends="release, _buildmagic:release:zip"/>
@@ -248,6 +364,7 @@
<!-- Clean up all build output -->
<target name="clean" depends="createthirdparty,_buildmagic:clean, modules-clean"
description="Cleans up most generated files.">
+ <delete dir="output"/>
</target>
<!-- Clean up all generated files -->
Modified: projects/aop/trunk/tools/etc/buildmagic/buildmagic.ent
===================================================================
--- projects/aop/trunk/tools/etc/buildmagic/buildmagic.ent 2007-05-03 13:03:54 UTC (rev 62781)
+++ projects/aop/trunk/tools/etc/buildmagic/buildmagic.ent 2007-05-03 15:44:34 UTC (rev 62782)
@@ -11,6 +11,11 @@
<property name="buildmagic.ant15.baseversion" value="1.5"/>
<property name="buildmagic.ant16.baseversion" value="1.6"/>
+ <!-- Set the version of the release here -->
+ <property name="aop.version" value="jboss-aop-snapshot"/>
+ <property name="aop.title" value="JBoss AOP Framework"/>
+ <property name="module.version" value="j${aop.version}"/>
+
<!--
| Add new conditions for other supported Ant versions when they
| become avaialble.
@@ -44,7 +49,9 @@
<property name="project.build" value="${project.root}/build"/>
<property name="project.tools" value="${project.root}/tools"/>
<property name="project.thirdparty" value="${project.root}/thirdparty"/>
+ <property name="project.release" value="${project.build}/output/${aop.version}"/>
+
<!-- Setup the module environment. -->
<property name="module.root" value="${basedir}"/>
<property file="${module.root}/local.properties"/>
@@ -293,24 +300,6 @@
<!-- ================================================================== -->
<target name="_buildmagic:install:default" depends="init">
- <!-- Copy the output directory to the install directory -->
- <mkdir dir="${install.root}"/>
- <copy todir="${install.root}" filtering="no">
- <fileset dir="${module.output}">
- <include name="**/*"/>
- <exclude name="build-marker"/>
- <exclude name="classes/**"/>
- <exclude name="eclipse-classes*/**"/>
- <exclude name="etc/**"/>
- <exclude name="gen-src/**"/>
- <exclude name="mbean-marker"/>
- <exclude name="resources/**"/>
- <exclude name="${install.id}/**"/>
- <exclude name="${install.id}.zip"/>
- <exclude name="${install.id}.tar"/>
- <exclude name="${install.id}.tgz"/>
- </fileset>
- </copy>
</target>
<!-- ================================================================== -->
More information about the jboss-cvs-commits
mailing list