notify-dpml AT lists.ibiblio.org
Subject: DPML Notify
List archive
- From: niclas AT netcompartner.com
- To: notify-dpml AT lists.ibiblio.org
- Subject: svn commit: r1656 - development/main
- Date: Sun, 30 Jan 2005 22:43:55 +0100
Author: niclas
Date: Sun Jan 30 22:43:55 2005
New Revision: 1656
Modified:
development/main/bootstrap.xml
Log:
Must use per-test forks, otherwise the Transit instance will survive
improperly.
Modified: development/main/bootstrap.xml
==============================================================================
--- development/main/bootstrap.xml (original)
+++ development/main/bootstrap.xml Sun Jan 30 22:43:55 2005
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
+<!--
Copyright 2004 Stephen J McConnell
Copyright 2004 Niclas Hedhman
-
+
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
+ You may obtain a copy of the License at
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
-
+
See the License for the specific language governing permissions and
limitations under the License.
-->
<project name="bootstrap">
-
+
<property environment="ENV"/>
<property file="bootstrap.properties"/>
@@ -60,10 +60,10 @@
<property name="target.test-classes.dir"
value="${target.dir}/test-classes"/>
<property name="target.test-reports.dir"
value="${target.dir}/test-reports"/>
<property name="target.test.dir" value="${target.dir}/test"/>
-
+
<property name="target.deliverables.dir"
value="${target.dir}/deliverables"/>
<property name="target.deliverables.jars.dir"
value="${target.deliverables.dir}/jars"/>
-
+
<target name="setupReleaseFilename" if="signature.declared">
<property name="project.version" value="${dpml.release.signature}"/>
</target>
@@ -139,7 +139,7 @@
</copy>
<!--
- Any files in etc excluding test, main and deliverables get copied over
to
+ Any files in etc excluding test, main and deliverables get copied over to
the target directory.
-->
<copy toDir="${target.dir}" filtering="on" failonerror="false">
@@ -150,7 +150,7 @@
</fileset>
</copy>
- <!--
+ <!--
Create the target/classes directory and copy into it anything from
target/build/main
that isn't a java source file.
-->
@@ -160,8 +160,8 @@
<exclude name="**/*.java"/>
</fileset>
</copy>
-
- <!--
+
+ <!--
Create the target/test-classes directory and copy into it anything from
target/build/test
that isn't a java source file.
-->
@@ -172,7 +172,7 @@
</fileset>
</copy>
- <!--
+ <!--
Create the target/test directory.
-->
<mkdir dir="${target.test.dir}"/>
@@ -183,7 +183,7 @@
Compile sources in target/build/main with oputput classes under
target/classes.
-->
<target name="build" depends="prepare">
- <javac srcdir="${target.build.main.dir}" destdir="${target.classes.dir}"
debug="true"/>
+ <javac srcdir="${target.build.main.dir}" destdir="${target.classes.dir}"
debug="true"/>
</target>
<!--
@@ -192,33 +192,33 @@
<target name="package" depends="build">
<mkdir dir="${target.deliverables.jars.dir}"/>
<jar destfile="${target.deliverables.jars.dir}/${project.filename}"
- basedir="${target.classes.dir}"
+ basedir="${target.classes.dir}"
includes="**/*.class,**/*.xml,**/*.properties"/>
</target>
-
+
<!--
- Compile the tests using the classes as the classpath and
+ Compile the tests using the classes as the classpath and
place results into the target/test-classes directory.
-->
<target name="build-tests" depends="prepare,build" >
<mkdir dir="${target.test-classes.dir}"/>
- <javac srcdir="${target.build.test.dir}"
- destdir="${target.test-classes.dir}"
+ <javac srcdir="${target.build.test.dir}"
+ destdir="${target.test-classes.dir}"
debug="true">
<classpath>
<pathelement location="${target.classes.dir}"/>
<pathelement
location="${dpml.home}/cache/junit/jars/${junit-filename}"/>
</classpath>
- </javac>
+ </javac>
</target>
-
+
<!--
Execute any unit test.
-->
<target name="test" depends="build-tests" if="junit.available">
<mkdir dir="${target.test-reports.dir}"/>
- <junit printsummary="yes" haltonfailure="yes" showoutput="true"
- dir="${basedir}" fork="true" forkmode="perBatch"
+ <junit printsummary="yes" haltonfailure="yes" showoutput="true"
+ dir="${basedir}" fork="true"
failureproperty="junit.failure"
haltonerror="no"
errorproperty="junit.error">
@@ -238,7 +238,7 @@
<fail message="There were unittest failures." if="junit.failure" />
<fail message="There were unittest errors." if="junit.error" />
</target>
-
+
<!--
Install any deliverables under the project cache relative to the project
group path.
-->
@@ -249,9 +249,9 @@
<fileset dir="${target.deliverables.dir}"/>
</copy>
</target>
-
+
<target name="clean">
- <delete dir="${target.dir}"/>
+ <delete dir="${target.dir}"/>
</target>
<target name="declare-dpml-home" if="dpml.env.declared">
- svn commit: r1656 - development/main, niclas, 01/30/2005
Archive powered by MHonArc 2.6.24.