[jboss-cvs] JBossAS SVN: r57687 - in projects/aop/trunk/aop: . src src/test/org/jboss/test/aop src/test/org/jboss/test/aop/jdk15
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Oct 16 20:10:03 EDT 2006
Author: kabir.khan at jboss.com
Date: 2006-10-16 20:09:59 -0400 (Mon, 16 Oct 2006)
New Revision: 57687
Removed:
projects/aop/trunk/aop/build-retro.xml
projects/aop/trunk/aop/src/jdk15/
projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotated/
projects/aop/trunk/aop/src/test/org/jboss/test/aop/jdk15/annotated/
Log:
[JBAOP-296] Get AOP build and tests working with JBoss retro.
SVN is broken, so do this in several steps
Remove things that have been deleted
Deleted: projects/aop/trunk/aop/build-retro.xml
===================================================================
--- projects/aop/trunk/aop/build-retro.xml 2006-10-16 22:10:49 UTC (rev 57686)
+++ projects/aop/trunk/aop/build-retro.xml 2006-10-17 00:09:59 UTC (rev 57687)
@@ -1,571 +0,0 @@
-<?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">
-]>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id$ -->
-
-<project default="main" name="JBoss/AOP">
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
-
- <!--
- | Include the common Buildmagic 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 -->
- <!-- ================================================================== -->
-
- <!--
- | Configure the build system.
- |
- | This target is invoked by the Buildmagic initialization logic and
- | should contain module specific configuration elements.
- -->
-
- <target name="configure" unless="configure.disable">
- <property name="aop.version" value="jboss-aop-1.5.0.GA"/>
- <property name="aop.title" value="JBoss AOP Framework"/>
-
- <!-- =================== -->
- <!-- Basic Configuration -->
- <!-- =================== -->
-
- <!-- Module name(s) & version -->
- <property name="module.name" value="aop"/>
- <property name="module.Name" value="JBoss AOP"/>
- <property name="module.version" value="1.5.0.GA"/>
-
- <!-- ========= -->
- <!-- Libraries -->
- <!-- ========= -->
-
- &libraries;
- &modules;
- <!-- The combined library classpath -->
- <path id="library.classpath">
- <path refid="apache.log4j.classpath"/>
- <path refid="qdox.classpath"/>
- <path refid="javassist.classpath"/>
- <path refid="trove.classpath"/>
- <path refid="xdoclet.xdoclet.classpath"/>
- <path refid="apache.ant.classpath"/>
- <path refid="oswego.concurrent.classpath"/>
- <path refid="junit.junit.classpath"/>
- <path refid="jboss.profiler.jvmti.classpath"/>
- <path refid="jboss.microcontainer.classpath"/>
- </path>
-
- <!-- Defines jrockit.home -->
- <property file="local.properties"/>
-
- <available file="${jrockit.home}/jre/lib/managementapi.jar" property="JROCKIT_AVAILABLE"/>
-
- <!-- ======= -->
- <!-- Modules -->
- <!-- ======= -->
-
- <!-- The combined dependent module classpath -->
- <path id="dependentmodule.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>
-
- <!-- ===== -->
- <!-- Tasks -->
- <!-- ===== -->
-
- <!-- Where source files live -->
- <property name="source.java" value="${module.source}/main"/>
- <property name="source15.java" value="${module.source}/jdk15"/>
- <property name="source.etc" value="${module.source}/etc"/>
- <property name="source.res" value="${module.source}/resources"/>
- <property name="source.stylesheets" value="../testsuite/src/stylesheets"/>
-
- <!-- Where build generated files will go -->
- <property name="build.reports" value="${module.output}/reports"/>
- <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"/>
- <property name="build.gen-src" value="${module.output}/gen-src"/>
- <property name="build.gen" value="${module.output}/gen"/>
- <property name="build.bootclasspath" value="${module.output}/gen-bootclasspath"/>
-
- <!-- 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>
-
- <!-- RMIC should generate stubs compatible with Java 1.2+ -->
- <property name="rmic.stubVersion" value="1.2"/>
-
- <!-- 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">
- <pathelement path="${classpath}"/>
- <pathelement path="${local.classpath}"/>
- <path refid="thirdparty.classpath"/>
- </path>
-
- <path id="javac.jrockit.classpath">
- <path refid="javac.classpath"/>
- <path path="${jrockit.home}/jre/lib/managementapi.jar"/>
- </path>
-
- <path id="javac15.classpath">
- <pathelement path="${build.classes}"/>
- <path refid="javac.classpath"/>
- </path>
- <!-- The classpath required to build javadocs. -->
- <path id="javadoc.classpath">
- <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>
-
-
- <!-- Packages to include when generating api documentation -->
- <property name="javadoc.packages" value="org.jbos.aop.*"/>
- </target>
-
-
- <!-- ================================================================== -->
- <!-- Compile -->
- <!-- ================================================================== -->
-
- <!--
- | Compile everything.
- |
- | This target should depend on other compile-* targets for each
- | different type of compile that needs to be performed, short of
- | documentation compiles.
- -->
-
- <!-- Generate parsers -->
- <target name="generate-parsers" depends="init">
- <!--
- | make sure to generate the JBoss-QL parser first so the node
- | interface is keyed to JBossQLParserVisitor.
- -->
-
- <!-- JBoss-QL parser -->
- <jjtree
- target="${source.java}/org/jboss/aop/pointcut/ast/pointcut.jjt"
- outputdirectory="${source.java}/org/jboss/aop/pointcut/ast"
- javacchome="${sun.javacc.lib}"/>
-
- <javacc
- target="${source.java}/org/jboss/aop/pointcut/ast/pointcut.jj"
- javacchome="${sun.javacc.lib}"/>
-
- <jjtree
- target="${source.java}/org/jboss/aop/pointcut/ast/typeExpression.jjt"
- outputdirectory="${source.java}/org/jboss/aop/pointcut/ast"
- javacchome="${sun.javacc.lib}"/>
-
- <javacc
- target="${source.java}/org/jboss/aop/pointcut/ast/typeExpression.jj"
- javacchome="${sun.javacc.lib}"/>
-
- </target>
-
- <target name="compile"
- description="Compile all source files."
- depends="compile-classes, compile-classes15,
- compile-etc, compile-jrockit-classes, retrotranslate"/>
-
- <!-- Compile all class files -->
- <target name="compile-classes" depends="init">
- <mkdir dir="${build.classes}"/>
- <javac destdir="${build.classes}"
- optimize="${javac.optimize}"
- target="1.5"
- source="1.5"
- 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}"/>
- <exclude name="org/jboss/aop/definition/**"/>
- <exclude name="org/jboss/aop/hook/JRockit*"/>
- <classpath refid="javac.classpath"/>
- </javac>
- </target>
-
- <target name="compile-jrockit-classes" depends="init" if="JROCKIT_AVAILABLE">
- <mkdir dir="${build.classes}"/>
- <javac destdir="${build.classes}"
- optimize="${javac.optimize}"
- target="1.4"
- source="1.4"
- 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}"/>
- <include name="org/jboss/aop/hook/JRockit*"/>
- <exclude name="org/jboss/aop/definition/**"/>
- <classpath refid="javac.jrockit.classpath"/>
- </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>
-
-
- <!-- TODO kill this, eventually we should compile everything to build.classes -->
- <target name="compile-classes15" depends="init" if="HAVE_JDK_1.5">
- <mkdir dir="${build15.classes}"/>
- <javac destdir="${build15.classes}"
- optimize="${javac.optimize}"
- target="1.5"
- source="1.5"
- debug="${javac.debug}"
- depend="${javac.depend}"
- verbose="${javac.verbose}"
- deprecation="${javac.deprecation}"
- includeAntRuntime="${javac.include.ant.runtime}"
- includeJavaRuntime="${javac.include.java.runtime}"
- failonerror="${javac.fail.onerror}">
- <src path="${source15.java}"/>
- <classpath refid="javac15.classpath"/>
- </javac>
- <copy todir="${build.classes}" overwrite="true">
- <fileset dir="${build15.classes}">
- <include name="**"/>
- </fileset>
- </copy>
- <delete dir="${build15.classes}"/>
- <copy todir="${build15.classes}">
- <fileset dir="${build.classes}">
- <include name="**"/>
- </fileset>
- </copy>
- </target>
-
- <target name="retrotranslate" depends="compile-classes, compile-classes15">
- <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>
-
- <!-- ================================================================== -->
- <!-- Archives -->
- <!-- ================================================================== -->
-
- <!--
- | Build all jar files.
- -->
- <target name="jars" description="Builds all jar files."
- depends="_buildmagic:build-bypass-check"
- unless="build-bypass.on">
-
- <call target="compile"/>
-
- <mkdir dir="${build.lib}"/>
-
- <!-- Build the jnpserver.jar -->
- <jar jarfile="${build.lib}/jboss-aop.jar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes.retro}">
- <!-- Include everything else -->
- <include name="org/jboss/aop/**"/>
- <include name="org/jboss/lang/**"/>
- <include name="org/jboss/aspects/**"/>
- </fileset>
- <fileset file="docs/jboss-aop_1_0.dtd"/>
- </jar>
-
- <jar jarfile="${build.lib}/jdk14-pluggable-instrumentor.jar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes.retro}">
- <!-- Include everything else -->
- <include name="org/jboss/aop/hook/JDK14*.class"/>
- </fileset>
- </jar>
-
- <!-- Update the build marker to allow bypassing -->
- <touch file="${build-bypass.marker}"/>
-
- </target>
-
- <target name="jars-jrockit" description="Builds all jar files."
- depends="jars,compile-jrockit-classes" if="JROCKIT_AVAILABLE">
-
- <jar jarfile="${build.lib}/jrockit-pluggable-instrumentor.jar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <include name="org/jboss/aop/hook/JRockitPluggableClassPreProcessor.class"/>
- <include name="org/jboss/aop/hook/JDK14*.class"/>
- </fileset>
-
- </jar>
- </target>
-
- <target name="jars15" description="Builds all jar files."
- depends="compile-classes15" if="HAVE_JDK_1.5">
-
- <mkdir dir="${build.lib}"/>
-
- <!-- Build the jboss-aop-jdk50.jar -->
- <jar jarfile="${build.lib}/jboss-aop-jdk50.jar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <exclude name="org/jboss/aop/standalone/PluggableInstrumentor.class"/>
- </fileset>
- <fileset file="docs/jboss-aop_1_0.dtd"/>
- </jar>
- <jar jarfile="${build.lib}/pluggable-instrumentor.jar"
- manifest="${build.etc}/pluggable-instrumentor.mf">
- <fileset dir="${build15.classes}">
- <!-- Include everything else -->
- <include name="org/jboss/aop/standalone/PluggableInstrumentor.class"/>
- </fileset>
- </jar>
- <!-- Build the jboss-aop-jdk50-client.jar needed for EJB 3-->
- <jar jarfile="${build.lib}/jboss-aop-jdk50-client.jar"
- manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}">
- <!-- Include everything else -->
- <include name="org/jboss/lang/**"/>
- <include name="org/jboss/aop/Advisor.class"/>
- <include name="org/jboss/aop/AspectManager.class"/>
- <include name="org/jboss/aop/ClassAdvisor.class"/>
- <include name="org/jboss/aop/ClassInstanceAdvisor.class"/>
- <include name="org/jboss/aop/InstanceAdvisorDelegate.class"/>
- <include name="org/jboss/aop/Domain.class"/>
- <include name="org/jboss/aop/InstanceAdvisor.class"/>
- <include name="org/jboss/aop/MethodInfo.class"/>
- <include name="org/jboss/aop/InterceptorChainObserver.class"/>
- <include name="org/jboss/aop/JoinPoint.class"/>
- <include name="org/jboss/aop/JoinPointInfo.class"/>
- <include name="org/jboss/aop/MethodJoinPoint.class"/>
- <include name="org/jboss/aop/*Dispatcher*.class"/>
- <include name="org/jboss/aop/*Advised.class"/>
- <include name="org/jboss/aop/advice/AspectDefinition.class"/>
- <include name="org/jboss/aop/advice/Interceptor.class"/>
- <include name="org/jboss/aop/instrument/Untransformable.class"/>
- <include name="org/jboss/aop/joinpoint/Invocation*.class"/>
- <include name="org/jboss/aop/joinpoint/Joinpoint.class"/>
- <include name="org/jboss/aop/joinpoint/MethodInvocation*.class"/>
- <include name="org/jboss/aop/joinpoint/MethodJoinpoint.class"/>
- <include name="org/jboss/aop/metadata/SimpleMetaData.class"/>
- <include name="org/jboss/aop/metadata/SimpleMetaData$MetaDataValue.class"/>
- <include name="org/jboss/aop/metadata/MetaDataResolver.class"/>
- <include name="org/jboss/aop/metadata/ThreadMetaData.class"/>
- <include name="org/jboss/aop/proxy/MarshalledInterfaceProxy.class"/>
- <include name="org/jboss/aop/proxy/MethodMapped.class"/>
- <include name="org/jboss/aop/proxy/Proxy.class"/>
- <include name="org/jboss/aop/proxy/ProxyFactory.class"/>
- <include name="org/jboss/aop/proxy/ProxyMixin.class"/>
- <include name="org/jboss/aop/util/SecurityActions.class*"/>
- <include name="org/jboss/aop/util/Marshalled*.class*"/>
- <include name="org/jboss/aop/util/MethodHashing*.class*"/>
- <include name="org/jboss/aop/util/PayloadKey*.class*"/>
- </fileset>
- </jar>
- </target>
-
- <!-- ================================================================== -->
- <!-- Install & Release -->
- <!-- ================================================================== -->
-
- <target name="dist" depends="javadocs, init">
- <fail unless="JROCKIT_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.lib}">
- <include name="jboss-common.jar"/>
- </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="${oswego.concurrent.lib}">
- <include name="concurrent.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"/>
- <zip zipfile="jboss-aop-dist.zip">
- <zipfileset dir="${build.lib}" prefix="${aop.version}">
- <include name="*.jar"/>
- </zipfileset>
- <zipfileset dir="." prefix="${aop.version}">
- <include name="docs/api/**"/>
- <include name="docs/**/*.html"/>
- <include name="docs/**/*.jpg"/>
- <include name="docs/examples/**"/>
- <exclude name="docs/**/CVS/**"/>
- <exclude name="docs/**/*.wiki"/>
- </zipfileset>
- <zipfileset dir="." prefix="${aop.version}">
- <include name="RELEASE_NOTES.txt"/>
- <include name="src/main/**/*.java"/>
- <include name="src/main/**/*.jjt"/>
- <include name="src/resources/test/**/*.xml"/>
- <exclude name="src/**/CVS/**"/>
- </zipfileset>
- <zipfileset file="src/build.xml" prefix="${aop.version}"/>
- </zip>
- </target>
-
- <target name="install"
- description="Install the structure for a release."
- depends="all, _buildmagic:install:default"/>
-
- <target name="release" depends="install"/>
-
- <target name="release-zip"
- description="Builds a ZIP distribution."
- depends="release, _buildmagic:release:zip"/>
-
- <target name="release-tar"
- description="Builds a TAR distribution."
- depends="release, _buildmagic:release:tar"/>
-
- <target name="release-tgz"
- description="Builds a TAR-GZ distribution."
- depends="release, _buildmagic:release:tgz"/>
-
- <target name="release-all"
- description="Builds a distribution for each archive type."
- depends="release-zip, release-tgz"/>
-
-
- <!-- ================================================================== -->
- <!-- 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>
-
-
- <!-- ===============================================================p=== -->
- <!-- Misc. -->
- <!-- ================================================================== -->
-
- <target name="main" depends="most"
- description="Executes the default target (most)."/>
-
- <target name="all" depends="jars, jars15, jars-jrockit, docs"
- description="Builds everything."/>
-
- <target name="most" depends="jars, jars15, jars-jrockit"
- description="Builds almost everything."/>
-
- <target name="help"
- description="Show this help message."
- depends="_buildmagic:help:standard"/>
-</project>
More information about the jboss-cvs-commits
mailing list