[jboss-cvs] JBossAS SVN: r62749 - in projects/aop/trunk: asintegration and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed May 2 14:10:36 EDT 2007
Author: kabir.khan at jboss.com
Date: 2007-05-02 14:10:36 -0400 (Wed, 02 May 2007)
New Revision: 62749
Added:
projects/aop/trunk/asintegration/build.bat
projects/aop/trunk/asintegration/build.sh
projects/aop/trunk/asintegration/build.xml
Modified:
projects/aop/trunk/aop/build.xml
projects/aop/trunk/build/build.xml
projects/aop/trunk/thirdparty/
projects/aop/trunk/tools/etc/buildmagic/modules.ent
Log:
[JBAOP-397] Add asintegration to main build and generate the main output from asintegration
Modified: projects/aop/trunk/aop/build.xml
===================================================================
--- projects/aop/trunk/aop/build.xml 2007-05-02 17:46:46 UTC (rev 62748)
+++ projects/aop/trunk/aop/build.xml 2007-05-02 18:10:36 UTC (rev 62749)
@@ -57,7 +57,7 @@
-->
<target name="configure" unless="configure.disable">
- <property name="aop.version" value="jboss-aop-2.0.0.alpha3"/>
+ <property name="aop.version" value="jboss-aop-snapshot"/>
<property name="aop.title" value="JBoss AOP Framework"/>
<!-- =================== -->
@@ -494,6 +494,7 @@
<include name="docs/**/*.css"/>
<include name="docs/examples/**"/>
<exclude name="docs/**/CVS/**"/>
+ <exclude name="docs/**/.svn/**"/>
<exclude name="docs/**/*.wiki"/>
</zipfileset>
<zipfileset dir="." prefix="${aop.version}">
@@ -505,6 +506,7 @@
<include name="src/resources/test/**/*.xml"/>
<include name="src/resources/bin/**/*"/>
<include name="src/resources/xdoclet/META-INF/*.xml"/>
+ <exclude name="src/**/.svn/**"/>
<exclude name="src/**/CVS/**"/>
</zipfileset>
<zipfileset file="src/build.xml" prefix="${aop.version}"/>
Added: projects/aop/trunk/asintegration/build.bat
===================================================================
--- projects/aop/trunk/asintegration/build.bat (rev 0)
+++ projects/aop/trunk/asintegration/build.bat 2007-05-02 18:10:36 UTC (rev 62749)
@@ -0,0 +1,98 @@
+ at echo off
+
+REM ======================================================================
+REM
+REM This is the main entry point for the build system.
+REM
+REM ======================================================================
+REM
+REM $Id: build.bat 24241 2004-10-04 19:50:04Z kabkhan $
+REM
+REM Authors:
+REM Jason Dillon <jason at planet57.com>
+REM Sacha Labourey <sacha.labourey at cogito-info.ch>
+REM
+
+REM ******************************************************
+REM Ignore the ANT_HOME variable: we want to use *our*
+REM ANT version and associated JARs.
+REM ******************************************************
+REM Ignore the users classpath, cause it might mess
+REM things up
+REM ******************************************************
+
+SETLOCAL
+
+set CLASSPATH=
+set ANT_HOME=
+set ANT_OPTS=
+
+REM ******************************************************
+REM - "for" loops have been unrolled for compatibility
+REM with some WIN32 systems.
+REM ******************************************************
+
+set NAMES=tools;
+set SUBFOLDERS=..;..\..;..\..\..;..\..\..\..
+
+REM ******************************************************
+REM ******************************************************
+
+SET EXECUTED=FALSE
+for %%i in (%NAMES%) do call :subLoop %%i %*
+
+goto :EOF
+
+
+REM ******************************************************
+REM ********* Search for names in the subfolders *********
+REM ******************************************************
+
+:subLoop
+SET SUBDIR=%1
+SHIFT
+
+set OTHER_ARGS=
+:setupArgs
+if %1a==a goto doneSetupArgs
+set OTHER_ARGS=%OTHER_ARGS% %1
+shift
+goto setupArgs
+:doneSetupArgs
+
+for %%j in (%SUBFOLDERS%) do call :testIfExists %%j\%SUBDIR%\bin\ant.bat -logger org.apache.tools.ant.NoBannerLogger %OTHER_ARGS%
+
+goto :EOF
+
+
+REM ******************************************************
+REM ************ Test if ANT Batch file exists ***********
+REM ******************************************************
+
+:testIfExists
+if exist %1 call :BatchFound %*
+
+goto :EOF
+
+
+REM ******************************************************
+REM ************** Batch file has been found *************
+REM ******************************************************
+
+:BatchFound
+if (%EXECUTED%)==(FALSE) call :ExecuteBatch %*
+set EXECUTED=TRUE
+
+goto :EOF
+
+REM ******************************************************
+REM ************* Execute Batch file only once ***********
+REM ******************************************************
+
+:ExecuteBatch
+echo Calling %*
+call %*
+
+:end
+
+pause
Added: projects/aop/trunk/asintegration/build.sh
===================================================================
--- projects/aop/trunk/asintegration/build.sh (rev 0)
+++ projects/aop/trunk/asintegration/build.sh 2007-05-02 18:10:36 UTC (rev 62749)
@@ -0,0 +1,172 @@
+#!/bin/sh
+### ====================================================================== ###
+## ##
+## This is the main entry point for the build system. ##
+## ##
+## Users should be sure to execute this file rather than 'ant' to ensure ##
+## the correct version is being used with the correct configuration. ##
+## ##
+### ====================================================================== ###
+
+# $Id: build.sh 24242 2004-10-04 20:13:37Z andd $
+
+PROGNAME=`basename $0`
+DIRNAME=`dirname $0`
+GREP="grep"
+ROOT="/"
+
+# Ignore user's ANT_HOME if it is set
+ANT_HOME=""
+
+# the default search path for ant
+ANT_SEARCH_PATH="\
+ tools
+ tools/ant \
+ tools/apache/ant \
+ ant"
+
+# the default build file name
+ANT_BUILD_FILE="build.xml"
+
+# the default arguments
+ANT_OPTIONS="-find $ANT_BUILD_FILE"
+
+# Use the maximum available, or set MAX_FD != -1 to use that
+MAX_FD="maximum"
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false;
+darwin=false;
+case "`uname`" in
+ CYGWIN*)
+ cygwin=true
+ ;;
+
+ Darwin*)
+ darwin=true
+ ;;
+esac
+
+#
+# Helper to complain.
+#
+die() {
+ echo "${PROGNAME}: $*"
+ exit 1
+}
+
+#
+# Helper to complain.
+#
+warn() {
+ echo "${PROGNAME}: $*"
+}
+
+#
+# Helper to source a file if it exists.
+#
+maybe_source() {
+ for file in $*; do
+ if [ -f "$file" ]; then
+ . $file
+ fi
+ done
+}
+
+search() {
+ search="$*"
+ for d in $search; do
+ ANT_HOME="`pwd`/$d"
+ ANT="$ANT_HOME/bin/ant"
+ if [ -x "$ANT" ]; then
+ # found one
+ echo $ANT_HOME
+ break
+ fi
+ done
+}
+
+#
+# Main function.
+#
+main() {
+ # if there is a build config file. then source it
+ maybe_source "$DIRNAME/build.conf" "$HOME/.build.conf"
+
+ # Increase the maximum file descriptors if we can
+ if [ $cygwin = "false" ]; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ]; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then
+ # use the system max
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ]; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+ fi
+
+ # try the search path
+ ANT_HOME=`search $ANT_SEARCH_PATH`
+
+ # try looking up to root
+ if [ "x$ANT_HOME" = "x" ]; then
+ target="build"
+ _cwd=`pwd`
+
+ while [ "x$ANT_HOME" = "x" ] && [ "$cwd" != "$ROOT" ]; do
+ cd ..
+ cwd=`pwd`
+ ANT_HOME=`search $ANT_SEARCH_PATH`
+ done
+
+ # make sure we get back
+ cd $_cwd
+
+ if [ "$cwd" != "$ROOT" ]; then
+ found="true"
+ fi
+
+ # complain if we did not find anything
+ if [ "$found" != "true" ]; then
+ die "Could not locate Ant; check \$ANT or \$ANT_HOME."
+ fi
+ fi
+
+ # make sure we have one
+ ANT=$ANT_HOME/bin/ant
+ if [ ! -x "$ANT" ]; then
+ die "Ant file is not executable: $ANT"
+ fi
+
+ # need to specify planet57/buildmagic protocol handler package
+ ANT_OPTS="-Djava.protocol.handler.pkgs=org.jboss.net.protocol"
+
+ # setup some build properties
+ ANT_OPTS="$ANT_OPTS -Dbuild.script=$0"
+
+ # change to the directory where the script lives so users are not forced
+ # to be in the same directory as build.xml
+ cd $DIRNAME
+
+ # export some stuff for ant
+ export ANT ANT_HOME ANT_OPTS
+
+ # execute in debug mode, or simply execute
+ if [ "x$ANT_DEBUG" != "x" ]; then
+ /bin/sh -x $ANT $ANT_OPTIONS "$@"
+ else
+ exec $ANT $ANT_OPTIONS "$@"
+ fi
+}
+
+##
+## Bootstrap
+##
+
+main "$@"
Added: projects/aop/trunk/asintegration/build.xml
===================================================================
--- projects/aop/trunk/asintegration/build.xml (rev 0)
+++ projects/aop/trunk/asintegration/build.xml 2007-05-02 18:10:36 UTC (rev 62749)
@@ -0,0 +1,482 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+ <!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent">
+ <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
+ <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent">
+]>
+
+<!-- $Id: build.xml 62262 2007-04-11 16:33:51Z anil.saldhana at jboss.com $ -->
+
+<!--+======================================================================+-->
+<!--| JBoss (The OpenSource J2EE WebOS) Build File |-->
+<!--| |-->
+<!--| Distributable under LGPL license. |-->
+<!--| See terms of license at http://www.gnu.org. |-->
+<!--| |-->
+<!--| This file has been designed to work with the 'tools' module and |-->
+<!--| Buildmagic extentions. |-->
+<!--+======================================================================+-->
+
+<project default="main" name="JBoss/AOP Application Server integration">
+
+ <!--+====================================================================+-->
+ <!--| Setup |-->
+ <!--| |-->
+ <!--| Include the common build elements. |-->
+ <!--| |-->
+ <!--| This defines several different targets, properties and paths. |-->
+ <!--| It also sets up the basic extention tasks amoung other things. |-->
+ <!--+====================================================================+-->
+
+ &buildmagic;
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Initialize the build system. Must depend on '_buildmagic:init'.
+ | Other targets should depend on 'init' or things will mysteriously fail.
+ -->
+
+ <target name="init" unless="init.disable" depends="_buildmagic:init">
+ </target>
+
+
+ <!--+====================================================================+-->
+ <!--| Configuration |-->
+ <!--| |-->
+ <!--| This target is invoked by the Buildmagic initialization logic |-->
+ <!--| and should contain module specific configuration elements. |-->
+ <!--+====================================================================+-->
+
+ <target name="configure" unless="configure.disable">
+ &libraries;
+ &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"/>
+ <property name="module.Name" value="JBoss Application Server integration"/>
+
+ <!-- Configure thirdparty libraries -->
+ <path id="library.classpath">
+ <path refid="apache.ant.classpath"/>
+ <path refid="apache.log4j.classpath"/>
+ <path refid="dom4j.dom4j.classpath"/>
+ <path refid="javassist.classpath"/>
+ <path refid="jbossas/core.libs.classpath"/>
+ <path refid="jboss/jboss.vfs.classpath"/>
+ <path refid="jboss.microcontainer.classpath"/>
+ <path refid="jboss.test.classpath"/>
+ <path refid="junit.junit.classpath"/>
+ <path refid="oswego.concurrent.classpath"/>
+ <path refid="qdox.classpath"/>
+ <path refid="trove.classpath"/>
+ </path>
+
+ <!-- Configure modules -->
+ <path id="dependentmodule.classpath">
+ <path refid="jboss.aop.classpath"/>
+ <!--path refid="beanshell.beanshell.classpath"/-->
+ <!--path refid="jboss.remoting.classpath"/-->
+ <!--path refid="apache.xerces.classpath"/-->
+ <!--
+ <path refid="jboss.common.core.classpath"/>
+ <path refid="jboss.common.logging.spi.classpath"/>
+ <path refid="jboss.common.logging.log4j.classpath"/>
+ <path refid="jboss.common.logging.jdk.classpath"/>
+ <path refid="jboss.j2ee.classpath"/>
+ <path refid="jboss.j2se.classpath"/>
+ <path refid="jboss.jmx.classpath"/>
+ <path refid="jboss.system.classpath"/>
+ <path refid="jboss.systemjmx.classpath"/>
+ <path refid="jboss.security.classpath"/>
+ <path refid="jboss.security.spi.classpath"/>
+ <path refid="jboss.j2se.classpath"/>
+ <path refid="jboss.system.classpath"/>
+ <path refid="jboss.cluster.classpath"/>
+ <path refid="jboss.transaction.classpath"/>-->
+ </path>
+
+ <!-- ===== -->
+ <!-- Tasks -->
+ <!-- ===== -->
+
+ <!-- Where source files live -->
+ <property name="source.java" value="${module.source}/main"/>
+ <property name="source.test" value="${module.source}/test"/>
+ <property name="source.etc" value="${module.source}/etc"/>
+ <property name="source.resources" value="${module.source}/resources"/>
+ <property name="source.bin" value="${module.source}/bin"/>
+
+ <!-- Where build generated files will go -->
+ <property name="build.reports" value="${module.output}/reports"/>
+ <property name="build.gen-src" value="${module.output}/gen-src"/>
+ <property name="build.classes" value="${module.output}/classes"/>
+ <property name="build.classes.retro" value="${module.output}/classes-retro"/>
+ <property name="build.resources" value="${module.output}/resources"/>
+ <property name="build.lib" value="${module.output}/lib"/>
+ <property name="build.unpacked" value="${module.output}/unpacked"/>
+ <property name="build.api" value="${module.output}/api"/>
+ <property name="build.etc" value="${module.output}/etc"/>
+ <property name="build.todo" value="${module.output}/todo"/>
+ <property name="build.meta.inf" value="${module.output}/META-INF"/>
+
+ <!-- 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}"/>
+
+ <!-- The combined thirdparty classpath -->
+ <path id="thirdparty.classpath">
+ <path refid="library.classpath"/>
+ <path refid="dependentmodule.classpath"/>
+ <!--path refid="apache.commons.classpath"/-->
+ </path>
+
+ <!-- classpath and local.classpath must have a value using with a path -->
+ <property name="classpath" value=""/>
+ <property name="local.classpath" value=""/>
+
+ <!-- The classpath required to build classes. -->
+ <path id="javac.classpath">
+ <path refid="jboss.aop.classpath"/>
+ <pathelement path="${classpath}"/>
+ <pathelement path="${local.classpath}"/>
+ <path refid="thirdparty.classpath"/>
+ </path>
+
+ <path id="javac15.classpath">
+ <pathelement path="${build.classes}"/>
+ <path refid="javac.classpath"/>
+ </path>
+ <path id="jbossretro.classpath">
+ <path refid="apache.ant.classpath"/>
+ <path refid="javassist.classpath"/>
+ <path refid="jboss.jbossretro.classpath"/>
+ <path refid="jboss/backport.concurrent.classpath"/>
+ </path>
+ </target>
+
+
+ <!--+====================================================================+-->
+ <!--| Compile |-->
+ <!--| |-->
+ <!--| This target should depend on other compile-* targets for each |-->
+ <!--| different type of compile that needs to be performed, short of |-->
+ <!--| documentation compiles. |-->
+ <!--+====================================================================+-->
+
+ <target name="compile"
+ description="Compile all source files."
+ depends="_default:compile-etc, _default:compile-resources, compile-classes, retrotranslate">
+ <!-- Add module specific elements here. -->
+ </target>
+
+ <!-- Compile all class files -->
+ <target name="compile-classes">
+ <mkdir dir="${build.classes}"/>
+ <javac destdir="${build.classes}"
+ optimize="${javac.optimize}"
+ target="${javac.target}"
+ source="${javac.source}"
+ debug="${javac.debug}"
+ depend="${javac.depend}"
+ verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}"
+ includeAntRuntime="${javac.include.ant.runtime}"
+ includeJavaRuntime="${javac.include.java.runtime}"
+ includes="${javac.includes}"
+ excludes="${javac.excludes}"
+ failonerror="${javac.fail.onerror}">
+ <src path="${source.java}"/>
+ <classpath refid="javac.classpath"/>
+ </javac>
+ </target>
+
+ <target name="retrotranslate" depends="compile-classes">
+ <mkdir dir="${build.classes.retro}"/>
+
+ <taskdef name="retro" classname="org.jboss.ant.tasks.retro.Retro" classpathref="jbossretro.classpath"/>
+ <retro compilerclasspathref="jbossretro.classpath" destdir="${build.classes.retro}">
+ <classpath refid="jbossretro.classpath"/>
+ <classpath refid="javac15.classpath"/>
+ <classpath>
+ <pathelement path="${build.classes}"/>
+ </classpath>
+ <src path="${build.classes}"/>
+ </retro>
+ </target>
+
+
+ <!--+====================================================================+-->
+ <!--| Generate Output |-->
+ <!--| |-->
+ <!--| Generates the target output for this module. Target output is |-->
+ <!--| the output which is ment to be released or used by external |-->
+ <!--| modules. |-->
+ <!--+====================================================================+-->
+
+ <target name="output"
+ description="Generate all target output."
+ depends="_buildmagic:build-bypass-check"
+ unless="build-bypass.on">
+
+ <call target="compile"/>
+
+ <mkdir dir="${build.lib}"/>
+
+ <!-- Build jboss-aspect-deployer-jdk50.jar -->
+ <jar destfile="${build.lib}/jboss-aop-deployer.jar" manifest="${build.etc}/default.mf"
+ update="${jar.update}" index="${jar.index}">
+ <fileset dir="${build.classes}">
+ <!-- Include everything else -->
+ <include name="org/jboss/aop/deploy*/**"/>
+ <exclude name="org/jboss/aop/deployers/JBossAspectLibrary.class"/>
+ </fileset>
+ </jar>
+
+ <jar destfile="${build.lib}/jboss-aop-as4-deployer.jar" manifest="${build.etc}/default.mf"
+ update="${jar.update}" index="${jar.index}">
+ <fileset dir="${build.classes}">
+ <!-- Include everything else -->
+ <include name="org/jboss/aop/deploy*/**"/>
+ <exclude name="org/jboss/aop/deployers/*.class"/>
+ </fileset>
+ </jar>
+
+ <!--
+ <mkdir dir="${build.meta.inf}"/>
+ <copy file="${source.resources}/META-INF/jboss-service.xml" todir="${build.meta.inf}" filtering="true">
+ <filterset>
+ <filter token="SERVICE_NAME" value="org.jboss.aop.deployment.AspectManagerServiceJDK5"/>
+ </filterset>
+ </copy>
+ <jar destfile="${build.lib}/jboss-aop-jdk50.deployer" manifest="${build.etc}/default.mf"
+ update="${jar.update}" index="${jar.index}">
+ <fileset file="${build.lib}/jboss-aspect-library-jdk50.jar"/>
+ <fileset file="${jboss.aop.lib}/jboss-aop-jdk50.jar"/>
+ <fileset file="src/etc/base-aop.xml"/>
+ <fileset file="${trove.lib}/trove.jar"/>
+ <fileset dir="${module.output}">
+ <include name="META-INF/jboss-service.xml"/>
+ </fileset>
+ </jar>
+
+ <copy file="src/etc/base-aop.xml" tofile="${build.meta.inf}/base-aspects.xml"/>
+ <jar destfile="${build.lib}/jboss-aop-jboss5.deployer" manifest="${build.etc}/default.mf"
+ update="${jar.update}" index="${jar.index}">
+ <fileset file="${build.lib}/jboss-aspect-library-jdk50.jar"/>
+ <fileset file="${build.meta.inf}/base-aspects.xml"/>
+ <fileset dir="${source.resources}">
+ <include name="META-INF/jboss-aspect-library-beans.xml"/>
+ </fileset>
+ </jar>
+ <delete dir="${build.meta.inf}"/>
+-->
+
+ </target>
+
+
+ <target name="jars14" depends="retrotranslate">
+ <mkdir dir="${build.lib}"/>
+
+ <!-- Build jboss-aspect-deployer-jdk50.jar -->
+ <jar destfile="${build.lib}/jboss-aop-as4-deployer-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/deploy*/**"/>
+ <exclude name="org/jboss/aop/deployers/*.class"/>
+ </fileset>
+ </jar>
+
+ <!--
+ <mkdir dir="${build.meta.inf}"/>
+ <copy file="${source.resources}/META-INF/jboss-service.xml" todir="${build.meta.inf}" filtering="true">
+ <filterset>
+ <filter token="SERVICE_NAME" value="org.jboss.aop.deployment.AspectManagerService"/>
+ </filterset>
+ </copy>
+ <jar destfile="${build.lib}/jboss-aop.deployer" manifest="${build.etc}/default.mf"
+ update="${jar.update}" index="${jar.index}">
+ <fileset file="${build.lib}/jboss-aspect-library.jar"/>
+ <fileset file="${jboss.aop.lib}/jboss-aop.jar"/>
+ <fileset file="src/etc/base-aop.xml"/>
+ <fileset file="${javassist.lib}/javassist.jar"/>
+ <fileset file="${trove.lib}/trove.jar"/>
+ <fileset dir="${module.output}" >
+ <include name="META-INF/jboss-service.xml"/>
+ </fileset>
+ </jar>
+ <delete dir="${build.meta.inf}"/>
+ -->
+ <!-- Generate checksums -->
+ <call target="_default:compile-checksums"/>
+
+ </target>
+
+
+ <!-- ================================================================== -->
+ <!-- Cleaning -->
+ <!-- ================================================================== -->
+
+ <!-- Clean up all build output -->
+ <target name="clean"
+ description="Cleans up most generated files."
+ depends="_buildmagic:clean">
+ </target>
+
+ <!-- Clean up all generated files -->
+ <target name="clobber"
+ description="Cleans up all generated files."
+ depends="_buildmagic:clobber, clean">
+ </target>
+
+
+ <!-- ================================================================== -->
+ <!-- Install & Release -->
+ <!-- ================================================================== -->
+
+ <!-- target name="dist" depends="javadocs, init">
+ <delete file="${aop.version}.zip"/>
+ <copy todir="docs" filtering="no">
+ <fileset dir="output">
+ <include name="api/**"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${build.unpacked}"/>
+
+ <mkdir dir="${build.unpacked}/jboss-aop.deployer"/>
+ <unjar src="${build.lib}/jboss-aop.deployer"
+ dest="${build.unpacked}/jboss-aop.deployer"/>
+
+ <mkdir dir="${build.unpacked}/jboss-aop-jdk50.deployer"/>
+ <unjar src="${build.lib}/jboss-aop-jdk50.deployer"
+ dest="${build.unpacked}/jboss-aop-jdk50.deployer"/>
+
+
+ <zip zipfile="${aop.version}.zip">
+ <zipfileset dir="../aop/docs" prefix="${aop.version}/docs/aspect-framework">
+ <include name="api/**"/>
+ <include name="index.html"/>
+ <include name="misc/*.html"/>
+ <include name="misc/*.jpg"/>
+ <include name="examples/**"/>
+ <exclude name="**/CVS/**"/>
+ <exclude name="**/*.wiki"/>
+ </zipfileset>
+ <zipfileset dir="../aop/docs/reference/build" prefix="${aop.version}/docs/aspect-framework">
+ <include name="**/*"/>
+ <exclude name="**/CVS/**"/>
+ <exclude name="**/*.wiki"/>
+ </zipfileset>
+ <zipfileset dir="docs" prefix="${aop.version}/docs/aspect-library">
+ <include name="api/**"/>
+ <include name="**/*.html"/>
+ <include name="**/*.jpg"/>
+ <include name="examples/**"/>
+ <exclude name="**/CVS/**"/>
+ <exclude name="**/*.wiki"/>
+ </zipfileset>
+ <zipfileset dir="${build.unpacked}" prefix="${aop.version}/jboss-40-install">
+ <include name="**/*"/>
+ </zipfileset>
+ <zipfileset dir="${build.lib}" prefix="${aop.version}/lib">
+ <include name="jboss-aspect-library.jar"/>
+ </zipfileset>
+ <zipfileset dir="${jboss.aop.lib}" prefix="${aop.version}/lib">
+ <include name="jdk14-pluggable-instrumentor.jar"/>
+ <include name="jrockit-pluggable-instrumentor.jar"/>
+ <include name="jboss-aop.jar"/>
+ </zipfileset>
+ <zipfileset dir="${javassist.lib}" prefix="${aop.version}/lib">
+ <include name="javassist.jar"/>
+ </zipfileset>
+ <zipfileset dir="${trove.lib}" prefix="${aop.version}/lib">
+ <include name="trove.jar"/>
+ </zipfileset>
+ <zipfileset dir="${qdox.qdox.lib}" prefix="${aop.version}/lib">
+ <include name="qdox.jar"/>
+ </zipfileset>
+ <zipfileset dir="${jboss.common.lib}" prefix="${aop.version}/lib">
+ <include name="jboss-common.jar"/>
+ </zipfileset>
+
+ <zipfileset dir="${build.lib}" prefix="${aop.version}/lib-50">
+ <include name="jboss-aspect-library-jdk50.jar"/>
+ <include name="jboss-aspect-jdk50-client.jar"/>
+ </zipfileset>
+ <zipfileset dir="${jboss.aop.lib}" prefix="${aop.version}/lib-50">
+ <include name="jboss-aop-jdk50.jar"/>
+ <include name="pluggable-instrumentor.jar"/>
+ <include name="jboss-aop-jdk50-client.jar"/>
+ <include name="jrockit-pluggable-instrumentor.jar"/>
+ </zipfileset>
+ <zipfileset dir="${javassist.lib}" prefix="${aop.version}/lib-50">
+ <include name="javassist.jar"/>
+ </zipfileset>
+ <zipfileset dir="${trove.lib}" prefix="${aop.version}/lib-50">
+ <include name="trove.jar"/>
+ </zipfileset>
+ <zipfileset dir="${qdox.qdox.lib}" prefix="${aop.version}/lib-50">
+ <include name="qdox.jar"/>
+ </zipfileset>
+ <zipfileset dir="${jboss.common.lib}" prefix="${aop.version}/lib-50">
+ <include name="jboss-common.jar"/>
+ </zipfileset>
+
+ <zipfileset dir="../aop/src/resources/bin" prefix="${aop.version}/bin">
+ <include name="*.sh"/>
+ <include name="*.bat"/>
+ <exclude name="**/CVS/**"/>
+ </zipfileset>
+ <zipfileset file="src/etc/base-aop.xml" prefix="${aop.version}/etc"/>
+ <zipfileset file="RELEASE_NOTES.html" prefix="${aop.version}"/>
+ <zipfileset dir="src" prefix="${aop.version}/src/aspect-library">
+ <include name="jdk15/**/*.java"/>
+ <include name="main/**/*.java"/>
+ <include name="main/**/*.xml"/>
+ <include name="test/**/*.java"/>
+ <include name="test/**/*.xml"/>
+ <include name="resources/**/*.xml"/>
+ <exclude name="**/CVS/**"/>
+ </zipfileset>
+ <zipfileset dir="../aop/src" prefix="${aop.version}/src/aspect-framework">
+ <include name="jdk15/**/*.java"/>
+ <include name="main/**/*.java"/>
+ <include name="main/**/*.xml"/>
+ <include name="test/**/*.java"/>
+ <include name="test/**/*.xml"/>
+ <include name="resources/**/*.xml"/>
+ <exclude name="**/CVS/**"/>
+ </zipfileset>
+ </zip>
+ </target-->
+
+ <!-- ================================================================== -->
+ <!-- Misc. -->
+ <!-- ================================================================== -->
+
+ <target name="main"
+ description="Executes the default target (most)."
+ depends="most"/>
+
+ <target name="all"
+ description="Builds everything."
+ depends="output, jars14, docs"/>
+
+ <target name="most"
+ description="Builds almost everything."
+ depends="output, jars14"/>
+
+ <target name="help"
+ description="Show this help message."
+ depends="_buildmagic:help:standard"/>
+
+</project>
Modified: projects/aop/trunk/build/build.xml
===================================================================
--- projects/aop/trunk/build/build.xml 2007-05-02 17:46:46 UTC (rev 62748)
+++ projects/aop/trunk/build/build.xml 2007-05-02 18:10:36 UTC (rev 62749)
@@ -77,6 +77,7 @@
<!-- Modules -->
<module name="aop"/>
+ <module name="asintegration"/>
<!-- Module groups -->
@@ -88,7 +89,8 @@
</group>
<group name="core">
- <include modules="aop"/>
+ <include modules="aop"/>
+ <include modules="asintegration"/>
</group>
<group name="default">
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
Modified: projects/aop/trunk/tools/etc/buildmagic/modules.ent
===================================================================
--- projects/aop/trunk/tools/etc/buildmagic/modules.ent 2007-05-02 17:46:46 UTC (rev 62748)
+++ projects/aop/trunk/tools/etc/buildmagic/modules.ent 2007-05-02 18:10:36 UTC (rev 62749)
@@ -8,4 +8,5 @@
</path>
<path id="jboss.aop.classpath">
<pathelement path="${jboss.aop.lib}/jboss-aop-jdk50.jar"/>
+ <pathelement path="${jboss.aop.lib}/pluggable-instrumentor.jar"/>
</path>
More information about the jboss-cvs-commits
mailing list