[jboss-cvs] JBossAS SVN: r63420 - in projects/aop/trunk: aspects and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jun 8 07:40:33 EDT 2007
Author: kabir.khan at jboss.com
Date: 2007-06-08 07:40:32 -0400 (Fri, 08 Jun 2007)
New Revision: 63420
Removed:
projects/aop/trunk/tools/etc/jbossbuild/release.xml
Modified:
projects/aop/trunk/aop/build.xml
projects/aop/trunk/aspects/build.xml
projects/aop/trunk/aspects/src/etc/default.mf
projects/aop/trunk/build/build-release.xml
projects/aop/trunk/build/build-thirdparty.xml
projects/aop/trunk/build/build.xml
projects/aop/trunk/thirdparty/
Log:
Add standalone aspects to build and release structure
Modified: projects/aop/trunk/aop/build.xml
===================================================================
--- projects/aop/trunk/aop/build.xml 2007-06-08 11:32:09 UTC (rev 63419)
+++ projects/aop/trunk/aop/build.xml 2007-06-08 11:40:32 UTC (rev 63420)
@@ -120,7 +120,6 @@
<property name="build.stylesheets" value="${module.output}/stylesheets"/>
<property name="build.classes" value="${module.output}/classes"/>
<property name="build.classes.retro" value="${module.output}/classes-retro"/>
- <property name="build15.classes" value="${module.output}/classes15"/>
<property name="build.lib" value="${module.output}/lib"/>
<property name="build.api" value="${module.output}/api"/>
<property name="build.etc" value="${module.output}/etc"/>
@@ -439,7 +438,6 @@
depends="all, _buildmagic:install:default, dist"/>
<target name="release" depends="install">
- <echo>RELEASE</echo>
</target>
<target name="release-zip"
Modified: projects/aop/trunk/aspects/build.xml
===================================================================
--- projects/aop/trunk/aspects/build.xml 2007-06-08 11:32:09 UTC (rev 63419)
+++ projects/aop/trunk/aspects/build.xml 2007-06-08 11:40:32 UTC (rev 63420)
@@ -57,7 +57,7 @@
<!-- Module name(s) & version -->
<property name="aspects.version" value="jboss-aspect-library-1.3"/>
<property name="aop.version" value="jboss-aop_1.3"/>
- <property name="aspects.title" value="JBoss AOP Aspect Library"/>
+ <property name="aspects.title" value="JBoss AOP Standalone Aspect Library"/>
<property name="module.name" value="aspects"/>
<property name="module.Name" value="JBoss Aspects"/>
@@ -166,7 +166,7 @@
<target name="compile"
description="Compile all source files."
- depends="_default:compile-etc, _default:compile-resources, compile-classes, retrotranslate">
+ depends="compile-etc, _default:compile-resources, compile-classes, retrotranslate">
<!-- Add module specific elements here. -->
</target>
@@ -191,6 +191,16 @@
</javac>
</target>
+ <!-- Compile manifests -->
+ <target name="compile-etc" depends="init">
+ <mkdir dir="${build.etc}"/>
+ <copy todir="${build.etc}" filtering="yes">
+ <fileset dir="${source.etc}">
+ <include name="**"/>
+ </fileset>
+ </copy>
+ </target>
+
<target name="retrotranslate" depends="compile-classes">
<mkdir dir="${build.classes.retro}"/>
@@ -233,7 +243,7 @@
</jar>
<!-- Build jboss-standalone-aspect-library-jdk14.jar -->
- <jar destfile="${build.lib}/jboss-standalone-aspect-library-jdk50.jar" manifest="${build.etc}/default.mf"
+ <jar destfile="${build.lib}/jboss-standalone-aspect-library-jdk14.jar" manifest="${build.etc}/default.mf"
update="${jar.update}" index="${jar.index}">
<fileset dir="${build.classes}">
<include name="org/jboss/aop/junit/**"/>
@@ -247,7 +257,7 @@
<!-- Cleaning -->
<!-- ================================================================== -->
- <!-- Clean up all build output -->
+ <!-- Clean up all build output -->
<target name="clean"
description="Cleans up most generated files."
depends="_buildmagic:clean">
@@ -264,6 +274,16 @@
<!-- Install & Release -->
<!-- ================================================================== -->
+ <target name="dist" depends="javadocs, init">
+ </target>
+
+ <target name="install"
+ description="Install the structure for a release."
+ depends="all, _buildmagic:install:default, dist"/>
+
+ <target name="release" depends="install">
+ </target>
+
<!-- ================================================================== -->
<!-- Misc. -->
<!-- ================================================================== -->
Modified: projects/aop/trunk/aspects/src/etc/default.mf
===================================================================
--- projects/aop/trunk/aspects/src/etc/default.mf 2007-06-08 11:32:09 UTC (rev 63419)
+++ projects/aop/trunk/aspects/src/etc/default.mf 2007-06-08 11:40:32 UTC (rev 63420)
@@ -1,10 +1,12 @@
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-URL: @implementation.url@
-Implementation-Version: @aspects.version@
+Implementation-Version: @aop.version@
Implementation-Vendor: @implementation.vendor@
Implementation-Vendor-Id: @implementation.vendor.id@
+Premain-Class: org.jboss.aop.standalone.Agent
+Can-Redefine-Classes: true
Modified: projects/aop/trunk/build/build-release.xml
===================================================================
--- projects/aop/trunk/build/build-release.xml 2007-06-08 11:32:09 UTC (rev 63419)
+++ projects/aop/trunk/build/build-release.xml 2007-06-08 11:40:32 UTC (rev 63420)
@@ -68,14 +68,37 @@
</copy>
<!-- ================================================== -->
+ <!-- Add the files from 'aspects' -->
+ <!-- ================================================== -->
+
+ <copy todir="${project.release}/docs/aspects" filtering="no">
+ <fileset dir="${project.root}/aspects/output">
+ <include name="api/**"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${project.release}/src/aspects" filtering="no">
+ <fileset dir="${project.root}/aop/src">
+ <include name="main/**/*.java"/>
+ <include name="test/**/*.java"/>
+ <include name="resources/**"/>
+ <exclude name="**/.svn/**"/>
+ <exclude name="**/CVS/**"/>
+ </fileset>
+ </copy>
+
+
+ <!-- ================================================== -->
<!-- Now pull everything together -->
<!-- ================================================== -->
&libraries;
+ <property name="aop.14.location" value="${project.root}/aop/output/lib/jboss-aop.jar"/>
<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-library14.location" value="${project.root}/aspects/output/lib/jboss-standalone-aspect-library-jdk14.jar"/>
+ <property name="aop.aspect-library50.location" value="${project.root}/aspects/output/lib/jboss-standalone-aspect-library-jdk50.jar"/>
<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"/>
@@ -144,6 +167,7 @@
<!-- 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.aspect-library50.location}"/>
<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}"/>
@@ -158,6 +182,7 @@
<!-- The JDK 1.4 libs -->
<copy todir="${project.release}/lib-14" file="${aop.14.location}"/>
+ <copy todir="${project.release}/lib-14" file="${aop.aspect-library14.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}"/>
@@ -181,6 +206,7 @@
<copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer/build.xml" file="../asintegration/src/etc/jboss-40-install-jboss-aop-jdk14-build.xml"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk14.deployer" file="../asintegration/src/etc/jboss.properties"/>
<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.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 -->
@@ -198,7 +224,8 @@
</copy>
<copy tofile="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer/build.xml" file="../asintegration/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="../asintegration/src/etc/jboss.properties"/>
- <copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${project.root}/aop/output/lib/jboss-aop-jdk50.jar"/>
+ <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.readme-as4.location}"/>
<copy todir="${project.release}/jboss-40-install/jboss-aop-jdk50.deployer" file="${jboss-container-metadata-spi.location}"/>
@@ -212,6 +239,7 @@
<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 todir="${project.release}/jboss-50-install/jboss-aop-jboss5.deployer" file="${aop.aspect-library50.location}"/>
<copy todir="${project.release}/jboss-50-install/jboss-aop-jboss5.deployer/META-INF/" file="${aop.aspect-library-beans.location}"/>
<delete dir="output/temp"/>
Modified: projects/aop/trunk/build/build-thirdparty.xml
===================================================================
--- projects/aop/trunk/build/build-thirdparty.xml 2007-06-08 11:32:09 UTC (rev 63419)
+++ projects/aop/trunk/build/build-thirdparty.xml 2007-06-08 11:40:32 UTC (rev 63420)
@@ -21,7 +21,7 @@
<isset property="env.JBOSS_REPOSITORY"/>
</condition>
<!-- Fall back to default -->
- <property name="jbossbuild.repository" value="http://repository.jboss.com"/>
+ <property name="jbossbuild.repository" value="http://repository.jboss.org"/>
<!-- File Imports -->
<import file="../tools/etc/jbossbuild/tasks.xml"/>
@@ -45,6 +45,7 @@
-->
<componentref name="apache-log4j" version="1.2.14-brew"/>
<componentref name="dom4j" version="1.6.1jboss"/>
+ <componentref name="beanshell" version="1.3.0"/>
<componentref name="javassist" version="snapshot"/>
<componentref name="jboss/backport-concurrent" version="2.1.0.GA"/>
<componentref name="jboss/common-core" version="2.2.0.snapshot"/>
Modified: projects/aop/trunk/build/build.xml
===================================================================
--- projects/aop/trunk/build/build.xml 2007-06-08 11:32:09 UTC (rev 63419)
+++ projects/aop/trunk/build/build.xml 2007-06-08 11:40:32 UTC (rev 63420)
@@ -62,7 +62,7 @@
<!-- Module name(s) & version -->
<property name="module.name" value="jboss"/>
- <property name="module.Name" value="JBossMC Build"/>
+ <property name="module.Name" value="JBoss AOP Build"/>
<property name="module.version" value="${version.major}.${version.minor}.${version.revision}${version.tag}"/>
<!-- Defines repository.home -->
@@ -81,6 +81,7 @@
<!-- Modules -->
<module name="aop"/>
<module name="asintegration"/>
+ <module name="aspects"/>
<!-- Module groups -->
@@ -94,6 +95,7 @@
<group name="core">
<include modules="aop"/>
<include modules="asintegration"/>
+ <include modules="aspects"/>
</group>
<group name="default">
@@ -222,6 +224,12 @@
<move file="${project.release}.jar" todir="${module.output}/lib"/>
</target>
+ <target name="release-dryrun"
+ description="Builds the default release structure assuming that everything already has been built"
+ depends="init">
+ <ant antfile="build-release.xml" target="release-no-reference-docs"/>
+ <ant antfile="build-release.xml" target="release-reference-docs"/>
+ </target>
<!-- ================================================================== -->
<!-- Source Archives -->
Property changes on: projects/aop/trunk/thirdparty
___________________________________________________________________
Name: svn:ignore
- .classpath
apache-log4j
dom4j
javassist
jboss
jbossas
junit
licenses
oswego-concurrent
qdox
snmptrapappender
sun-javacc
trove
xdoclet
libraries.ent
+ .classpath
apache-log4j
dom4j
javassist
jboss
jbossas
junit
licenses
oswego-concurrent
qdox
snmptrapappender
sun-javacc
trove
xdoclet
libraries.ent
beanshell
Deleted: projects/aop/trunk/tools/etc/jbossbuild/release.xml
===================================================================
--- projects/aop/trunk/tools/etc/jbossbuild/release.xml 2007-06-08 11:32:09 UTC (rev 63419)
+++ projects/aop/trunk/tools/etc/jbossbuild/release.xml 2007-06-08 11:40:32 UTC (rev 63420)
@@ -1,152 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- JBoss, the OpenSource J2EE webOS
-
- Distributable under LGPL license.
- See terms of license at gnu.org.
--->
-
-<!-- ================================================================== -->
-<!-- JBoss AOP release build definition -->
-<!-- ================================================================== -->
-
-<project name="main.build"
- default="build"
- basedir="."
->
- <!-- Import the types -->
- <import file="../tools/etc/jbossbuild/tasks.xml"/>
-
- <!-- =============================================================== -->
- <!-- The Main project definition -->
- <!-- =============================================================== -->
-
- <build id="jboss-aop"
- impltitle="JBoss AOP"
- implversion="1.0.0-FINAL"
- implvendor="JBoss Inc."
- implurl="http://www.jboss.com/products/aop"
- description="JBoss Aspect Oriented Programming Framewoork"
- cvsroot="cvs.sourceforge.net:/cvsroot/jboss"
- thirdpartypath="../thirdparty/"
- location="http://cruisecontrol.jboss.com/repository/"
- targetdefs="targets">
-
- <!-- ============================================================ -->
- <!-- Common utilities -->
- <!-- ============================================================ -->
-
- <component id="common"
- version="5.0-SNAPSHOT"
- >
- <artifact id="jboss-common.jar" release="lib"/>
- <artifact id="jboss-common-client.jar"/>
- <artifact id="namespace.jar"/>
- </component>
-
- <includes id="common-project">
- <include input="jboss-common.jar"/>
- <include input="namespace.jar"/>
- </includes>
-
- <!-- ============================================================ -->
- <!-- Container -->
- <!-- ============================================================ -->
-
- <component id="container"
- version="5.0-SNAPSHOT"
- >
- <artifact id="jboss-container.jar"/>
- </component>
-
- <includes id="container-project">
- <include input="jboss-container.jar"/>
- </includes>
-
- <!-- ============================================================ -->
- <!-- AOP -->
- <!-- ============================================================ -->
-
- <component id="aop"
- module="jboss-aop"
- version="1.0.0-FINAL"
- >
- <artifact id="jboss-aop.jar" release="lib"/>
- </component>
-
- <includes id="aop-project">
- <include input="jboss-aop.jar"/>
- </includes>
-
- <!-- ============================================================ -->
- <!-- QDox -->
- <!-- ============================================================ -->
-
- <component id="qdox"
- version="1.4">
- <artifact id="qdox.jar" release="lib"/>
- </component>
-
- <includes id="qdox-lib">
- <include input="qdox.jar"/>
- </includes>
-
- <!-- ============================================================ -->
- <!-- Javassist -->
- <!-- ============================================================ -->
-
- <component id="javassist"
- version="3.0beta">
- <artifact id="javassist.jar" release="lib"/>
- </component>
-
- <includes id="javassist-lib">
- <include input="javassist.jar"/>
- </includes>
-
- <!-- ============================================================ -->
- <!-- Trove -->
- <!-- ============================================================ -->
-
- <component id="trove"
- version="2.1.1">
- <artifact id="trove.jar" release="lib"/>
- </component>
-
- <includes id="trove-lib">
- <include input="trove.jar"/>
- </includes>
-
- <!-- ============================================================ -->
- <!-- Oswego Concurrent Library -->
- <!-- ============================================================ -->
-
- <component id="oswego-concurrent"
- version="1.0">
- <artifact id="concurrent.jar" release="lib"/>
- </component>
-
- <includes id="concurrent">
- <include input="concurrent.jar"/>
- </includes>
-
-
- <!-- ============================================================ -->
- <!-- JUnit -->
- <!-- ============================================================ -->
-
- <component id="junit-junit"
- version="3.8.1">
- <artifact id="junit.jar" release="lib"/>
- </component>
-
- <includes id="junit">
- <include input="junit.jar"/>
- </includes>
- </build>
-
- <!-- Generate the targets -->
- <generate generate="jboss-aop"/>
-
-</project>
More information about the jboss-cvs-commits
mailing list