Author: mwringe Date: 2007-08-16 15:03:25 -0400 (Thu, 16 Aug 2007) New Revision: 7965 Modified: trunk/core-admin/build.xml Log: Make portal-admin tests dependent of JVM version used. Modified: trunk/core-admin/build.xml =================================================================== --- trunk/core-admin/build.xml 2007-08-16 18:21:55 UTC (rev 7964) +++ trunk/core-admin/build.xml 2007-08-16 19:03:25 UTC (rev 7965) @@ -101,7 +101,6 @@ <path refid="el.el.classpath"/> <path refid="jakarta.cactus.classpath"/> <path refid="junit.junit.classpath"/> - <path refid="jboss.jsfunit.classpath"/> <pathelement location="${source.etc}/sun-jsf/jsf-example.jar"/> </path> @@ -133,6 +132,7 @@ <call target="configure-defaults"/> <call target="configure-tools"/> <call target="configure-explode"/> + <call target="configure-jsfunit"/> <!--+=======================================+--> <!--| Define module specific elements here. |--> @@ -149,22 +149,6 @@ <taskdef name="xmltask" classname="com.oopsconsultancy.xmltask.ant.XmlTask" classpathref="xmltask.xmltask.classpath"/> - <taskdef name="jsfunitwar" - classname="org.jboss.jsfunit.ant.JSFUnitWarTask"> - <classpath> - <fileset dir="${jboss.jsfunit.lib}"/> -<!-- <fileset dir="${cargo.lib}"/> --> - <fileset dir="${jakarta.cactus.lib}"/> - <fileset dir="${aspectj.aspectj.lib}"/> - <fileset dir="${nekohtml.nekohtml.lib}"/> - <fileset dir="${httpunit.httpunit.lib}"/> - <fileset dir="${jtidy.jtidy.lib}"/> - <fileset dir="${project.tools}/lib"> - <include name="*cargo**"/> - </fileset> - </classpath> - </taskdef> - </target> <path id="portal.task.classpath"> @@ -193,6 +177,24 @@ classpathref="explode.task.classpath"/> </target> + <target name="configure-jsfunit" if="HAVE_JDK_1.5"> + <taskdef name="jsfunitwar" + classname="org.jboss.jsfunit.ant.JSFUnitWarTask"> + <classpath> + <fileset dir="${jboss.jsfunit.lib}"/> + <fileset dir="${jakarta.cactus.lib}"/> + <fileset dir="${aspectj.aspectj.lib}"/> + <fileset dir="${nekohtml.nekohtml.lib}"/> + <fileset dir="${httpunit.httpunit.lib}"/> + <fileset dir="${jtidy.jtidy.lib}"/> + <fileset dir="${project.tools}/lib"> + <include name="*cargo**"/> + </fileset> + </classpath> + </taskdef> + </target> + + <!--+====================================================================+--> <!--| Compile |--> <!--| |--> @@ -203,12 +205,88 @@ <target name="compile" description="Compile all source files." - depends="_default:compile-classes, + depends="compile-classes, + compile-classes15, _default:compile-etc, _default:compile-resources"> <!-- Add module specific elements here. --> </target> + <!-- taken from the identity build.xml --> + <target name="compile-classes" depends="_buildmagic:init" unless="HAVE_JDK_1.5"> + <mkdir dir="${build.classes}"/> + + <!-- Hack, required to avoid duplicate javac targets --> + <mkdir dir="${build.gen.classes}"/> + + <!-- Remove classes which depend on changed files, so they will rebuild. --> + <depend srcdir="${source.java}:${build.gen.classes}" + destdir="${build.classes}" + dump="${javac.depend.dump}" + closure="${javac.depend.closure}"> + <include name="${javac.includes}"/> + <exclude name="${javac.excludes}"/> + </depend> + + <javac destdir="${build.classes}" + optimize="${javac.optimize}" + target="${javac.target}" + debug="${javac.debug}" + source="${javac.source}" + 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}:${build.gen.classes}"/> + <classpath refid="javac.classpath"/> + + <include name="${javac.includes}"/> + <exclude name="${javac.excludes}"/> + <exclude name="org/jboss/portal/test/**"/> + </javac> + </target> + + <!-- taken from the identity build.xml --> + <target name="compile-classes15" depends="_buildmagic:init" if="HAVE_JDK_1.5"> + <mkdir dir="${build.classes}"/> + + <!-- Hack, required to avoid duplicate javac targets --> + <mkdir dir="${build.gen.classes}"/> + + <!-- Remove classes which depend on changed files, so they will rebuild. --> + <depend srcdir="${source.java}:${build.gen.classes}" + destdir="${build.classes}" + dump="${javac.depend.dump}" + closure="${javac.depend.closure}"> + <include name="${javac.includes}"/> + <exclude name="${javac.excludes}"/> + </depend> + + <javac destdir="${build.classes}" + optimize="${javac.optimize}" + target="${javac.target}" + debug="${javac.debug}" + source="${javac.source}" + 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}:${build.gen.classes}"/> + <classpath refid="javac.classpath"/> + <classpath refid="jboss.jsfunit.classpath"/> + + <include name="${javac.includes}"/> + <exclude name="${javac.excludes}"/> + </javac> + </target> + + + + <!--+====================================================================+--> <!--| Generate Output |--> <!--| |--> @@ -318,7 +396,7 @@ <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-admin.sar"/> </target> - <target name="package-tests" depends="init, clean-tests"> + <target name="package-tests" depends="init, clean-tests" if="HAVE_JDK_1.5"> <!-- create the jar to contain the test files --> <jar jarfile="${build.lib}/portal-core-admin-test-lib.jar"> @@ -386,6 +464,10 @@ <target name="tests" depends="init" description="Runs the portal-admin tests"> <mkdir dir="${build.reports}"/> <mkdir dir="${test.reports}"/> + <call target="tests15"/> + </target> + + <target name="tests15" if="HAVE_JDK_1.5"> <deploy file="${jboss.portal-core.lib}/jboss-portal.sar" config="default"/> <deploy file="${build.lib}/portal-admin-test.sar" config="default"/> <junit printsummary="true" haltonerror="false" fork="true">