From: Kabir K. <kk...@jb...> - 2005-08-11 18:15:47
|
User: kkhan Date: 05/08/11 14:14:30 Modified: jbosstest build.xml Log: Getting the Security and Tx aop tests to run with JDK 5 JBAS-2105 JBAS-2104 Revision Changes Path 1.493 +31 -3 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.492 retrieving revision 1.493 diff -u -b -r1.492 -r1.493 --- build.xml 10 Aug 2005 21:03:33 -0000 1.492 +++ build.xml 11 Aug 2005 18:14:30 -0000 1.493 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.492 2005/08/10 21:03:33 adrian Exp $ --> +<!-- $Id: build.xml,v 1.493 2005/08/11 18:14:30 kkhan Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -171,6 +171,7 @@ <!-- Where source files live --> <property name="source.java" value="${module.source}/main"/> + <property name="source.java.5" value="${module.source}/jdk15"/> <property name="source.etc" value="${module.source}/etc"/> <property name="source.docs" value="${module.source}/docs"/> <property name="source.resources" value="${module.source}/resources"/> @@ -290,7 +291,33 @@ <target name="compile-classes" depends="compile-bean-sources, compile-mbean-sources, compile-proxycompiler-bean-sources, compile-classes-only"> </target> - <target name="compile-classes-only"> + <target name="compile-annotated-classes-50" if="HAVE_JDK_1.5"> + <mkdir dir="${build.classes}"/> + + <!-- Make sure that jdk 50 aspect library comes first, since that contains the + JDK 5 version of the annotation types + --> + <path id="annotations.classpath"> + <pathelement path="${jboss.aspects.lib}/jboss-aspect-library-jdk50.jar"/> + <path refid="tests.classpath"/> + </path> + <javac destdir="${build.classes}" + optimize="${javac.optimize}" + source="1.5" + target="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.java.5}"/> + <classpath refid="annotations.classpath"/> + </javac> + </target> + + <target name="compile-classes-only" depends="compile-annotated-classes-50"> <mkdir dir="${build.classes}"/> <javac destdir="${build.classes}" optimize="${javac.optimize}" @@ -306,6 +333,7 @@ <src path="${source.java}"/> <src path="${build.gen-src}"/> <exclude name="org/jboss/test/recover/oracle/**"/> + <exclude name="org/jboss/test/aop/bean/Annotated*" if="HAVE_JDK_1.5"/> <classpath refid="tests.classpath"/> </javac> </target> |