[Jboss-cvs] JBossAS SVN: r55370 - in projects/microcontainer/trunk: aop-mc-int container dependency kernel tools/etc/buildmagic
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Aug 7 11:59:45 EDT 2006
Author: kabir.khan at jboss.com
Date: 2006-08-07 11:59:38 -0400 (Mon, 07 Aug 2006)
New Revision: 55370
Added:
projects/microcontainer/trunk/aop-mc-int/build-test14.xml
projects/microcontainer/trunk/dependency/build-test14.xml
projects/microcontainer/trunk/kernel/build-test14.xml
Modified:
projects/microcontainer/trunk/aop-mc-int/build-test.xml
projects/microcontainer/trunk/aop-mc-int/build.xml
projects/microcontainer/trunk/container/build-test14.xml
projects/microcontainer/trunk/kernel/build-test.xml
projects/microcontainer/trunk/tools/etc/buildmagic/modules.ent
Log:
Get mc tests passing with JDK14/retro
Modified: projects/microcontainer/trunk/aop-mc-int/build-test.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/build-test.xml 2006-08-07 15:51:02 UTC (rev 55369)
+++ projects/microcontainer/trunk/aop-mc-int/build-test.xml 2006-08-07 15:59:38 UTC (rev 55370)
@@ -66,6 +66,12 @@
&libraries;
+ <path id="jboss.aop50.classpath">
+ <fileset dir="${jboss.aop.lib}">
+ <include name="jboss-aop.jar"/>
+ </fileset>
+ </path>
+
<!-- The combined library classpath -->
<path id="library.classpath">
<path refid="jboss.aop.classpath"/>
@@ -77,14 +83,15 @@
<path refid="junit.junit.classpath"/>
<path refid="oswego.concurrent.classpath"/>
<path refid="trove.trove.classpath"/>
+ <path refid="jboss.aop50.classpath"/>
+ <path refid="jboss.jbossxb.classpath"/>
</path>
<!-- ======= -->
<!-- Modules -->
<!-- ======= -->
- &modules;
-
+ &modules;
<!-- this -->
<property name="jboss.this.root" value="${module.root}/output"/>
<property name="jboss.this.lib" value="${jboss.this.root}/lib"/>
@@ -97,6 +104,7 @@
<!-- The combined dependant module classpath -->
<path id="dependentmodule.classpath">
+ <path refid="jboss.common.classpath"/>
<path refid="jboss.container.classpath"/>
<path refid="jboss.dependency.classpath"/>
<path refid="jboss.kernel.classpath"/>
@@ -111,6 +119,7 @@
<property name="source.java" value="${module.source}/tests"/>
<property name="javac.target" value="1.5"/>
<property name="javac.source" value="1.5"/>
+ <property name="build.classes" value="${module.output}/classes-tests"/>
<property name="build.testlog" value="${module.output}/log"/>
<property name="build-bypass.disabled" value="true"/>
@@ -140,11 +149,11 @@
<!-- Archives -->
<!-- ================================================================== -->
- <!--
+ <!--
| Build all jar files.
-->
<target name="module-jars" depends="init">
-
+
<!-- Build the test jar -->
<jar jarfile="${build.lib}/${jar.prefix}.jar" manifest="${build.etc}/default.mf">
<fileset dir="${build.classes}"/>
@@ -165,7 +174,7 @@
<antcall target="tests-weave" inheritRefs="true"/>
<antcall target="tests-no-weave" inheritRefs="true"/>
-
+
</target>
<target name="tests-weave" depends="most"
@@ -212,8 +221,6 @@
description="Execute all tests in the given test directory.">
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.testlog}"/>
- <!-- Remove the test.log so each run has a fresh log -->
- <delete file="${build.testlog}/test.log"/>
<junit dir="${module.output}"
printsummary="yes"
haltonerror="false"
Added: projects/microcontainer/trunk/aop-mc-int/build-test14.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/build-test14.xml 2006-08-07 15:51:02 UTC (rev 55369)
+++ projects/microcontainer/trunk/aop-mc-int/build-test14.xml 2006-08-07 15:59:38 UTC (rev 55370)
@@ -0,0 +1,400 @@
+<?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">
+ <!ENTITY targets SYSTEM "../tools/etc/buildmagic/targets.ent">
+]>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id: build-test.xml,v 1.13 2006/06/27 12:23:56 kkhan Exp $ -->
+
+<project default="main" name="JBoss/AOP-MC Integration Tests">
+
+ <!-- ================================================================== -->
+ <!-- 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;
+
+ <!--
+ | Include the normal targets.
+ -->
+ &targets;
+
+ <!-- ================================================================== -->
+ <!-- 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">
+
+ <!-- =================== -->
+ <!-- Basic Configuration -->
+ <!-- =================== -->
+
+ <!-- Module name(s) & version -->
+ <property name="module.name" value="aop-mc-int"/>
+ <property name="module.Name" value="JBoss AOP MC Integration"/>
+ <property name="module.version" value="M1"/>
+ <property name="jar.prefix" value="jboss-${module.name}-test14"/>
+
+ <!-- ========= -->
+ <!-- Libraries -->
+ <!-- ========= -->
+
+ &libraries;
+
+ <path id="jboss.aop14.classpath">
+ <fileset dir="${jboss.aop.lib}">
+ <include name="jboss-aop.jar"/>
+ </fileset>
+ </path>
+ <path id="jboss.aop50.classpath">
+ <fileset dir="${jboss.aop.lib}">
+ <include name="jboss-aop.jar"/>
+ </fileset>
+ </path>
+
+ <!-- The combined library classpath -->
+ <path id="library.classpath">
+ <path refid="jboss.aop14.classpath"/>
+ <path refid="apache.log4j.classpath"/>
+ <path refid="javassist.javassist.classpath"/>
+ <path refid="junit.junit.classpath"/>
+ <path refid="oswego.concurrent.classpath"/>
+ <path refid="trove.trove.classpath"/>
+ <path refid="jboss.common.classpath"/>
+ <path refid="jboss.container.classpath"/>
+ <path refid="jboss.jbossxb.classpath"/>
+ <path refid="jboss.test.classpath"/>
+ </path>
+
+ <!-- ======= -->
+ <!-- Modules -->
+ <!-- ======= -->
+
+ &modules;
+
+<!-- this -->
+<property name="jboss.this.root" value="${module.root}/output"/>
+<property name="jboss.this.lib" value="${jboss.this.root}/lib"/>
+<path id="jboss.this.classpath">
+ <fileset dir="${jboss.this.lib}">
+ <include name="*.jar"/>
+ <exclude name="*-test*.jar"/>
+ <exclude name="${jar.prefix}.jar"/>
+ </fileset>
+</path>
+ <!-- The combined dependant module classpath -->
+ <path id="dependentmodule.classpath">
+ <path refid="jboss.dependency.classpath"/>
+ <path refid="jboss.kernel.classpath"/>
+ <path refid="jboss.this.classpath"/>
+ </path>
+
+ <!-- ===== -->
+ <!-- Tasks -->
+ <!-- ===== -->
+
+ <property name="source.java" value="${module.source}/tests"/>
+ <property name="javac.target" value="1.5"/>
+ <property name="javac.source" value="1.5"/>
+ <property name="build.classes" value="${module.output}/classes-tests"/>
+ <property name="build.testlog" value="${module.output}/log"/>
+ <property name="build-bypass.disabled" value="true"/>
+
+ <call target="_default:task-init"/>
+
+ <!-- ============================= -->
+ <!-- Paths etc. for the retro task -->
+ <!-- ============================= -->
+ <property name="build.tests.retro" value="${module.output}/classes-tests-retro"/>
+ <property name="build.lib.retro" value="${module.output}/lib14"/>
+ <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>
+ <path id="jbossretrort.classpath">
+ <path refid="jboss/backport.concurrent.classpath"/>
+ <pathelement path="${jboss.jbossretro.lib}/jbossretro-rt.jar"/>
+ </path>
+ <path id="tests.classpath">
+ <path refid="jbossretrort.classpath"/>
+ <fileset dir="${build.lib.retro}">
+ <include name="*14.jar"/>
+ </fileset>
+ <path refid="jboss.aop14.classpath"/>
+ <path refid="trove.trove.classpath"/>
+ <path refid="jboss.container14.classpath"/>
+ <path refid="jboss.dependency14.classpath"/>
+ <path refid="jboss.kernel14.classpath"/>
+ <path refid="jboss.test.classpath"/>
+ <path refid="jboss.common.classpath"/>
+ <path refid="apache.log4j.classpath"/>
+ <path refid="javassist.classpath"/>
+ <path refid="oswego.concurrent.classpath"/>
+ <path refid="jboss.jbossxb.classpath"/>
+ </path>
+
+ </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.
+ -->
+
+ <target name="compile"
+ description="Compile all source files."
+ depends="retro"
+ />
+
+ <target name="retro">
+ <mkdir dir="${build.lib.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="library.classpath"/>
+ <classpath refid="dependentmodule.classpath"/>
+ <classpath>
+ <pathelement path="${build.classes}"/>
+ </classpath>
+ <src path="${build.classes}"/>
+ </retro>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Archives -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Build all jar files.
+ -->
+ <target name="module-jars" depends="init">
+
+ <!-- Build the test jar -->
+ <jar jarfile="${build.lib.retro}/${jar.prefix}.jar" manifest="${build.etc}/default.mf">
+ <fileset dir="${build.tests.retro}"/>
+ <fileset dir="${build.resources}/tests">
+ <include name="**"/>
+ </fileset>
+ </jar>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Tests -->
+ <!-- ================================================================== -->
+ <target name="tests" depends="init"
+ description="Execute all tests in the given test directory.">
+ <mkdir dir="${build.reports}"/>
+ <mkdir dir="${build.testlog}"/>
+
+ <antcall target="tests-weave" inheritRefs="true"/>
+ <antcall target="tests-no-weave" inheritRefs="true"/>
+
+ </target>
+
+ <target name="tests-weave" depends="init"
+ description="Execute all tests in the given test directory.">
+
+ <!-- The tests must be run with jdk1.4.x -->
+ <condition property="jdk14x">
+ <equals arg1="${ant.java.version}" arg2="1.4" />
+ </condition>
+ <fail message="jdk1.4.x must be used for the tests" unless="jdk14x"/>
+
+ <mkdir dir="${build.reports}"/>
+ <mkdir dir="${build.testlog}"/>
+ <!-- Remove the test.log so each run has a fresh log -->
+ <delete file="${build.testlog}/test.log"/>
+ <junit dir="${module.output}"
+ printsummary="yes"
+ haltonerror="false"
+ haltonfailure="false"
+ fork="true">
+
+ <sysproperty key="jboss.aop.exclude" value="org.jboss.,org.apache."/>
+ <sysproperty key="jboss.aop.include" value="org.jboss.test."/>
+ <sysproperty key="jboss-junit-configuration" value="weave"/>
+ <sysproperty key="build.testlog" value="${build.testlog}"/>
+ <sysproperty key="java.system.class.loader" value="org.jboss.aop.standalone.SystemClassLoader"/>
+
+ <classpath>
+ <pathelement location="${build.lib.retro}/${jar.prefix}.jar"/>
+ <path refid="tests.classpath"/>
+ <path refid="apache.xerces.classpath"/>
+ </classpath>
+
+ <formatter type="plain" usefile="true" extension="-weave.txt"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ usefile="true" extension="-weave.xml"/>
+
+ <batchtest todir="${build.reports}"
+ haltonerror="false"
+ haltonfailure="false"
+ fork="true">
+
+ <fileset dir="${build.tests.retro}">
+ <include name="org/jboss/test/**/*TestCase.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <target name="tests-no-weave" depends="init"
+ description="Execute all tests in the given test directory.">
+
+ <!-- The tests must be run with jdk1.4.x -->
+ <condition property="jdk14x">
+ <equals arg1="${ant.java.version}" arg2="1.4" />
+ </condition>
+ <fail message="jdk1.4.x must be used for the tests" unless="jdk14x"/>
+
+ <mkdir dir="${build.reports}"/>
+ <mkdir dir="${build.testlog}"/>
+ <!-- Remove the test.log so each run has a fresh log -->
+ <delete file="${build.testlog}/test.log"/>
+ <junit dir="${module.output}"
+ printsummary="yes"
+ haltonerror="false"
+ haltonfailure="false"
+ fork="true">
+
+ <sysproperty key="jboss-junit-configuration" value="no_weave"/>
+ <sysproperty key="build.testlog" value="${build.testlog}"/>
+
+ <classpath>
+ <pathelement location="${build.lib.retro}/${jar.prefix}.jar"/>
+ <path refid="tests.classpath"/>
+ <path refid="apache.xerces.classpath"/>
+ </classpath>
+
+ <formatter type="plain" usefile="true" extension="-no-weave.txt"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ usefile="true" extension="-no-weave.xml"/>
+
+ <batchtest todir="${build.reports}"
+ haltonerror="false"
+ haltonfailure="false"
+ fork="true">
+
+ <fileset dir="${build.tests.retro}">
+ <include name="org/jboss/test/microcontainer/test/**/*TestCase.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <target name="one-test" depends="init"
+ description="Executes a specific test with weaving.">
+
+ <!-- The tests must be run with jdk1.4.x -->
+ <condition property="jdk14x">
+ <equals arg1="${ant.java.version}" arg2="1.4" />
+ </condition>
+ <fail message="jdk1.4.x must be used for the tests" unless="jdk14x"/>
+
+ <mkdir dir="${build.reports}"/>
+ <mkdir dir="${build.testlog}"/>
+ <!-- Remove the test.log so each run has a fresh log -->
+ <delete file="${build.testlog}/test.log"/>
+ <junit dir="${module.output}"
+ printsummary="yes"
+ haltonerror="false"
+ haltonfailure="false"
+ fork="true">
+
+ <sysproperty key="jboss.aop.exclude" value="org.jboss.,org.apache."/>
+ <sysproperty key="jboss.aop.include" value="org.jboss.test."/>
+ <sysproperty key="jboss-junit-configuration" value="weave"/>
+ <sysproperty key="build.testlog" value="${build.testlog}"/>
+ <sysproperty key="java.system.class.loader" value="org.jboss.aop.standalone.SystemClassLoader"/>
+
+ <classpath>
+ <pathelement location="${build.lib.retro}/${jar.prefix}.jar"/>
+ <path refid="tests.classpath"/>
+ <path refid="apache.xerces.classpath"/>
+ </classpath>
+
+ <formatter type="plain" usefile="true" extension="-weave.txt"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ usefile="true" extension="-weave.xml"/>
+
+ <test todir="${build.reports}" name="${test}"
+ haltonerror="${junit.batchtest.haltonerror}"
+ haltonfailure="${junit.batchtest.haltonfailure}"
+ fork="${junit.batchtest.fork}"/>
+ </junit>
+ </target>
+
+ <target name="one-test-no-weave" depends="init"
+ description="Executes a specific test with no weaving.">
+
+ <!-- The tests must be run with jdk1.4.x -->
+ <condition property="jdk14x">
+ <equals arg1="${ant.java.version}" arg2="1.4" />
+ </condition>
+ <fail message="jdk1.4.x must be used for the tests" unless="jdk14x"/>
+
+ <mkdir dir="${build.reports}"/>
+ <mkdir dir="${build.testlog}"/>
+ <!-- Remove the test.log so each run has a fresh log -->
+ <delete file="${build.testlog}/test.log"/>
+ <junit dir="${module.output}"
+ printsummary="yes"
+ haltonerror="false"
+ haltonfailure="false"
+ fork="true">
+
+ <sysproperty key="jboss-junit-configuration" value="no_weave"/>
+ <sysproperty key="build.testlog" value="${build.testlog}"/>
+
+ <classpath>
+ <pathelement location="${build.lib.retro}/${jar.prefix}.jar"/>
+ <path refid="tests.classpath"/>
+ <path refid="apache.xerces.classpath"/>
+ </classpath>
+
+ <formatter type="plain" usefile="true" extension="-no-weave.txt"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ usefile="true" extension="-no-weave.xml"/>
+
+ <test todir="${build.reports}" name="${test}"
+ haltonerror="${junit.batchtest.haltonerror}"
+ haltonfailure="${junit.batchtest.haltonfailure}"
+ fork="${junit.batchtest.fork}"/>
+ </junit>
+ </target>
+
+</project>
Property changes on: projects/microcontainer/trunk/aop-mc-int/build-test14.xml
___________________________________________________________________
Name: svn:executable
+ *
Modified: projects/microcontainer/trunk/aop-mc-int/build.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/build.xml 2006-08-07 15:51:02 UTC (rev 55369)
+++ projects/microcontainer/trunk/aop-mc-int/build.xml 2006-08-07 15:59:38 UTC (rev 55370)
@@ -71,10 +71,10 @@
<path refid="apache.log4j.classpath"/>
<path refid="oswego.concurrent.classpath"/>
<path refid="junit.junit.classpath"/>
- <path refid="jboss.aop.classpath"/>
- <path refid="jboss.common.classpath"/>
- <path refid="jboss.jbossxb.classpath"/>
- <path refid="jboss.test.classpath"/>
+ <path refid="jboss.aop.classpath"/>
+ <path refid="jboss.common.classpath"/>
+ <path refid="jboss.jbossxb.classpath"/>
+ <path refid="jboss.test.classpath"/>
</path>
<!-- ======= -->
@@ -90,6 +90,18 @@
<path refid="jboss.kernel.classpath"/>
</path>
+ <!-- ============================= -->
+ <!-- Paths etc. for the retro task -->
+ <!-- ============================= -->
+ <property name="build.classes.retro" value="${module.output}/classes-retro"/>
+ <property name="build.lib.retro" value="${module.output}/lib14"/>
+ <path id="jbossretro.classpath">
+ <path refid="apache.ant.classpath"/>
+ <path refid="jboss.jbossretro.classpath"/>
+ <path refid="jboss/backport.concurrent.classpath"/>
+ <path refid="javassist.classpath"/>
+ </path>
+
<!-- ===== -->
<!-- Tasks -->
<!-- ===== -->
@@ -118,18 +130,33 @@
description="Compile all source files."
depends="_default:compile-classes,
_default:compile-etc,
- _default:compile-resources"
+ _default:compile-resources,
+ retro"
/>
+ <target name="retro">
+ <mkdir dir="${build.lib.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="library.classpath"/>
+ <classpath refid="dependentmodule.classpath"/>
+ <classpath>
+ <pathelement path="${build.classes}"/>
+ </classpath>
+ <src path="${build.classes}"/>
+ </retro>
+ </target>
+
<!-- ================================================================== -->
<!-- Archives -->
<!-- ================================================================== -->
- <!--
+ <!--
| Build all jar files.
-->
<target name="module-jars" depends="init">
-
+
<!-- Build jboss-kernel.jar -->
<jar jarfile="${build.lib}/${jar.prefix}.jar" manifest="${build.etc}/default.mf">
<fileset dir="${build.classes}"/>
@@ -137,6 +164,12 @@
<include name="schema/**"/>
</fileset>
</jar>
+ <jar jarfile="${build.lib.retro}/${jar.prefix}14.jar" manifest="${build.etc}/default.mf">
+ <fileset dir="${build.classes.retro}"/>
+ <fileset dir="${build.resources}">
+ <include name="schema/**"/>
+ </fileset>
+ </jar>
</target>
Modified: projects/microcontainer/trunk/container/build-test14.xml
===================================================================
--- projects/microcontainer/trunk/container/build-test14.xml 2006-08-07 15:51:02 UTC (rev 55369)
+++ projects/microcontainer/trunk/container/build-test14.xml 2006-08-07 15:59:38 UTC (rev 55370)
@@ -84,10 +84,7 @@
<property name="jboss.this.lib" value="${jboss.this.root}/lib"/>
<path id="jboss.this.classpath">
<fileset dir="${jboss.this.lib}">
- <include name="*.jar"/>
- <include name="*14.jar"/>
- <exclude name="*-test.jar"/>
- <exclude name="${jar.prefix}14.jar"/>
+ <include name="jboss-container.jar"/>
</fileset>
</path>
Added: projects/microcontainer/trunk/dependency/build-test14.xml
===================================================================
--- projects/microcontainer/trunk/dependency/build-test14.xml 2006-08-07 15:51:02 UTC (rev 55369)
+++ projects/microcontainer/trunk/dependency/build-test14.xml 2006-08-07 15:59:38 UTC (rev 55370)
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+ <!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent">
+ <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
+ <!ENTITY targets SYSTEM "../tools/etc/buildmagic/targets.ent">
+]>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id: build-test.xml,v 1.6 2006/05/04 14:08:43 adrian Exp $ -->
+
+<project default="main" name="JBoss/Dependency Tests">
+
+ <!-- ================================================================== -->
+ <!-- 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;
+
+ <!--
+ | Include the normal targets.
+ -->
+ &targets;
+
+ <!-- ================================================================== -->
+ <!-- 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">
+
+ <!-- =================== -->
+ <!-- Basic Configuration -->
+ <!-- =================== -->
+
+ <!-- Module name(s) & version -->
+ <property name="module.name" value="dependency"/>
+ <property name="module.Name" value="JBoss Dependency"/>
+ <property name="module.version" value="DEV"/>
+
+ <!-- ========= -->
+ <!-- Libraries -->
+ <!-- ========= -->
+
+ &libraries;
+
+ <!-- The combined library classpath -->
+ <path id="library.classpath">
+ <path refid="junit.junit.classpath"/>
+ <path refid="apache.log4j.classpath"/>
+ <path refid="oswego.concurrent.classpath"/>
+ <path refid="jboss.test.classpath"/>
+ </path>
+
+ <!-- ======= -->
+ <!-- Modules -->
+ <!-- ======= -->
+
+<!-- this -->
+<property name="jboss.this.root" value="${module.root}/output"/>
+<property name="jboss.this.lib" value="${jboss.this.root}/lib"/>
+<path id="jboss.this.classpath">
+ <fileset dir="${jboss.this.lib}">
+ <include name="*.jar"/>
+ <exclude name="*-test*.jar"/>
+ <exclude name="${jar.prefix}.jar"/>
+ </fileset>
+</path>
+
+ <!-- The combined dependant module classpath -->
+ <path id="dependentmodule.classpath">
+ <path refid="jboss.this.classpath"/>
+ <path refid="jboss.common.classpath"/>
+ </path>
+
+ <!-- ===== -->
+ <!-- Tasks -->
+ <!-- ===== -->
+
+ <property name="source.java" value="${module.source}/tests"/>
+ <property name="javac.target" value="1.5"/>
+ <property name="javac.source" value="1.5"/>
+ <property name="build.classes" value="${module.output}/classes-tests"/>
+ <property name="build.testlog" value="${module.output}/log"/>
+ <property name="build-bypass.disabled" value="true"/>
+
+ <call target="_default:task-init"/>
+
+ <!-- ============================= -->
+ <!-- Paths etc. for the retro task -->
+ <!-- ============================= -->
+ <property name="build.tests.retro" value="${module.output}/classes-tests-retro"/>
+ <property name="build.lib.retro" value="${module.output}/lib14"/>
+ <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>
+ <path id="jbossretrort.classpath">
+ <path refid="jboss/backport.concurrent.classpath"/>
+ <pathelement path="${jboss.jbossretro.lib}/jbossretro-rt.jar"/>
+ </path>
+ <path id="tests.classpath">
+ <path refid="jbossretrort.classpath"/>
+ <fileset dir="${build.lib.retro}">
+ <include name="*.jar"/>
+ </fileset>
+ <path refid="jboss.test.classpath"/>
+ <path refid="jboss.common.classpath"/>
+ <path refid="apache.log4j.classpath"/>
+ <path refid="javassist.classpath"/>
+ <path refid="oswego.concurrent.classpath"/>
+ <path refid="jboss.profiler.jvmti.classpath"/>
+ </path>
+ </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.
+ -->
+
+ <target name="compile"
+ description="Compile all source files."
+ depends="retro"
+ />
+
+ <target name="retro">
+ <mkdir dir="${build.lib.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="library.classpath"/>
+ <classpath refid="dependentmodule.classpath"/>
+ <classpath>
+ <pathelement path="${build.classes}"/>
+ </classpath>
+ <src path="${build.classes}"/>
+ </retro>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Archives -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Build all jar files.
+ -->
+ <target name="module-jars" depends="init">
+
+ <jar jarfile="${build.lib.retro}/jboss-dependency-test14.jar" manifest="${build.etc}/default.mf">
+ <fileset dir="${build.tests.retro}"/>
+ </jar>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Tests -->
+ <!-- ================================================================== -->
+
+ <target name="tests" depends="init"
+ description="Execute all tests in the given test directory.">
+
+ <!-- The tests must be run with jdk1.4.x -->
+ <condition property="jdk14x">
+ <equals arg1="${ant.java.version}" arg2="1.4" />
+ </condition>
+ <fail message="jdk1.4.x must be used for the tests" unless="jdk14x"/>
+
+ <mkdir dir="${build.reports}"/>
+ <mkdir dir="${build.testlog}"/>
+ <delete file="${build.testlog}/test.log"/>
+ <junit dir="${module.output}"
+ printsummary="yes"
+ haltonerror="false"
+ haltonfailure="false"
+ fork="true">
+
+ <sysproperty key="build.testlog" value="${build.testlog}"/>
+
+ <classpath>
+ <pathelement location="${build.tests.retro}"/>
+ <pathelement location="${build.resources}"/>
+ <path refid="tests.classpath"/>
+ <path refid="apache.xerces.classpath"/>
+ </classpath>
+
+ <formatter type="plain" usefile="true"/>
+ <formatter type="xml" usefile="true"/>
+
+ <batchtest todir="${build.reports}"
+ haltonerror="false"
+ haltonfailure="false"
+ fork="true">
+
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/**/*TestCase.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <target name="one-test" depends="init"
+ description="Execute all tests in the given test directory.">
+
+ <!-- The tests must be run with jdk1.4.x -->
+ <condition property="jdk14x">
+ <equals arg1="${ant.java.version}" arg2="1.4" />
+ </condition>
+ <fail message="jdk1.4.x must be used for the tests" unless="jdk14x"/>
+
+ <mkdir dir="${build.reports}"/>
+ <mkdir dir="${build.testlog}"/>
+ <delete file="${build.testlog}/test.log"/>
+ <junit dir="${module.output}"
+ printsummary="yes"
+ haltonerror="false"
+ haltonfailure="false"
+ fork="true">
+
+ <sysproperty key="build.testlog" value="${build.testlog}"/>
+
+ <classpath>
+ <pathelement location="${build.tests.retro}"/>
+ <pathelement location="${build.resources}"/>
+ <path refid="tests.classpath"/>
+ <path refid="apache.xerces.classpath"/>
+ </classpath>
+
+ <formatter type="plain" usefile="true"/>
+ <formatter type="xml" usefile="true"/>
+
+ <test todir="${build.reports}" name="${test}"
+ haltonerror="${junit.batchtest.haltonerror}"
+ haltonfailure="${junit.batchtest.haltonfailure}"
+ fork="${junit.batchtest.fork}"/>
+ </junit>
+ </target>
+
+</project>
Property changes on: projects/microcontainer/trunk/dependency/build-test14.xml
___________________________________________________________________
Name: svn:executable
+ *
Modified: projects/microcontainer/trunk/kernel/build-test.xml
===================================================================
--- projects/microcontainer/trunk/kernel/build-test.xml 2006-08-07 15:51:02 UTC (rev 55369)
+++ projects/microcontainer/trunk/kernel/build-test.xml 2006-08-07 15:59:38 UTC (rev 55370)
@@ -2,6 +2,7 @@
<!DOCTYPE project [
<!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent">
<!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
+ <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent">
<!ENTITY targets SYSTEM "../tools/etc/buildmagic/targets.ent">
]>
@@ -77,6 +78,8 @@
<!-- Modules -->
<!-- ======= -->
+ &modules;
+
<!-- this -->
<property name="jboss.this.root" value="${module.root}/output"/>
<property name="jboss.this.lib" value="${jboss.this.root}/lib"/>
@@ -86,22 +89,6 @@
<exclude name="${jar.prefix}.jar"/>
</fileset>
</path>
-<!-- container -->
-<property name="jboss.container.root" value="${project.root}/container"/>
-<property name="jboss.container.lib" value="${jboss.container.root}/output/lib"/>
-<path id="jboss.container.classpath">
- <fileset dir="${jboss.container.lib}">
- <include name="jboss-container.jar"/>
- </fileset>
-</path>
-<!-- dependency -->
-<property name="jboss.dependency.root" value="${project.root}/dependency"/>
-<property name="jboss.dependency.lib" value="${jboss.dependency.root}/output/lib"/>
-<path id="jboss.dependency.classpath">
- <fileset dir="${jboss.dependency.lib}">
- <include name="jboss-dependency.jar"/>
- </fileset>
-</path>
<!-- The combined dependant module classpath -->
<path id="dependentmodule.classpath">
Added: projects/microcontainer/trunk/kernel/build-test14.xml
===================================================================
--- projects/microcontainer/trunk/kernel/build-test14.xml 2006-08-07 15:51:02 UTC (rev 55369)
+++ projects/microcontainer/trunk/kernel/build-test14.xml 2006-08-07 15:59:38 UTC (rev 55370)
@@ -0,0 +1,306 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+ <!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent">
+ <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
+ <!ENTITY targets SYSTEM "../tools/etc/buildmagic/targets.ent">
+]>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id: build-test.xml,v 1.14 2006/06/25 11:05:24 adrian Exp $ -->
+
+<project default="main" name="JBoss/MicroContainer Tests">
+
+ <!-- ================================================================== -->
+ <!-- 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;
+
+ <!--
+ | Include the normal targets.
+ -->
+ &targets;
+
+ <!-- ================================================================== -->
+ <!-- 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">
+
+ <!-- =================== -->
+ <!-- Basic Configuration -->
+ <!-- =================== -->
+
+ <!-- Module name(s) & version -->
+ <property name="module.name" value="microcontainer"/>
+ <property name="module.Name" value="JBoss MicroContainer"/>
+ <property name="module.version" value="2.0.0.M1"/>
+
+ <!-- ========= -->
+ <!-- Libraries -->
+ <!-- ========= -->
+
+ &libraries;
+
+ <!-- The combined library classpath -->
+ <path id="library.classpath">
+ <path refid="junit.junit.classpath"/>
+ <path refid="apache.log4j.classpath"/>
+ <path refid="oswego.concurrent.classpath"/>
+ <path refid="jboss.test.classpath"/>
+ <path refid="jboss.jbossxb.classpath"/>
+ </path>
+
+ <!-- ======= -->
+ <!-- Modules -->
+ <!-- ======= -->
+
+<!-- this -->
+<property name="jboss.this.root" value="${module.root}/output"/>
+<property name="jboss.this.lib" value="${jboss.this.root}/lib"/>
+<path id="jboss.this.classpath">
+ <fileset dir="${jboss.this.lib}">
+ <include name="*.jar"/>
+ <exclude name="*-test*.jar"/>
+ <exclude name="${jar.prefix}.jar"/>
+ </fileset>
+</path>
+<!-- container -->
+<property name="jboss.container.root" value="${project.root}/container"/>
+<property name="jboss.container.lib" value="${jboss.container.root}/output/lib"/>
+<path id="jboss.container.classpath">
+ <fileset dir="${jboss.container.lib}">
+ <include name="jboss-container.jar"/>
+ </fileset>
+</path>
+<property name="jboss.container14.lib" value="${jboss.container.root}/output/lib14"/>
+<path id="jboss.container14.classpath">
+ <fileset dir="${jboss.container14.lib}">
+ <include name="jboss-container14.jar"/>
+ </fileset>
+</path>
+<!-- dependency -->
+<property name="jboss.dependency.root" value="${project.root}/dependency"/>
+<property name="jboss.dependency.lib" value="${jboss.dependency.root}/output/lib"/>
+<path id="jboss.dependency.classpath">
+ <fileset dir="${jboss.dependency.lib}">
+ <include name="jboss-dependency.jar"/>
+ </fileset>
+</path>
+<property name="jboss.dependency14.lib" value="${jboss.dependency.root}/output/lib14"/>
+<path id="jboss.dependency14.classpath">
+ <fileset dir="${jboss.dependency14.lib}">
+ <include name="jboss-dependency14.jar"/>
+ </fileset>
+</path>
+
+ <!-- The combined dependant module classpath -->
+ <path id="dependentmodule.classpath">
+ <path refid="jboss.this.classpath"/>
+ <path refid="jboss.common.classpath"/>
+ <path refid="jboss.container.classpath"/>
+ <path refid="jboss.dependency.classpath"/>
+ </path>
+
+ <!-- ===== -->
+ <!-- Tasks -->
+ <!-- ===== -->
+
+ <property name="source.java" value="${module.source}/tests"/>
+ <property name="javac.target" value="1.5"/>
+ <property name="javac.source" value="1.5"/>
+ <property name="build.classes" value="${module.output}/classes-tests"/>
+ <property name="build.testlog" value="${module.output}/log"/>
+ <property name="build-bypass.disabled" value="true"/>
+
+ <call target="_default:task-init"/>
+
+ <!-- ============================= -->
+ <!-- Paths etc. for the retro task -->
+ <!-- ============================= -->
+ <property name="build.tests.retro" value="${module.output}/classes-tests-retro"/>
+ <property name="build.lib.retro" value="${module.output}/lib14"/>
+ <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>
+ <path id="jbossretrort.classpath">
+ <path refid="jboss/backport.concurrent.classpath"/>
+ <pathelement path="${jboss.jbossretro.lib}/jbossretro-rt.jar"/>
+ </path>
+ <path id="tests.classpath">
+ <path refid="jbossretrort.classpath"/>
+ <fileset dir="${build.lib.retro}">
+ <include name="*14.jar"/>
+ </fileset>
+ <path refid="jboss.container14.classpath"/>
+ <path refid="jboss.dependency14.classpath"/>
+ <path refid="jboss.test.classpath"/>
+ <path refid="jboss.common.classpath"/>
+ <path refid="apache.log4j.classpath"/>
+ <path refid="javassist.classpath"/>
+ <path refid="oswego.concurrent.classpath"/>
+ <path refid="jboss.profiler.jvmti.classpath"/>
+ <path refid="jboss.jbossxb.classpath"/>
+ </path>
+ </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.
+ -->
+
+ <target name="compile"
+ description="Compile all source files."
+ depends="retro"
+ />
+
+ <target name="retro">
+ <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="library.classpath"/>
+ <classpath refid="dependentmodule.classpath"/>
+ <classpath>
+ <pathelement path="${build.classes}"/>
+ </classpath>
+ <src path="${build.classes}"/>
+ </retro>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Archives -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Build all jar files.
+ -->
+ <target name="module-jars" depends="init">
+ <!-- Build jboss-kernel.jar -->
+ <jar jarfile="${build.lib.retro}/jboss-microcontainer-test14.jar" manifest="${build.etc}/default.mf">
+ <fileset dir="${build.tests.retro}"/>
+ <fileset dir="${build.resources}">
+ <include name="org/**"/>
+ <include name="xml-test/**"/>
+ </fileset>
+ </jar>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Tests -->
+ <!-- ================================================================== -->
+
+ <target name="tests" depends="init"
+ description="Execute all tests in the given test directory.">
+
+ <!-- The tests must be run with jdk1.4.x -->
+ <condition property="jdk14x">
+ <equals arg1="${ant.java.version}" arg2="1.4" />
+ </condition>
+ <fail message="jdk1.4.x must be used for the tests" unless="jdk14x"/>
+
+ <mkdir dir="${build.reports}"/>
+ <mkdir dir="${build.testlog}"/>
+ <delete file="${build.testlog}/test.log"/>
+ <junit dir="${module.output}"
+ printsummary="yes"
+ haltonerror="false"
+ haltonfailure="false"
+ fork="true">
+
+ <sysproperty key="build.testlog" value="${build.testlog}"/>
+
+ <classpath>
+ <pathelement location="${build.tests.retro}"/>
+ <pathelement location="${build.resources}"/>
+ <path refid="tests.classpath"/>
+ <path refid="apache.xerces.classpath"/>
+ </classpath>
+
+ <formatter type="plain" usefile="true"/>
+ <formatter type="xml" usefile="true"/>
+
+ <batchtest todir="${build.reports}"
+ haltonerror="false"
+ haltonfailure="false"
+ fork="true">
+
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/**/*TestCase.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+
+ <target name="one-test" depends="init"
+ description="Execute all tests in the given test directory.">
+
+ <!-- The tests must be run with jdk1.4.x -->
+ <condition property="jdk14x">
+ <equals arg1="${ant.java.version}" arg2="1.4" />
+ </condition>
+ <fail message="jdk1.4.x must be used for the tests" unless="jdk14x"/>
+
+ <mkdir dir="${build.reports}"/>
+ <mkdir dir="${build.testlog}"/>
+ <delete file="${build.testlog}/test.log"/>
+ <junit dir="${module.output}"
+ printsummary="yes"
+ haltonerror="false"
+ haltonfailure="false"
+ fork="true">
+
+ <sysproperty key="build.testlog" value="${build.testlog}"/>
+
+ <classpath>
+ <pathelement location="${build.tests.retro}"/>
+ <pathelement location="${build.resources}"/>
+ <path refid="tests.classpath"/>
+ <path refid="apache.xerces.classpath"/>
+ </classpath>
+
+ <formatter type="plain" usefile="true"/>
+ <formatter type="xml" usefile="true"/>
+
+ <test todir="${build.reports}" name="${test}"
+ haltonerror="${junit.batchtest.haltonerror}"
+ haltonfailure="${junit.batchtest.haltonfailure}"
+ fork="${junit.batchtest.fork}"/>
+ </junit>
+ </target>
+
+</project>
Property changes on: projects/microcontainer/trunk/kernel/build-test14.xml
___________________________________________________________________
Name: svn:executable
+ *
Modified: projects/microcontainer/trunk/tools/etc/buildmagic/modules.ent
===================================================================
--- projects/microcontainer/trunk/tools/etc/buildmagic/modules.ent 2006-08-07 15:51:02 UTC (rev 55369)
+++ projects/microcontainer/trunk/tools/etc/buildmagic/modules.ent 2006-08-07 15:59:38 UTC (rev 55370)
@@ -8,6 +8,12 @@
<include name="jboss-container.jar"/>
</fileset>
</path>
+<property name="jboss.container14.lib" value="${jboss.container.root}/output/lib14"/>
+<path id="jboss.container14.classpath">
+ <fileset dir="${jboss.container14.lib}">
+ <include name="jboss-container14.jar"/>
+ </fileset>
+</path>
<!-- dependency -->
<property name="jboss.dependency.root" value="${project.root}/dependency"/>
<property name="jboss.dependency.lib" value="${jboss.dependency.root}/output/lib"/>
@@ -16,6 +22,12 @@
<include name="jboss-dependency.jar"/>
</fileset>
</path>
+<property name="jboss.dependency14.lib" value="${jboss.dependency.root}/output/lib14"/>
+<path id="jboss.dependency14.classpath">
+ <fileset dir="${jboss.dependency14.lib}">
+ <include name="jboss-dependency14.jar"/>
+ </fileset>
+</path>
<!-- kernel -->
<property name="jboss.kernel.root" value="${project.root}/kernel"/>
<property name="jboss.kernel.lib" value="${jboss.kernel.root}/output/lib"/>
@@ -29,6 +41,17 @@
<include name="jboss-microcontainer-test.jar"/>
</fileset>
</path>
+<property name="jboss.kernel14.lib" value="${jboss.kernel.root}/output/lib14"/>
+<path id="jboss.kernel14.classpath">
+ <fileset dir="${jboss.kernel14.lib}">
+ <include name="jboss-microcontainer14.jar"/>
+ </fileset>
+</path>
+<path id="jboss.kernel-test14.classpath">
+ <fileset dir="${jboss.kernel14.lib}">
+ <include name="jboss-microcontainer-test14.jar"/>
+ </fileset>
+</path>
<!-- kernel -->
<property name="jboss.aop-mc-int.root" value="${project.root}/aop-mc-int"/>
<property name="jboss.aop-mc-int.lib" value="${jboss.aop-mc-int.root}/output/lib"/>
@@ -37,6 +60,12 @@
<include name="jboss-aop-mc-int.jar"/>
</fileset>
</path>
+<property name="jboss.aop-mc-int14.lib" value="${jboss.aop-mc-int.root}/output/lib14"/>
+<path id="jboss.aop-mc-int14.classpath">
+ <fileset dir="${jboss.aop-mc-int14.lib}">
+ <include name="jboss-aop-mc-int14.jar"/>
+ </fileset>
+</path>
More information about the jboss-cvs-commits
mailing list