[jboss-cvs] JBossCache ...
Manik Surtani
manik at jboss.org
Wed Mar 14 13:58:04 EDT 2007
User: msurtani
Date: 07/03/14 13:58:04
Modified: JBossCache build.xml
Log:
Fixed various build-related issues
Revision Changes Path
1.192 +37 -17 JBossCache/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/JBossCache/build.xml,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -b -r1.191 -r1.192
--- build.xml 13 Mar 2007 17:56:22 -0000 1.191
+++ build.xml 14 Mar 2007 17:58:04 -0000 1.192
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: build.xml,v 1.191 2007/03/13 17:56:22 msurtani Exp $ -->
+<!-- $Id: build.xml,v 1.192 2007/03/14 17:58:04 msurtani Exp $ -->
<project default="compile" name="JBossCache">
@@ -565,6 +565,7 @@
<target name="one-test-pkg" depends="compile,unittests-init" description="Runs a single unit test package">
+ <property name="jgroups.stack" value="udp"/>
<junit printsummary="yes" timeout="${junit.timeout.stresstest}" fork="yes" maxmemory="512m">
<sysproperty key="log4j.configuration" value="file:${etc.dir}/log4j.xml"/>
<classpath refid="library.classpath"/>
@@ -573,7 +574,8 @@
<jvmarg value="-Djava.net.preferIPv4Stack=true"/>
<jvmarg value="-Dtest.jar.dir=${output.dir}"/>
<jvmarg value="-Dlib.dir=${lib.dir}"/>
- <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true"/>
+ <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true"
+ extension="-${jgroups.stack}.xml"/>
<batchtest todir="${build.reports}">
<fileset dir="${functional.tests.dir}">
<include name="${pkg}/*Test.*"/>
@@ -643,11 +645,13 @@
<target name="one-test-precompiled-pojocache" depends="compile, aopc50, unittests-init"
description="Runs a single unit test">
+ <property name="jgroups.stack" value="udp"/>
<junit printsummary="yes" timeout="${junit.timeout}" fork="yes">
<classpath refid="output.classpath"/>
<sysproperty key="log4j.configuration" value="file:${etc.dir}/log4j.xml"/>
<classpath refid="library.classpath"/>
- <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true"/>
+ <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true"
+ extension="-${jgroups.stack}.xml"/>
<test name="${test}" todir="${build.reports}"/>
</junit>
</target>
@@ -742,10 +746,12 @@
<target name="functionalAop50TestsWithAopC" depends="compile,aopc50,unittests-init"
description="Runs all AOP functional tests">
+ <property name="jgroups.stack" value="udp"/>
<junit printsummary="yes" timeout="${junit.timeout}" fork="yes">
<classpath refid="library.classpath"/>
<classpath refid="output.classpath"/>
- <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true"/>
+ <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true"
+ extension="-${jgroups.stack}.xml"/>
<jvmarg value="-Djboss.aop.path=${output.resources.dir}/pojocache-aop.xml"/>
<jvmarg value="-Dbind.address=${bind.address}"/>
<jvmarg value="-Djava.net.preferIPv4Stack=true"/>
@@ -764,12 +770,14 @@
</target>
<target name="functionalAopTests50" depends="compile, unittests-init" description="Runs all AOP functional tests">
+ <property name="jgroups.stack" value="udp"/>
<junit printsummary="yes" timeout="${junit.timeout}" fork="yes">
<jvmarg value="-Djboss.aop.path=${output.resources.dir}/pojocache-aop.xml"/>
<jvmarg value="-javaagent:${lib.dir}/jboss-aop-jdk50.jar"/>
<classpath refid="output.classpath"/>
<classpath refid="library.classpath"/>
- <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true"/>
+ <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true"
+ extension="-${jgroups.stack}.xml"/>
<jvmarg value="-Dbind.address=${bind.address}"/>
<jvmarg value="-Djava.net.preferIPv4Stack=true"/>
<sysproperty key="log4j.configuration" value="file:${etc.dir}/log4j.xml"/>
@@ -837,10 +845,12 @@
<target name="functionalAopTests" depends="generateClassLoader, compile,unittests-init"
description="Runs all AOP functional tests">
+ <property name="jgroups.stack" value="udp"/>
<junit printsummary="yes" timeout="${junit.timeout}" fork="yes">
<classpath refid="library.classpath"/>
<classpath refid="output.classpath"/>
- <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true"/>
+ <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true"
+ extension="-${jgroups.stack}.xml"/>
<jvmarg value="-Djboss.aop.path=${output.resources.dir}/pojocache-aop.xml"/>
<jvmarg value="-Xbootclasspath/p:${bootclasspath}"/>
<jvmarg value="-Dbind.address=${bind.address}"/>
@@ -1060,7 +1070,8 @@
<pathelement path="${compiletest.dir}"/>
</classpath>
<sysproperty key="libdir.list" value="${libdir.list}"/>
- <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true"/>
+ <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true" extension=".xml"/>
+ />
<batchtest todir="${build.reports}">
<fileset dir="${compat.tests.dir}">
<exclude name="**/tools/**/*"/>
@@ -1108,14 +1119,17 @@
</target>
<target name="all-unittests-retro">
+ <property name="jgroups.stack" value="udp"/>
<junit printsummary="yes" timeout="${junit.timeout}" fork="yes" maxmemory="512m">
<classpath refid="library.classpath"/>
<classpath refid="retro.output.classpath"/>
<jvmarg value="-Dbind.address=${bind.address}"/>
+ <jvmarg value="-Djgroups.stack=${jgroups.stack}"/>
<jvmarg value="-Djava.net.preferIPv4Stack=true"/>
<jvmarg value="-Djgroups.stack=${jgroups.stack}"/>
<!--<jvmarg value="-Dtest.jar.dir=${output.dir}"/>-->
- <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true"/>
+ <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true"
+ extension="-${jgroups.stack}.xml"/>
<batchtest todir="${build.reports}">
<fileset dir="${retro.compiletest.dir}">
<include name="**/*Test.*"/>
@@ -1232,16 +1246,21 @@
<copy todir="${tmp.dir}/tests" filtering="no">
<fileset dir="${functional.tests.dir}">
<include name="**/*.java"/>
- <exclude name="**/loader/Bdbje*.java"/>
+ <!-- needed for some classloader tests -->
+ <include name="**/*.clazz"/>
+ <include name="**/*.notjava"/>
+
+ <exclude name="**/*Bdbje*"/>
</fileset>
<fileset dir="${compiletest.dir}">
- <exclude name="**/loader/Bdbje*.java"/>
+ <exclude name="**/*Bdbje*"/>
</fileset>
</copy>
<copy todir="${tmp.dir}/tests" filtering="no">
<fileset dir="${functional.tests.dir.50}">
<include name="**/*.java"/>
+ <exclude name="**/*Bdbje*"/>
<exclude name="**/aop/**"/>
</fileset>
</copy>
@@ -1338,7 +1357,6 @@
<exclude name="pojocache*"/>
<exclude name="lib/pojocache.jar"/>
<exclude name="lib/jboss-aop*.jar"/>
- <exclude name="lib/trove.jar"/>
<exclude name="lib/qdox.jar"/>
<exclude name="lib/javassist.jar"/>
<exclude name="examples/PojoCache/**"/>
@@ -1366,7 +1384,14 @@
</zipfileset>
</zip>
+ <zip zipfile="${dist.dir}/${module.name}-all-${module.version}.zip">
+ <zipfileset dir="${tmp.dir}" prefix="${module.name}-all-${module.version}" filemode="755">
+ <include name="**/**"/>
+ </zipfileset>
+ </zip>
+
<!-- NOW add the retroweaved stuff into the temp dir -->
+
<copy todir="${tmp.dir}/tests14" filtering="no">
<fileset dir="${retro.compiletest.dir}">
<include name="**/*.class"/>
@@ -1380,18 +1405,13 @@
<fileset dir="${retro.lib.dir}"/>
</copy>
+
<copy todir="${tmp.dir}/lib" filtering="no">
<fileset dir="${dist.lib}">
<include name="jbosscache-JDK140.jar"/>
</fileset>
</copy>
- <zip zipfile="${dist.dir}/${module.name}-all-${module.version}.zip">
- <zipfileset dir="${tmp.dir}" prefix="${module.name}-all-${module.version}" filemode="755">
- <include name="**/**"/>
- </zipfileset>
- </zip>
-
<zip zipfile="${dist.dir}/${module.name}-core-JDK140-${module.version}.zip">
<zipfileset dir="${tmp.dir}" prefix="${module.name}-core-JDK140-${module.version}" filemode="755">
<include name="**/*"/>
More information about the jboss-cvs-commits
mailing list