[jboss-cvs] JBossAS SVN: r72520 - projects/aop/trunk/aop.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Apr 21 17:07:55 EDT 2008
Author: stalep
Date: 2008-04-21 17:07:55 -0400 (Mon, 21 Apr 2008)
New Revision: 72520
Removed:
projects/aop/trunk/aop/build-tests-jdk14.xml
projects/aop/trunk/aop/pom-jdk14.xml
Modified:
projects/aop/trunk/aop/build-tests-jdk50.xml
projects/aop/trunk/aop/build.xml
projects/aop/trunk/aop/jbossbuild.xml
projects/aop/trunk/aop/pom.xml
projects/aop/trunk/aop/tests-jrockit.bat
Log:
[JBAOP-556] removed jdk14 buildfiles and references
Deleted: projects/aop/trunk/aop/build-tests-jdk14.xml
===================================================================
--- projects/aop/trunk/aop/build-tests-jdk14.xml 2008-04-21 21:04:44 UTC (rev 72519)
+++ projects/aop/trunk/aop/build-tests-jdk14.xml 2008-04-21 21:07:55 UTC (rev 72520)
@@ -1,881 +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;
-
- <import file="base-tests.xml"/>
-
-
- <!-- ================================================================== -->
- <!-- 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 - we don't want everything included here since some of these tests use the -Xbootclasspath/p: option-->
- <path id="library.classpath">
- <path refid="apache.log4j.classpath"/>
- <path refid="javassist.classpath"/>
- <path refid="jboss.profiler.jvmti.classpath"/>
- <path refid="jboss/common.logging.log4j.classpath"/>
- <path refid="jboss/common.logging.jdk.classpath"/>
- <path refid="jboss/common.logging.spi.classpath"/>
- <path refid="qdox.classpath"/>
- <path refid="trove.classpath"/>
- <path refid="xdoclet.xdoclet.classpath"/>
- </path>
-
- <!--
- Settable in local.properties:
- -jrockit.home: location of JRockit JVM
- -jdk14.executable: Full path to a JDK 1.4 java.exe (Needed for the JDK 1.4 tests)
- -repository.home: Location of local copy of repository (for the "update-repository" target
- -debug: if set, -Djboss.aop.debug.classes=true for the tests; otherwise it is false
- -->
- <property file="local.properties"/>
-
- <condition property="jboss.aop.debug.classes" value="true">
- <isset property="debug"/>
- </condition>
- <condition property="jboss.aop.debug.classes" value="false">
- <not>
- <isset property="debug"/>
- </not>
- </condition>
-
-
-
- <fail unless="jdk14.executable">Need to set jdk14.executable to a jdk 1.4 executable in local.properties. For example
- jdk14.executable=C:/Java/jdk14/bin/java.exe
- </fail>
- <property name="java14" value="${jdk14.executable}"/>
-
- <!-- ======= -->
- <!-- Modules -->
- <!-- ======= -->
-
- <!-- The combined dependent module classpath -->
- <path id="dependentmodule.classpath">
- </path>
-
- <!-- ===== -->
- <!-- Tasks -->
- <!-- ===== -->
-
- <!-- Where source files live -->
- <property name="source.tests.java" value="${module.source}/test"/>
- <property name="source.res" value="${module.source}/resources"/>
-
- <!-- Where build generated files will go -->
- <property name="build.reports" value="${module.output}/reports"/>
- <property name="build.tests.classes" value="${module.output}/tests.classes"/>
- <property name="build.tests.retro" value="${module.output}/tests.retro"/>
- <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>
-
- <!-- classpath and local.classpath must have a value using with a path -->
- <property name="classpath" value=""/>
- <property name="local.classpath" value=""/>
-
- <!-- Create jdk14 version of the mc jars reflect and mdr -->
- <property name="jboss-reflect.location" value="${project.thirdparty}/jboss/jboss-reflect/lib/jboss-reflect.jar"/>
- <property name="jboss-mdr.location" value="${project.thirdparty}/jboss/jboss-mdr/lib/jboss-mdr.jar"/>
-
- <mkdir dir="output/temp/jboss-reflect-classes"/>
- <mkdir dir="output/temp/jboss-eflect-classes14"/>
- <mkdir dir="output/temp/jboss-mdr-classes"/>
- <mkdir dir="output/temp/jboss-mdr-classes14"/>
- <unjar src="${jboss-reflect.location}" dest="output/temp/jboss-reflect-classes"/>
- <unjar src="${jboss-mdr.location}" dest="output/temp/jboss-mdr-classes"/>
-
- <path id="jbossretro.classpath">
- <path refid="apache.ant.classpath"/>
- <path refid="javassist.classpath"/>
- <path refid="jboss/jboss.retro.classpath"/>
- <path refid="jboss/backport.concurrent.classpath"/>
- </path>
-
- <taskdef name="retro" classname="org.jboss.ant.tasks.retro.Retro" classpathref="jbossretro.classpath"/>
- <retro compilerclasspathref="jbossretro.classpath" destdir="output/temp/jboss-reflect-classes14">
- <classpath refid="jbossretro.classpath"/>
- <classpath>
- <pathelement path="${project.root}/aop/output/classes"/>
- <pathelement path="output/temp/jboss-reflect-classes"/>
- </classpath>
- <src path="output/temp/jboss-reflect-classes"/>
- </retro>
-
- <retro compilerclasspathref="jbossretro.classpath" destdir="output/temp/jboss-mdr-classes14">
- <classpath refid="jbossretro.classpath"/>
- <classpath>
- <pathelement path="${project.root}/aop/output/classes"/>
- <pathelement path="output/temp/jboss-mdr-classes"/>
- </classpath>
- <src path="output/temp/jboss-mdr-classes"/>
- </retro>
-
- <jar
- destfile="output/temp/jboss-reflect-jdk14.jar"
- basedir="output/temp/jboss-reflect-classes14"
- includes="**"
- manifest="output/temp/jboss-reflect-classes/META-INF/MANIFEST.MF"/>
-
- <jar
- destfile="output/temp/jboss-mdr-jdk14.jar"
- basedir="output/temp/jboss-mdr-classes14"
- includes="**"
- manifest="output/temp/jboss-mdr-classes/META-INF/MANIFEST.MF"/>
-
- <path id="jboss/jboss.reflect14.classpath">
- <pathelement path="${project.root}/aop/output/temp/jboss-reflect-jdk14.jar"/>
- </path>
- <path id="jboss/jboss.mdr14.classpath">
- <pathelement path="${project.root}/aop/output/temp/jboss-mdr-jdk14.jar"/>
- </path>
-
-
- <!-- The classpath required to build classes. -->
- <path id="javac.classpath">
- <pathelement path="${classpath}"/>
- <pathelement path="${local.classpath}"/>
- <path refid="thirdparty.classpath"/>
- <path refid="jboss.test14.classpath"/>
- <path refid="jboss/jboss.reflect14.classpath"/>
- <path refid="jboss/jboss.mdr14.classpath"/>
- <!--
- <pathelement path="jboss-reflect-jdk14.location"/>
- <pathelement path="jboss-mdr-jdk14.location"/>
- -->
- <!--
- <path refid="jboss.microcontainer14.classpath"/>
- -->
- <path refid="jboss/common.core.14.classpath"/>
- <pathelement path="${build.lib}/jboss-aop-jdk50.jar"/>
- <path refid="junit.junit.classpath"/>
- </path>
-
- <path id="jbossretro.classpath">
- <path refid="apache.ant.classpath"/>
- <path refid="javassist.classpath"/>
- <path refid="jboss/jboss.retro.classpath"/>
- <path refid="jboss/backport.concurrent.classpath"/>
- </path>
-
- <path id="jbossretrort.classpath">
- <path refid="jboss/backport.concurrent.classpath"/>
- <pathelement path="${jboss/jboss.retro.lib}/jboss-retro-rt.jar"/>
- <!--
- <pathelement path="jboss-reflect-jdk14.location"/>
- <pathelement path="jboss-mdr-jdk14.location"/>
- -->
- <path refid="jboss/jboss.reflect14.classpath"/>
- <path refid="jboss/jboss.mdr14.classpath"/>
- <!--
- <path refid="jboss.microcontainer14.classpath"/>
- -->
- <path refid="jboss/common.core.14.classpath"/>
- </path>
-
- <path id="jboss.aop.retro.classpath">
- <path refid="jboss.aop14.classpath"/>
- <path refid="jbossretrort.classpath"/>
- </path>
-
- <path id="aopc.classpath">
- <path refid="thirdparty.classpath"/>
- <path refid="junit.junit.classpath"/>
- <path refid="jbossretrort.classpath"/>
- <path refid="jboss.test14.classpath"/>
- </path>
-
- <!-- run against jdk 14 jar -->
- <path id="test.classpath">
- <path refid="thirdparty.classpath"/>
- <path refid="jbossretrort.classpath"/>
- <path refid="jboss.aop14.classpath"/>
- </path>
-
- <!-- The temp folder for aopc -->
- <property name="aopc.tmpdir" value="output/aopctmp"/>
- <delete dir="${aopc.tmpdir}" failonerror="true" deleteonexit="true"/>
- <mkdir dir="${aopc.tmpdir}"/>
-
- <!-- Packages to include when generating api documentation -->
- <property name="javadoc.packages" value="org.jbos.aop.*"/>
-
- <!-- Override JUnit defaults -->
- <property name="junit.timeout" value="240000"/> <!-- 4 minutes -->
- <property name="junit.batchtest.todir" value="${build.reports}"/>
- <property name="junit.jvm.options" value="-Ddummy"/>
- </target>
-
-
- <!-- ================================================================== -->
- <!-- Compile -->
- <!-- ================================================================== -->
-
- <target name="compile"
- description="Compile all source files."
- depends="compile-test-classes"/>
-
- <target name="compile-test-classes" depends="init">
- <mkdir dir="${build.tests.classes}"/>
- <javac destdir="${build.tests.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="${source.tests.java}"/>
- <classpath refid="javac.classpath"/>
- <include name="**/*.java"/>
- <exclude name="org/jboss/test/aop/memoryleaks/**/*.java"/>
- <exclude name="org/jboss/test/aop/**/*JDK50TestCase.java"/>
- </javac>
- </target>
-
- <target name="retroweave" depends="compile-test-classes">
- <mkdir dir="${build.tests.retro}"/>
-
- <taskdef name="retro" classname="org.jboss.ant.tasks.retro.Retro" classpathref="jbossretro.classpath"/>
- <retro compilerclasspathref="jbossretro.classpath" destdir="${build.tests.retro}">
- <classpath refid="jbossretro.classpath"/>
- <classpath refid="javac.classpath"/>
- <classpath>
- <pathelement path="${build.tests.classes}"/>
- </classpath>
- <src path="${build.tests.classes}"/>
- </retro>
- </target>
-
-
- <!-- ================================================================== -->
- <!-- Cleaning -->
- <!-- ================================================================== -->
-
- <!-- Clean up all build output -->
- <target name="clean" description="Cleans up most generated files." depends="init">
- <delete dir="${build.tests.classes}"/>
- <delete dir="${build.tests.retro}"/>
- </target>
-
- <target name="clean-tests" depends="init">
- <delete dir="${build.tests.classes}"/>
- </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="compile"
- description="Builds everything."/>
-
- <target name="most" depends="compile"
- description="Builds almost everything."/>
-
- <target name="help"
- description="Show this help message."
- depends="_buildmagic:help:standard"/>
-
- <!-- ==================================================================================== -->
- <!-- JDK 1.4 TESTS -->
- <!-- ==================================================================================== -->
- <target name="tests" depends="main">
-
- <antcall target="clean"/>
- <antcall target="bootclasspath-genadvisor-tests" inheritRefs="true"/>
- <antcall target="bootclasspath-tests" inheritRefs="true"/>
- <antcall target="not-woven-tests" inheritRefs="true"/>
-
- <antcall target="clean"/>
- <antcall target="precompiled-tests" inheritRefs="true"/>
- <antcall target="system-classloader-test" inheritRefs="true"/>
-
- <antcall target="clean"/>
- <antcall target="precompiled-genadvisor-tests" inheritRefs="true"/>
-
- <antcall target="clean"/>
- <antcall target="non-optimized-precompiled-tests" inheritRefs="true"/>
- </target>
-
- <!-- ==================================================================================== -->
- <!-- BOOTCLASSPATH-TESTS (JDK 1.4) -->
- <!-- ==================================================================================== -->
- <target name="bootclasspath-tests" depends="retroweave">
- <delete dir="${build.bootclasspath}"/>
- <java fork="yes" classname="org.jboss.aop.hook.GenerateInstrumentedClassLoader" jvm="${java14}">
- <classpath>
- <path refid="test.classpath"/>
- </classpath>
- <arg value="${build.bootclasspath}"/>
- </java>
-
- <!-- Add tests in _base-tests unless they should only be run in this weaving mode -->
- <antcall target="_base-tests" inheritRefs="true">
- <param name="caller" value="bootclasspath-tests"/>
- <param name="test-target" value="_run-bootclasspath-test"/>
- </antcall>
-
- <!-- Tests only applicable for this weaving mode -->
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="override"/>
- <param name="caller" value="bootclasspath-tests"/>
- <param name="exclude" value="**/GenAdvisorOverrideTestCase.class"/>
- </antcall>
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="duplicatemethod"/>
- <param name="caller" value="bootclasspath-tests"/>
- </antcall>
- </target>
-
- <!-- ==================================================================================== -->
- <!-- GENERATED ADVISOR BOOTCLASSPATH-TESTS (JDK 1.4) -->
- <!-- ==================================================================================== -->
- <target name="bootclasspath-genadvisor-tests" depends="retroweave">
- <delete dir="${build.bootclasspath}"/>
- <java fork="yes" classname="org.jboss.aop.hook.GenerateInstrumentedClassLoader" jvm="${java14}">
- <classpath>
- <path refid="test.classpath"/>
- </classpath>
- <arg value="${build.bootclasspath}"/>
- </java>
-
- <!-- Tests only applicable for this weaving mode -->
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="override"/>
- <param name="caller" value="bootclasspath-genadvisor-tests"/>
- <param name="exclude" value="**/OverrideTestCase.class"/>
- </antcall>
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="nameddomain"/>
- <param name="caller" value="bootclasspath-genadvisor-tests"/>
- </antcall>
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="duplicatemethod"/>
- <param name="caller" value="bootclasspath-genadvisor-tests"/>
- </antcall>
-
- <!-- Add tests in _base-tests unless they should only be run in this weaving mode -->
- <antcall target="_base-tests" inheritRefs="true">
- <param name="caller" value="bootclasspath-genadvisor-tests"/>
- <param name="test-target" value="_run-bootclasspath-test"/>
- </antcall>
-
- </target>
-
- <target name="loadtime-test" depends="init">
- <antcall target="_run-bootclasspath-test" inheritRefs="true">
- <param name="test" value="${test}"/>
- <param name="caller" value="bootclasspath-tests"/>
- </antcall>
- </target>
-
- <!-- ==================================================================================== -->
- <!-- JDK 1.4 BOOTCLASSPATH TEST COMMONS -->
- <!-- These targets should not be called directly, use bootclasspath-tests or -->
- <!-- bootclasspath-genadvisor-tests -->
- <!-- ==================================================================================== -->
-
- <target name="_run-bootclasspath-test">
- <path id="bootclasspath">
- <pathelement location="${build.bootclasspath}"/>
- <path refid="test.classpath"/>
- </path>
- <property name="bootclasspath" refid="bootclasspath"/>
-
- <!-- Check for jboss-aop.xml override -->
- <condition property="jboss.aop.path" value="${aop.xml}">
- <isset property="aop.xml"/>
- </condition>
- <condition property="jboss.aop.path" value="">
- <isset property="no.xml"/>
- </condition>
- <condition property="jboss.aop.path" value="${source.res}/test/${test}/jboss-aop.xml">
- <not>
- <isset property="aop.xml"/>
- </not>
- </condition>
-
- <!-- Get -Djboss.aop.class.path from passed in parameters -->
- <condition property="jboss.aop.class.path" value="${build.tests.classes}">
- <isset property="use.annotations"/>
- </condition>
- <condition property="jboss.aop.class.path" value="">
- <not>
- <isset property="use.annotations"/>
- </not>
- </condition>
-
- <!-- Set the weaving mode and instrumentor to use-->
- <condition property="instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor">
- <equals arg1="${caller}" arg2="bootclasspath-tests"/>
- </condition>
- <condition property="instrumentor" value="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor">
- <equals arg1="${caller}" arg2="bootclasspath-genadvisor-tests"/>
- </condition>
-
- <echo>Running ${test} with instrumentor ${instrumentor}</echo>
-
- <mkdir dir="${build.reports}"/>
- <junit printsummary="yes" fork="yes" haltonfailure="no" jvm="${java14}">
- <jvmarg value="-Xbootclasspath/p:${bootclasspath}"/>
- <sysproperty key="jboss-junit-configuration" value="${caller}-jdk14"/>
- <sysproperty key="jboss.aop.path" value="${jboss.aop.path}"/>
- <sysproperty key="jboss.aop.class.path" value="${jboss.aop.class.path}"/>
- <sysproperty key="jboss.aop.instrumentor" value="${instrumentor}"/>
- <sysproperty key="jboss.aop.debug.classes" value="${jboss.aop.debug.classes}"/>
- <formatter type="plain" extension="-${caller}-jdk14.txt"/>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
- usefile="true" extension="-${caller}-jdk14.xml"/>
- <classpath>
- <pathelement location="${build.tests.retro}"/>
- <path refid="jboss.test14.classpath"/>
- </classpath>
- <batchtest todir="${build.reports}"
- haltonerror="false"
- haltonfailure="false"
- fork="true">
- <fileset dir="${build.tests.retro}">
- <include name="org/jboss/test/aop/${test}/**/*TestCase.class"/>
- <include name="org/jboss/test/aop/${test}/**/*Tester.class"/>
- <exclude name="${exclude}"/>
-
- <!-- This test fails on jdk1.4. reason unknown -->
- <exclude name="org/jboss/test/aop/duplicatemethod/DuplicateMethodTestCase.class"/>
- <!-- These are not test cases, and so they will fail when junit tries to run them. Should really rename all tests to *TestCase -->
- <exclude name="org/jboss/test/aop/reflection/ReflectionAspectTester.class"/>
- <exclude name="org/jboss/test/aop/basic/POJOAspectTester.class"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <!-- ==================================================================================== -->
- <!-- OPTIMIZED PRECOMPILED TESTS (JDK 1.4) -->
- <!-- ==================================================================================== -->
-
- <target name="precompiled-tests" depends="retroweave">
-
- <!-- Add tests in _base-precompiled-tests unless they should only be run in this weaving mode -->
- <antcall target="_base-tests" inheritRefs="true">
- <param name="caller" value="precompiled-tests"/>
- <param name="test-target" value="_run-precompiled-test"/>
- </antcall>
-
- <!-- Tests only applicable for this weaving mode -->
-
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="override"/>
- <param name="caller" value="precompiled-tests"/>
- <param name="exclude" value="**/GenAdvisorOverrideTestCase.class"/>
- </antcall>
- </target>
-
- <!-- ==================================================================================== -->
- <!-- NON OPTIMIZED PRECOMPILED TESTS (JDK 1.4) -->
- <!-- ==================================================================================== -->
-
- <target name="non-optimized-precompiled-tests" depends="retroweave">
-
- <!-- Tests only applicable for this weaving mode -->
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="override"/>
- <param name="caller" value="non-optimized-precompiled-tests"/>
- <param name="exclude" value="**/GenAdvisorOverrideTestCase.class"/>
- </antcall>
-
- <!-- Add tests in _base-precompiled-tests unless they should only be run in this weaving mode -->
- <antcall target="_base-tests" inheritRefs="true">
- <param name="caller" value="non-optimized-precompiled-tests"/>
- <param name="test-target" value="_run-precompiled-test"/>
- </antcall>
-
- </target>
-
- <target name="non-optimized-precompiled-test" depends="retroweave">
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="${test}"/>
- <param name="caller" value="non-optimized-precompiled-tests"/>
- </antcall>
- </target>
-
- <!-- ==================================================================================== -->
- <!-- JDK 1.4 GENERATED ADVISOR PRECOMPILED TESTS -->
- <!-- ==================================================================================== -->
-
- <target name="precompiled-genadvisor-tests" depends="retroweave">
-
- <!-- Add tests in _base-precompiled-tests unless they should only be run in this weaving mode -->
- <antcall target="_base-tests" inheritRefs="true">
- <param name="caller" value="precompiled-genadvisor-tests"/>
- <param name="test-target" value="_run-precompiled-test"/>
- </antcall>
-
- <!-- Tests only applicable for this weaving mode -->
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="typedAdvices"/>
- <param name="caller" value="precompiled-genadvisor-tests"/>
- </antcall>
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="annotatedAdviceParams"/>
- <param name="caller" value="precompiled-genadvisor-tests"/>
- </antcall>
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="dynamicgenadvisor"/>
- <param name="caller" value="precompiled-genadvisor-tests"/>
- </antcall>
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="override"/>
- <param name="caller" value="precompiled-genadvisor-tests"/>
- <param name="exclude" value="**/OverrideTestCase.class"/>
- </antcall>
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="nameddomain"/>
- <param name="caller" value="precompiled-genadvisor-tests"/>
- </antcall>
- </target>
-
- <target name="precompiled-test" depends="retroweave">
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="${test}"/>
- <param name="caller" value="precompiled-tests"/>
- </antcall>
- </target>
-
- <target name="precompiled-genadvisor-test" depends="retroweave">
- <antcall target="_run-precompiled-test" inheritRefs="true">
- <param name="test" value="${test}"/>
- <param name="caller" value="precompiled-genadvisor-tests"/>
- </antcall>
- </target>
-
- <target name="_run-precompiled-test">
-
- <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.retro.classpath"/>
- <path id="aop.task.classpath">
- <path refid="library.classpath"/>
- <path refid="dependentmodule.classpath"/>
- <path refid="aopc.classpath"/>
- </path>
-
-
- <!-- Check for jboss-aop.xml override for compiler -->
- <condition property="aoppath" value="${aop.xml}">
- <isset property="aop.xml"/>
- </condition>
- <condition property="aoppath" value="">
- <isset property="no.xml"/>
- </condition>
- <condition property="aoppath" value="${source.res}/test/${test}/jboss-aop.xml">
- <not>
- <isset property="aop.xml"/>
- </not>
- </condition>
-
- <!-- Set the weaving mode and instrumentor to use-->
- <condition property="optimized" value="true">
- <or>
- <equals arg1="${caller}" arg2="precompiled-tests"/>
- <equals arg1="${caller}" arg2="precompiled-genadvisor-tests"/>
- </or>
- </condition>
- <condition property="optimized" value="false">
- <equals arg1="${caller}" arg2="non-optimized-precompiled-tests"/>
- </condition>
- <condition property="instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor">
- <not>
- <equals arg1="${caller}" arg2="precompiled-genadvisor-tests"/>
- </not>
- </condition>
- <condition property="instrumentor" value="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor">
- <equals arg1="${caller}" arg2="precompiled-genadvisor-tests"/>
- </condition>
-
- <echo>Compiling ${test} with optimized=${optimized} and instrumentor ${instrumentor}</echo>
-
- <!-- aopc -->
- <aopc optimized="${optimized}" compilerclasspathref="aop.task.classpath" jvm="${java14}">
- <classpath refid="aop.task.classpath"/>
- <classpath refid="test.classpath"/>
- <classpath path="${build.tests.retro}"/>
- <aoppath path="${aoppath}"/>
- <sysproperty key="jboss.aop.instrumentor" value="${instrumentor}"/>
- <sysproperty key="java.io.tmpdir" value="${aopc.tmpdir}"/>
- <src path="${build.tests.retro}"/>
- <include name="org/jboss/test/aop/${test}/**"/>
- <exclude name="${exclude}"/>
- <aopclasspath path="${build.tests.retro}"/>
- </aopc>
-
- <!-- Get -Djboss.aop.path from passed in parameters -->
- <condition property="jboss.aop.path" value="${aop.xml}">
- <isset property="aop.xml"/>
- </condition>
- <condition property="jboss.aop.path" value="">
- <isset property="no.xml"/>
- </condition>
- <condition property="jboss.aop.path" value="${source.res}/test/${test}/jboss-aop.xml">
- <not>
- <isset property="aop.xml"/>
- </not>
- </condition>
-
- <!-- Get -Djboss.aop.class.path from passed in parameters -->
- <condition property="jboss.aop.class.path" value="${build.tests.retro}">
- <isset property="use.annotations"/>
- </condition>
- <condition property="jboss.aop.class.path" value="">
- <not>
- <isset property="use.annotations"/>
- </not>
- </condition>
-
- <!-- determine output directory from weaving mode -->
- <mkdir dir="${build.reports}"/>
-
- <junit printsummary="yes" fork="yes" haltonfailure="no" jvm="${java14}">
- <sysproperty key="jboss-junit-configuration" value="${caller}-jdk14"/>
- <sysproperty key="jboss.aop.path" value="${jboss.aop.path}"/>
- <sysproperty key="jboss.aop.optimized" value="${optimized}"/>
- <sysproperty key="jboss.aop.class.path" value="${jboss.aop.class.path}"/>
- <formatter type="plain" extension="-${caller}-jdk14.txt"/>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
- usefile="true" extension="-${caller}-jdk14.xml"/>
- <sysproperty key="jboss.aop.debug.classes" value="${jboss.aop.debug.classes}"/>
- <classpath>
- <path refid="test.classpath"/>
- <path refid="aopc.classpath"/>
- <pathelement location="${build.tests.retro}"/>
- <pathelement location="docs"/>
- </classpath>
- <batchtest todir="${build.reports}"
- haltonerror="false"
- haltonfailure="false"
- fork="true">
- <fileset dir="${build.tests.retro}">
- <include name="org/jboss/test/aop/${test}/**/*TestCase.class"/>
- <include name="org/jboss/test/aop/${test}/**/*Tester.class"/>
- <exclude name="${exclude}"/>
-
- <!-- This test fails on jdk1.4. reason unknown -->
- <exclude name="org/jboss/test/aop/duplicatemethod/DuplicateMethodTestCase.class"/>
- <!-- These are not test cases, and so they will fail when junit tries to run them. Should really rename all tests to *TestCase -->
- <exclude name="org/jboss/test/aop/reflection/ReflectionAspectTester.class"/>
- <exclude name="org/jboss/test/aop/basic/POJOAspectTester.class"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
-
- <!-- ==================================================================================== -->
- <!-- NON-WOVEN TESTS -->
- <!-- ==================================================================================== -->
-
- <target name="not-woven-tests" depends="retroweave">
- <mkdir dir="${build.reports}"/>
-
- <taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC" classpathref="jboss.aop.retro.classpath"/>
- <path id="aop.task.classpath">
- <path refid="library.classpath"/>
- <path refid="dependentmodule.classpath"/>
- <path refid="jboss.aop.retro.classpath"/>
- </path>
-
- <annotationc compilerclasspathref="aop.task.classpath" bytecode="true">
- <classpath refid="aop.task.classpath"/>
- <classpath path="${build.tests.retro}"/>
- <src path="${source.tests.java}"/>
- <include name="org/jboss/test/aop/annotationc/*.java"/>
- </annotationc>
-
- <junit printsummary="yes" fork="no" haltonfailure="no" jvm="${java14}">
- <sysproperty key="jboss-junit-configuration" value="jdk14"/>
- <sysproperty key="jboss.aop.debug.classes" value="${jboss.aop.debug.classes}"/>
- <classpath>
- <path refid="test.classpath"/>
- <path refid="aopc.classpath"/>
- <pathelement location="${build.tests.retro}"/>
- <pathelement location="docs"/>
- </classpath>
- <formatter type="plain" extension="-jdk14.txt"/>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
- usefile="true" extension="-jdk14.xml"/>
-
- <batchtest todir="${build.reports}"
- haltonerror="false"
- haltonfailure="false"
- fork="true">
- <fileset dir="${build.tests.retro}">
- <include name="org/jboss/test/aop/proxy/*TestCase.class"/>
- <include name="org/jboss/test/aop/methodhashing/MethodHashingTestCase.class"/>
- <include name="org/jboss/test/aop/annotationc/AnnotationTester.class"/>
- <include name="org/jboss/test/aop/pointcut/PointcutTestCase.class"/>
- </fileset>
- </batchtest>
- </junit>
- <junit printsummary="yes" fork="yes" haltonfailure="no">
- <sysproperty key="jboss.aop.path" value="${source.res}/test/container/jboss-aop.xml"/>
- <sysproperty key="jboss.aop.debug.classes" value="${jboss.aop.debug.classes}"/>
- <classpath>
- <path refid="test.classpath"/>
- <path refid="aopc.classpath"/>
- <pathelement location="${build.tests.retro}"/>
- <pathelement location="docs"/>
- </classpath>
- <sysproperty key="jboss-junit-configuration" value="jdk14"/>
- <formatter type="plain" extension="-jdk14.txt"/>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" extension="-jdk14.xml"/>
- <test todir="${build.reports}" name="org.jboss.test.aop.container.ContainerTestCase"/>
- </junit>
- </target>
-
- <target name="system-classloader-test" depends="compile-test-classes">
- <!-- Even though this is deprecated we should still make sure it works from time to time -->
- <junit printsummary="yes" fork="no" haltonfailure="false" jvm="${java14}">
- <sysproperty key="jboss-junit-configuration" value="-system-classloader-jdk14.xml"/>
- <sysproperty key="java.system.class.loader" value="org.jboss.aop.standalone.SystemClassLoader"/>
- <sysproperty key="jboss.aop.path" value="${source.res}/test/basic/jboss-aop.xml"/>
- <sysproperty key="jboss.aop.instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor"/>
- <sysproperty key="jboss.aop.debug.classes" value="${jboss.aop.debug.classes}"/>
- <classpath>
- <path refid="test.classpath"/>
- <path refid="jboss.test14.classpath"/>
- <pathelement location="${build.tests.retro}"/>
- <pathelement location="docs"/>
- </classpath>
- <formatter type="plain" extension="-systemclassloader-jdk14.txt"/>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
- usefile="true" extension="-systemclassloader-jdk14.xml"/>
- <test fork="yes" name="org.jboss.test.aop.basic.AOPTester" todir="${build.reports}"/>
- </junit>
- </target>
-
- <target name="original-memory-test" depends="compile-test-classes" description="Execute MemoryLeakTestCase">
-
- <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.retro.classpath"/>
- <property name="test" value="memoryleaks"/>
- <property name="caller" value="memoryleaks"/>
- <property name="aoppath" value="${source.res}/test/${test}/jboss-aop.xml"/>
- <property name="optimized" value="yes"/>
- <echo>Source=${build.tests.retro}</echo>
- <echo message="aoppath=${aoppath}"/>
-
- <!-- aopc -->
- <aopc compilerclasspathref="aop.task.classpath" jvm="${java14}">
- <classpath refid="aop.task.classpath"/>
- <classpath refid="test.classpath"/>
- <classpath path="${build.tests.retro}"/>
- <sysproperty key="java.io.tmpdir" value="${aopc.tmpdir}"/>
- <aoppath path="${aoppath}"/>
- <src path="${build.tests.retro}"/>
- <include name="org/jboss/test/aop/${test}/**"/>
- <aopclasspath path="${build.tests.retro}"/>
- </aopc>
-
- <junit printsummary="yes" fork="yes" haltonfailure="no" jvm="${java14}">
- <sysproperty key="jboss.aop.path" value="${aoppath}"/>
- <classpath refid="test15.classpath"/>
- <classpath path="${build.tests.retro}"/>
- <jvmarg value="-agentlib:jbossAgent"/>
- <formatter usefile="true" type="xml"/>
- <formatter usefile="true" type="plain"/>
- <test fork="yes" name="org.jboss.test.aop.memoryleaks.MemoryLeakTester"/>
- </junit>
- </target>
-</project>
Modified: projects/aop/trunk/aop/build-tests-jdk50.xml
===================================================================
--- projects/aop/trunk/aop/build-tests-jdk50.xml 2008-04-21 21:04:44 UTC (rev 72519)
+++ projects/aop/trunk/aop/build-tests-jdk50.xml 2008-04-21 21:07:55 UTC (rev 72520)
@@ -84,7 +84,9 @@
<path refid="jboss.profiler.jvmti.classpath"/>
<path refid="jboss/common.core.classpath"/>
<path refid="jboss/common.logging.log4j.classpath"/>
+ <!--
<path refid="jboss/common.logging.jdk.classpath"/>
+ -->
<path refid="jboss/common.logging.spi.classpath"/>
<path refid="jboss/jboss.reflect.classpath"/>
<path refid="jboss/jboss.mdr.classpath"/>
Modified: projects/aop/trunk/aop/build.xml
===================================================================
--- projects/aop/trunk/aop/build.xml 2008-04-21 21:04:44 UTC (rev 72519)
+++ projects/aop/trunk/aop/build.xml 2008-04-21 21:07:55 UTC (rev 72520)
@@ -84,7 +84,9 @@
<path refid="jboss.profiler.jvmti.classpath"/>
<path refid="jboss/common.core.classpath"/>
<path refid="jboss/common.logging.log4j.classpath"/>
+ <!--
<path refid="jboss/common.logging.jdk.classpath"/>
+ -->
<path refid="jboss/common.logging.spi.classpath"/>
<path refid="jboss/jboss.reflect.classpath"/>
<path refid="jboss/jboss.mdr.classpath"/>
@@ -137,7 +139,9 @@
<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="build.lib" value="${module.output}/lib"/>
<property name="build.api" value="${module.output}/api"/>
<property name="build.etc" value="${module.output}/etc"/>
@@ -184,12 +188,14 @@
<path refid="javac.classpath"/>
</path>
+<!--
<path id="jbossretro.classpath">
<path refid="apache.ant.classpath"/>
<path refid="javassist.classpath"/>
<path refid="jboss/jboss.retro.classpath"/>
<path refid="jboss/backport.concurrent.classpath"/>
</path>
+ -->
<!-- Packages to include when generating api documentation -->
@@ -240,7 +246,7 @@
<target name="compile"
description="Compile all source files."
- depends="compile-classes, compile-etc, compile-jrockit-classes, retrotranslate"/>
+ depends="compile-classes, compile-etc, compile-jrockit-classes"/>
<!-- Compile all class files -->
<target name="compile-classes" depends="init">
@@ -297,6 +303,7 @@
</copy>
</target>
+<!--
<target name="retrotranslate" depends="compile-classes">
<mkdir dir="${build.classes.retro}"/>
@@ -310,6 +317,7 @@
<src path="${build.classes}"/>
</retro>
</target>
+ -->
<!-- ================================================================== -->
<!-- Archives -->
@@ -327,10 +335,10 @@
<mkdir dir="${build.lib}"/>
<!-- Build the jboss-aop.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/**"/>
@@ -338,15 +346,17 @@
<fileset file="docs/jboss-aop_1_0.dtd"/>
<fileset file ="${source.etc}/jbossorg-eula.txt"/>
</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>
<fileset file ="${source.etc}/jbossorg-eula.txt"/>
</jar>
+ -->
<!-- Update the build marker to allow bypassing -->
<touch file="${build-bypass.marker}"/>
Modified: projects/aop/trunk/aop/jbossbuild.xml
===================================================================
--- projects/aop/trunk/aop/jbossbuild.xml 2008-04-21 21:04:44 UTC (rev 72519)
+++ projects/aop/trunk/aop/jbossbuild.xml 2008-04-21 21:07:55 UTC (rev 72520)
@@ -58,6 +58,7 @@
<!-- jboss-aop.jar -->
<!-- ============================================================ -->
+<!--
<artifactdef artifact="jboss-aop.jar">
<include input="main">
<include pattern="org/jboss/aop/**"/>
@@ -68,16 +69,19 @@
<include pattern="jboss-aop_1_0.dtd"/>
</include>
</artifactdef>
+ -->
<!-- ============================================================ -->
<!-- jdk14-pluggable-instrumentor.jar -->
<!-- ============================================================ -->
+ <!--
<artifactdef artifact="jdk14-pluggable-instrumentor.jar">
<include input="main">
<include pattern="org/jboss/aop/hook/JDK14*.class"/>
</include>
</artifactdef>
+ -->
<!-- ============================================================ -->
<!-- jboss-aop-jdk50jar -->
Deleted: projects/aop/trunk/aop/pom-jdk14.xml
===================================================================
--- projects/aop/trunk/aop/pom-jdk14.xml 2008-04-21 21:04:44 UTC (rev 72519)
+++ projects/aop/trunk/aop/pom-jdk14.xml 2008-04-21 21:07:55 UTC (rev 72520)
@@ -1,460 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- - Notes for building and running tests.
- - Do to some limitations of the maven surefire plugin, the tests must
- - occur in a separate lifecycle from the build.
- -
- - mvn -f pom-jdk14.xml install - This will build the jdk14 version of the project.
- -
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.aop-jdk14</groupId>
- <artifactId>jboss-aop-parent-jdk14</artifactId>
- <version>1-SNAPSHOT</version>
- <relativePath>../pom-jdk14.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.aop-jdk14</groupId>
- <artifactId>jboss-aop-jdk14</artifactId>
- <packaging>jar</packaging>
- <version>2.0.0-SNAPSHOT</version>
- <name>JBoss AOP</name>
- <description>JBoss AOP Framework</description>
- <url>http://labs.jboss.org/jbossaop</url>
- <build>
- <sourceDirectory>src/main/</sourceDirectory>
- <testSourceDirectory>src/test/</testSourceDirectory>
- <resources>
- <resource>
- <directory>docs</directory>
- <includes>
- <include>jboss-aop_1_0.dtd</include>
- </includes>
- </resource>
- <resource>
- <directory>src/etc</directory>
- <includes>
- <include>jbossorg-eula.txt</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jboss-retro-plugin</artifactId>
- <version>1.0-beta-1</version>
- <executions>
- <execution>
- <id>weave-classes</id>
- <goals>
- <goal>weave</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/classes-jdk14</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>weave-test-classes</id>
- <goals>
- <goal>weave-tests</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/test-classes-jdk14</outputDirectory>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <weaverClass>org.jboss.weaver.retro.WeaverRetroJdk14</weaverClass>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <classesDirectory>${project.build.directory}/classes-jdk14</classesDirectory>
- <archive>
- <manifestEntries>
- <Premain-Class>org.jboss.aop.standalone.Agent</Premain-Class>
- <Can-Redefine-Classes>true</Can-Redefine-Classes>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <excludes>
- <exclude>org/jboss/aop/hook/JRockit*</exclude>
- </excludes>
- </configuration>
- </plugin>
- <!-- The tests here are skipped, and for now
- - they should be run with ant until some of the maven issues
- - can be worked out. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <!-- When assembly plugin 2.2-beta-2 is released, we should be able to use
- - this configuration instead of the antrun config
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2-SNAPSHOT</version>
- <executions>
- <execution>
- <id>jdk50</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/jdk50.xml</descriptor>
- </descriptors>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <Implementation-URL>${pom.url}</Implementation-URL>
- <Premain-Class>org.jboss.aop.standalone.Agent</Premain-Class>
- <Can-Redefine-Classes>true</Can-Redefine-Classes>
- </manifestEntries>
- </archive>
- </configuration>
- </execution>
- <execution>
- <id>jdk50-client</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/jdk50-client.xml</descriptor>
- </descriptors>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <Implementation-URL>${pom.url}</Implementation-URL>
- <Premain-Class>org.jboss.aop.standalone.Agent</Premain-Class>
- <Can-Redefine-Classes>true</Can-Redefine-Classes>
- </manifestEntries>
- </archive>
- </configuration>
- </execution>
- <execution>
- <id>pluggable-instrumentor</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/pluggable-instrumentor.xml</descriptor>
- </descriptors>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <Implementation-URL>${pom.url}</Implementation-URL>
- <Premain-Class>org.jboss.aop.standalone.PluggableInstrumentor</Premain-Class>
- <Can-Redefine-Classes>true</Can-Redefine-Classes>
- </manifestEntries>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>-->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <!-- This execution is required until the assembly plugin can correctly
- - add custom manifest attributes to jar files.
- -->
- <id>create-jars</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <tasks>
- <property name="java.vm.version" value="${java.vm.version}"/>
- <!-- Build the jboss-aop-jdk50.jar -->
- <jar destfile="${project.build.directory}/jboss-aop-jdk14.jar">
- <fileset dir="${project.build.directory}/classes-jdk14">
- <exclude name="org/jboss/aop/standalone/PluggableInstrumentor.class"/>
- </fileset>
- <fileset file="${project.basedir}/docs/jboss-aop_1_0.dtd"/>
- <fileset file ="${project.basedir}/src/etc/jbossorg-eula.txt"/>
- <manifest>
- <attribute name="Created-By" value="${java.vm.version} (${java.vm.vendor})"/>
- <attribute name="Build-Jdk" value="${java.vm.version}"/>
- <attribute name="Specification-Title" value="${project.name}"/>
- <attribute name="Specification-Version" value="${project.version}"/>
- <attribute name="Specification-Vendor" value="${project.organization.name}"/>
- <attribute name="Implementation-Title" value="${project.name}"/>
- <attribute name="Implementation-URL" value="${project.url}"/>
- <attribute name="Implementation-Version" value="${project.version}"/>
- <attribute name="Implementation-Vendor" value="${project.organization.name}"/>
- <attribute name="Implementation-Vendor-Id" value="${project.groupId}"/>
- <attribute name="Premain-Class" value="org.jboss.aop.standalone.Agent"/>
- <attribute name="Can-Redefine-Classes" value="true"/>
- </manifest>
- </jar>
- <jar destfile="${project.build.directory}/pluggable-instrumentor-jdk14.jar">
- <fileset dir="${project.build.directory}/classes-jdk14">
- <!-- Include everything else -->
- <include name="org/jboss/aop/standalone/PluggableInstrumentor.class"/>
- </fileset>
- <fileset file ="${project.basedir}/src/etc/jbossorg-eula.txt"/>
- <manifest>
- <attribute name="Created-By" value="${java.vm.version} (${java.vm.vendor})"/>
- <attribute name="Build-Jdk" value="${java.vm.version}"/>
- <attribute name="Specification-Title" value="${project.name}"/>
- <attribute name="Specification-Version" value="${project.version}"/>
- <attribute name="Specification-Vendor" value="${project.organization.name}"/>
- <attribute name="Implementation-Title" value="${project.name}"/>
- <attribute name="Implementation-URL" value="${project.url}"/>
- <attribute name="Implementation-Version" value="${project.version}"/>
- <attribute name="Implementation-Vendor" value="${project.organization.name}"/>
- <attribute name="Implementation-Vendor-Id" value="${project.groupId}"/>
- <attribute name="Premain-Class" value="org.jboss.aop.standalone.PluggableInstrumentor"/>
- <attribute name="Can-Redefine-Classes" value="true"/>
- </manifest>
- </jar>
- <!-- Build the jboss-aop-jdk50-client.jar needed for EJB 3-->
- <jar destfile="${project.build.directory}/jboss-aop-jdk14-client.jar">
- <fileset dir="${project.build.directory}/classes-jdk14">
- <!-- 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/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>
- <fileset file ="${project.basedir}/src/etc/jbossorg-eula.txt"/>
- <manifest>
- <attribute name="Created-By" value="${java.vm.version} (${java.vm.vendor})"/>
- <attribute name="Build-Jdk" value="${java.vm.version}"/>
- <attribute name="Specification-Title" value="${project.name}"/>
- <attribute name="Specification-Version" value="${project.version}"/>
- <attribute name="Specification-Vendor" value="${project.organization.name}"/>
- <attribute name="Implementation-Title" value="${project.name}"/>
- <attribute name="Implementation-URL" value="${project.url}"/>
- <attribute name="Implementation-Version" value="${project.version}"/>
- <attribute name="Implementation-Vendor" value="${project.organization.name}"/>
- <attribute name="Implementation-Vendor-Id" value="${project.groupId}"/>
- <attribute name="Premain-Class" value="org.jboss.aop.standalone.Agent"/>
- <attribute name="Can-Redefine-Classes" value="true"/>
- </manifest>
- </jar>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <repositories>
- <repository>
- <id>jboss</id>
- <name>JBoss Inc. Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>jboss-snapshots</id>
- <name>JBoss Inc. Repository</name>
- <layout>default</layout>
- <url>http://snapshots.jboss.org/maven2</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.6.5</version>
- </dependency>
- <dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- <version>2.7.1</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>javassist</artifactId>
- <version>3.6-beta</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer-jdk14</groupId>
- <artifactId>jboss-container-jdk14</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core-jdk14</artifactId>
- <version>2.2.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-logging-spi-jdk14</artifactId>
- <version>2.0.5-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-logging-log4j-jdk14</artifactId>
- <version>2.0.5-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-logging-jdk-jdk14</artifactId>
- <version>2.0.5-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>qdox</groupId>
- <artifactId>qdox</artifactId>
- <version>1.6</version>
- </dependency>
- <dependency>
- <groupId>trove</groupId>
- <artifactId>trove</artifactId>
- <version>2.1.1</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jboss.profiler.jvmti</groupId>
- <artifactId>jboss-profiler-jvmti</artifactId>
- <version>1.0.0.CR5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-test-jdk14</artifactId>
- <version>1.0.4-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <!-- Runtime dependencies -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-backport-concurrent</artifactId>
- <version>2.1.0.GA</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>javax.management</groupId>
- <artifactId>jmxri</artifactId>
- <version>1.2.1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-retro</artifactId>
- <version>1.1.2</version>
- <classifier>rt</classifier>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
-
- <profiles>
- <!-- The test profiles are currently not working until some maven issues are fixed.
- - For now the ant scripts can be used to run the tests.
- -->
- <!--<profile>
- <id>javaagent-genadvisor-tests</id>
- <activation>
- <property>
- <name>test</name>
- <value>javaagent-genadvisor-tests</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>javaagent-genadvisor-tests</id>
- <configuration>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>-->
- </profiles>
-</project>
Modified: projects/aop/trunk/aop/pom.xml
===================================================================
--- projects/aop/trunk/aop/pom.xml 2008-04-21 21:04:44 UTC (rev 72519)
+++ projects/aop/trunk/aop/pom.xml 2008-04-21 21:07:55 UTC (rev 72520)
@@ -315,11 +315,13 @@
<artifactId>ant</artifactId>
<version>1.7.0</version>
</dependency>
+ <!-- not necessary?
<dependency>
<groupId>apache-xerces</groupId>
<artifactId>xml-apis</artifactId>
<version>2.7.1</version>
</dependency>
+ -->
<dependency>
<groupId>org.jboss</groupId>
<artifactId>javassist</artifactId>
Modified: projects/aop/trunk/aop/tests-jrockit.bat
===================================================================
--- projects/aop/trunk/aop/tests-jrockit.bat 2008-04-21 21:04:44 UTC (rev 72519)
+++ projects/aop/trunk/aop/tests-jrockit.bat 2008-04-21 21:07:55 UTC (rev 72520)
@@ -14,16 +14,16 @@
REM ###############################################################
REM Compile for jdk 1.4 with normal sun compiler
-call ant clean main compile-test-classes
+REM call ant clean main compile-test-classes
REM ###############################################################
REM Switch to JRockit and run jdk 1.4 tests
-SET PATH=%JROCKIT_PATH%
-SET JAVA_HOME=%JROCKIT_HOME%
+REM SET PATH=%JROCKIT_PATH%
+REM SET JAVA_HOME=%JROCKIT_HOME%
-call ant bootclasspath-tests
-call ant precompiled-tests
+REM call ant bootclasspath-tests
+REM call ant precompiled-tests
REM ###############################################################
REM Compile for jdk 5.0 with normal sun compiler
More information about the jboss-cvs-commits
mailing list