[hibernate-commits] Hibernate SVN: r10279 - trunk/Hibernate3

[hibernate-commits at lists.jboss.org]

Author: steve.ebersole at jboss.com
Date: 2006-08-17 15:35:41 -0400 (Thu, 17 Aug 2006)
New Revision: 10279

Modified:
   trunk/Hibernate3/build.xml
Log:
disable forking on instrumentation tests; fix jar task to include DTDs

Modified: trunk/Hibernate3/build.xml
===================================================================
--- trunk/Hibernate3/build.xml	2006-08-17 19:22:24 UTC (rev 10278)
+++ trunk/Hibernate3/build.xml	2006-08-17 19:35:41 UTC (rev 10279)
@@ -239,6 +239,7 @@
     <!-- testsuite targets -->
 
 	<target name="junitreport" depends="splash,junit" description="Run tests and create JUnit report (requires driver.jar property)">
+        <delete dir="${dir.out.junit-reports}" />
         <mkdir dir="${dir.out.junit-reports}" />
         <junitreport todir="${dir.out.junit-reports}">
 			<fileset dir="${dir.out.junit}">
@@ -268,7 +269,7 @@
             <pathelement path="${dir.props}"/>
         </path>
 
-        <junit printsummary="yes" haltonfailure="yes" dir="${basedir}" maxmemory="256M" fork="yes" forkmode="perBatch">
+        <junit printsummary="yes" dir="${basedir}" maxmemory="256M" fork="yes" forkmode="perBatch">
 			<jvmarg value="-Dhibernate.test.validatefailureexpected=${hibernate.test.validatefailureexpected}"/>
 			<classpath>
                 <fileset refid="fs.lib" />
@@ -297,7 +298,7 @@
 
     <target name="junit.instrument.cglib" depends="instrument.cglib">
         <mkdir dir="${dir.out.junit}"/>
-		<junit printsummary="yes" haltonfailure="yes" dir="${basedir}" maxmemory="256M" fork="yes">
+		<junit printsummary="yes" maxmemory="256M" fork="no">
 			<jvmarg value="-Dhibernate.test.validatefailureexpected=${hibernate.test.validatefailureexpected}"/>
 			<classpath>
                 <fileset refid="fs.lib" />
@@ -320,7 +321,7 @@
 
     <target name="junit.instrument.javassist" depends="instrument.javassist">
         <mkdir dir="${dir.out.junit}"/>
-		<junit printsummary="yes" haltonfailure="yes" dir="${basedir}" maxmemory="256M" fork="yes">
+		<junit printsummary="yes" maxmemory="256M" fork="no">
 			<jvmarg value="-Dhibernate.test.validatefailureexpected=${hibernate.test.validatefailureexpected}"/>
 			<classpath>
                 <fileset refid="fs.lib" />
@@ -557,6 +558,7 @@
 
         <jar jarfile="${dir.build}/${jar.name}.jar" basedir="${dir.out.classes}">
 			<include name="org/hibernate/**/*.class" />
+            <include name="org/hibernate/*.dtd"/>
 			<manifest>
                 <attribute name="Implementation-Title" value="Hibernate3"/>
                 <attribute name="Implementation-Version" value="${version.full}"/>
@@ -757,7 +759,7 @@
         <copy todir="${targetdir}/lib">
             <fileset dir="${dir.lib}" />
         </copy>
-    	
+
     	<copy todir="${targetdir}/doc/api" file="${dir.doc.api}/jdstyle.css"/>
     </target>