[jboss-cvs] JBossCache ...
Manik Surtani
msurtani at jboss.com
Sat Sep 9 11:06:04 EDT 2006
User: msurtani
Date: 06/09/09 11:06:04
Modified: JBossCache build.sh build.xml
Log:
Forced IPv4 on Linux
Revision Changes Path
1.2 +0 -0 JBossCache/build.sh
(In the diff below, changes in quantity of whitespace are not shown.)
1.132 +291 -303 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.131
retrieving revision 1.132
diff -u -b -r1.131 -r1.132
--- build.xml 21 Aug 2006 05:08:32 -0000 1.131
+++ build.xml 9 Sep 2006 15:06:03 -0000 1.132
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: build.xml,v 1.131 2006/08/21 05:08:32 bwang Exp $ -->
+<!-- $Id: build.xml,v 1.132 2006/09/09 15:06:03 msurtani Exp $ -->
<project default="compile" name="JBossCache">
@@ -18,7 +18,6 @@
<property name="stress.tests.dir" value="${tests.dir}/stress"/>
<property name="interop.tests.dir" value="${tests.dir}/interop"/>
<property name="perf.tests.dir" value="${tests.dir}/perf"/>
- <property name="jrunit.tests.dir" value="${tests.dir}/perf"/>
<property name="interop.tests.dir" value="${tests.dir}/interop"/>
<property name="etc.dir" value="${root.dir}/etc"/>
<property name="dependencies" value="dependencies.xml"/>
@@ -47,8 +46,6 @@
<property name="junit.jvm.options" value="-Ddummy"/>
<property name="ant.dir" value="${root.dir}/ant-dist"/>
<property name="manifest.file" value="${dist.lib}/default.mf"/>
- <!-- Test if JDK5 is available -->
- <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
<property name="src.dir.50" value="${root.dir}/src-50"/>
<property name="tests.dir.50" value="${root.dir}/tests-50"/>
<property name="compile.dir.50" value="${output.dir}/classes-50"/>
@@ -68,7 +65,7 @@
-->
<patternset id="known.failures">
<!-- See JBCACHE-641 -->
- <exclude name="org/jboss/cache/eviction/ReplicatedLRUPolicyTest*" />
+ <exclude name="org/jboss/cache/eviction/ReplicatedLRUPolicyTest*"/>
<!-- See JBCACHE-407 -->
<exclude name="org/jboss/cache/transaction/IsolationLevelReadCommittedNodeCreationRollbackTest*"/>
<!-- See JBCACHE-462 -->
@@ -80,9 +77,9 @@
<!-- See JBCACHE-477 -->
<exclude name="org/jboss/cache/aop/collection/CachedListAopTxTest*"/>
<!-- See JBCACHE-315 -->
- <exclude name="org/jboss/cache/statetransfer/ForcedStateTransferTest*" />
+ <exclude name="org/jboss/cache/statetransfer/ForcedStateTransferTest*"/>
<!-- See JBCACHE-654 -->
- <exclude name="org/jboss/cache/aop/memory/ReplicatedAopTest*" />
+ <exclude name="org/jboss/cache/aop/memory/ReplicatedAopTest*"/>
</patternset>
<patternset id="junit.excludes">
@@ -101,7 +98,7 @@
<path id="output.classpath">
<pathelement location="${compile.dir}"/>
<pathelement location="${output.etc.dir}"/>
- <pathelement location="${compiletest.dir}" />
+ <pathelement location="${compiletest.dir}"/>
</path>
<path id="output.classpath.50">
@@ -122,7 +119,7 @@
<path id="previous.version.classpath">
<pathelement location="${output.etc.dir}"/>
- <pathelement location="${compiletest.dir}" />
+ <pathelement location="${compiletest.dir}"/>
<fileset dir="${lib.dir}">
<include name="*.jar"/>
</fileset>
@@ -140,7 +137,7 @@
</fileset>
<pathelement location="${compile.dir}"/>
<pathelement location="${output.etc.dir}"/>
- <pathelement location="${compiletest.dir}" />
+ <pathelement location="${compiletest.dir}"/>
</path>
<!-- ================================================================== -->
@@ -181,7 +178,6 @@
<src path="${functional.tests.dir}"/>
<src path="${stress.tests.dir}"/>
<src path="${perf.tests.dir}"/>
- <src path="${jrunit.tests.dir}"/>
<src path="${interop.tests.dir}"/>
<classpath path="${compile.dir}"/>
<classpath refid="library.classpath"/>
@@ -207,18 +203,18 @@
</copy>
</target>
- <target name="compile-classes50" depends="aopc-pojocache" if="HAVE_JDK_1.5">
+ <target name="compile-classes50" depends="aopc-pojocache">
</target>
<target name="aopc-pojocache" depends="compile-classes50-1"
- description="Precompile aop classes" if="HAVE_JDK_1.5">
+ description="Precompile aop classes">
<aopc compilerclasspathref="library.classpath" verbose="true">
<src path="${compile.dir.50}"/>
<include name="org/jboss/cache/pojo/impl/*.class"/>
<include name="org/jboss/cache/pojo/collection/*.class"/>
<aoppath path="${output.resources.dir}/jboss-aop.xml"/>
<classpath>
- <path refid="output.classpath.50" />
+ <path refid="output.classpath.50"/>
</classpath>
</aopc>
</target>
@@ -255,9 +251,9 @@
</javac>
</target>
-<!-- <target name="generate-rmi">-->
-<!-- <rmic classname="org.jboss.cache.loader.rmi.RemoteTreeCacheImpl" base="${compile.dir}"/> -->
-<!-- </target>-->
+ <!-- <target name="generate-rmi">-->
+ <!-- <rmic classname="org.jboss.cache.loader.rmi.RemoteTreeCacheImpl" base="${compile.dir}"/> -->
+ <!-- </target>-->
<!-- ================================================================== -->
@@ -280,7 +276,7 @@
</jar>
</target>
- <target name="jar-50" depends="compile-classes50, manifest" description="Builds jboss-cache.jar" if="HAVE_JDK_1.5">
+ <target name="jar-50" depends="compile-classes50, manifest" description="Builds jboss-cache.jar">
<mkdir dir="${dist.lib.50}"/>
<jar jarfile="${dist.lib.50}/jboss-cache-jdk50.jar" manifest="${manifest.file}">
<fileset dir="${compile.dir}">
@@ -317,7 +313,6 @@
</target>
-
<!-- ================================================================== -->
<!-- Documentation -->
<!-- ================================================================== -->
@@ -361,7 +356,7 @@
<delete dir="${build.reports}"/>
<delete dir="${dist.dir}"/>
<delete dir="${tmp.dir}"/>
- <delete dir="${root.dir}/jbossdb" />
+ <delete dir="${root.dir}/jbossdb"/>
<delete>
<fileset dir="${basedir}" defaultexcludes="no">
<include name="**/*~"/>
@@ -382,7 +377,7 @@
<target name="one-test" depends="compile,unittests-init" description="Runs a single unit test">
<junit printsummary="yes" timeout="${junit.timeout.stresstest}" fork="yes">
- <sysproperty key="log4j.configuration" value="file:${etc.dir}/log4j.xml" />
+ <sysproperty key="log4j.configuration" value="file:${etc.dir}/log4j.xml"/>
<classpath refid="library.classpath"/>
<classpath refid="output.classpath"/>
<formatter type="xml" usefile="true"/>
@@ -390,11 +385,12 @@
</junit>
</target>
- <target name="one-test-aop" depends="generateClassLoader, compile,unittests-init" description="Runs a single unit test">
+ <target name="one-test-aop" depends="generateClassLoader, compile,unittests-init"
+ description="Runs a single unit test">
<junit printsummary="yes" timeout="${junit.timeout}" fork="yes">
<jvmarg value="-Djboss.aop.path=${output.etc.dir}/jboss-aop.xml"/>
<jvmarg value="-Xbootclasspath/p:${bootclasspath}"/>
-<!-- start of Optimizeit support
+ <!-- start of Optimizeit support
sample script
#!/bin/sh
# sample opt.sh script
@@ -410,14 +406,14 @@
<classpath location="${optjar}"/>
end of optimizeIt support
-->
-<!-- support for JDWP debug
+ <!-- support for JDWP debug
<jvmarg value="-Xdebug"/>
<jvmarg value="-Xnoagent"/>
<jvmarg value="-Djava.compiler=NONE"/>
<jvmarg value="-Xrunjdwp:transport=dt_socket,server=n,suspend=n,address=localhost:2401"/>
--->
+ -->
<!-- jvmarg value="-Dbind.address=${bind.address}"/ -->
- <sysproperty key="log4j.configuration" value="file:${etc.dir}/log4j.xml" />
+ <sysproperty key="log4j.configuration" value="file:${etc.dir}/log4j.xml"/>
<classpath refid="library.classpath"/>
<classpath refid="output.classpath"/>
<formatter type="xml" usefile="true"/>
@@ -433,17 +429,18 @@
-->
<jvmarg value="-javaagent:${lib.dir.50}/jboss-aop-jdk50.jar"/>
<classpath refid="output.classpath.50"/>
- <sysproperty key="log4j.configuration" value="file:${etc.dir}/log4j.xml" />
+ <sysproperty key="log4j.configuration" value="file:${etc.dir}/log4j.xml"/>
<classpath refid="library.classpath"/>
<formatter type="xml" usefile="true"/>
<test name="${test}" todir="${build.reports}"/>
</junit>
</target>
- <target name="one-test-aop50WithAopC" depends="compile, aopc50, unittests-init" description="Runs a single unit test">
+ <target name="one-test-aop50WithAopC" depends="compile, aopc50, unittests-init"
+ description="Runs a single unit test">
<junit printsummary="yes" timeout="${junit.timeout}" fork="yes">
<classpath refid="output.classpath.50"/>
- <sysproperty key="log4j.configuration" value="file:${etc.dir}/log4j.xml" />
+ <sysproperty key="log4j.configuration" value="file:${etc.dir}/log4j.xml"/>
<classpath refid="library.classpath"/>
<formatter type="xml" usefile="true"/>
<test name="${test}" todir="${build.reports}"/>
@@ -457,14 +454,14 @@
<target name="test-jar" depends="compile">
<jar jarfile="${output.dir}/testMarshall.jar">
<fileset dir="${compiletest.dir}">
- <include name="org/jboss/cache/marshall/Address.class" />
- <include name="org/jboss/cache/marshall/Person.class" />
+ <include name="org/jboss/cache/marshall/Address.class"/>
+ <include name="org/jboss/cache/marshall/Person.class"/>
</fileset>
</jar>
</target>
-<!--
+ <!--
<target name="tcp-cache-service" depends="compile"
description="Creates the service archive used to deploy a TcpCacheServer as a JBoss MBean">
<mkdir dir="${dist.dir}"/>
@@ -475,7 +472,7 @@
includes="jboss-service.xml"/>
</jar>
</target>
--->
+ -->
<!-- pre-compile directory with annotationc using jdk1.4 -->
@@ -483,7 +480,7 @@
<taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC" classpathref="library.classpath"/>
<annotationc compilerclasspathref="library.classpath" bytecode="true">
<classpath path="${compile.dir}"/>
- <classpath path="${compiletest.dir}" />
+ <classpath path="${compiletest.dir}"/>
<classpath path="${output.resources.dir}"/>
<src path="${functional.tests.dir}"/>
<src path="${perf.tests.dir}"/>
@@ -514,7 +511,7 @@
<src path="${compiletest.dir}/org/jboss/cache/aop/test"/>
<aoppath path="${output.etc.dir}/jboss-aop.xml"/>
<classpath>
- <path refid="output.classpath" />
+ <path refid="output.classpath"/>
</classpath>
</aopc>
</target>
@@ -526,106 +523,86 @@
<!--src path="${compiletest.dir.50}/org/jboss/cache/data"/-->
<aoppath path="${output.resources.dir}/jboss-aop.xml"/>
<classpath>
- <path refid="output.classpath.50" />
+ <path refid="output.classpath.50"/>
</classpath>
</aopc>
</target>
- <target name="functionaltests" depends="compile,test-jar,unittests-init" description="Runs all non-AOP functional tests">
+ <target name="functionaltests" depends="compile,test-jar,unittests-init"
+ description="Runs all non-AOP functional tests">
<junit printsummary="yes" timeout="${junit.timeout}" fork="yes" maxmemory="256m">
<classpath refid="library.classpath"/>
<classpath refid="output.classpath"/>
<jvmarg value="-Dbind.address=${bind.address}"/>
+ <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
<jvmarg value="-Dtest.jar.dir=${output.dir}"/>
<formatter type="xml" usefile="true"/>
<batchtest todir="${build.reports}">
<fileset dir="${functional.tests.dir}">
- <include name="**/*Test.*" />
- <exclude name="**/aop/**/*" />
- <patternset refid="junit.excludes" />
+ <include name="**/*Test.*"/>
+ <exclude name="**/aop/**/*"/>
+ <patternset refid="junit.excludes"/>
</fileset>
</batchtest>
</junit>
</target>
- <target name="jrunit-tests" depends="compile,test-jar,unittests-init" description="Executes JRunit Benchmark Tests">
- <taskdef name="receiver" classname="org.jboss.jrunit.controller.ant.AntBenchmarkReceiver" classpathref="library-with-jdbc.classpath"/>
-
- <taskdef name="quit" classname="org.jboss.jrunit.controller.ant.AntQuitBenchmark" classpathref="library-with-jdbc.classpath"/>
- <receiver>
- <databasereceiver jdbcClass="${jdbc-driver-class}"
- jdbcURL="${jdbc-driver-url}" jdbcUserName="${jdbc-driver-user}" jdbcPassword="${jdbc-driver-password}" onlyIf="jdbc-driver-class"/>
- <filereceiver directory="${output.dir}" onlyif="output.dir" />
-
- <customreport parameter="${output.dir}"
- className="org.jboss.jrunit.controller.reporters.SerializerReporter"/>
- </receiver>
-
- <junit printsummary="yes" timeout="${junit.timeout.performance}" fork="yes">
- <classpath refid="library.classpath"/>
- <classpath refid="output.classpath"/>
- <!-- jvmarg value="-Dbind.address=${bind.address}"/ -->
- <jvmarg value="-Dtest.jar.dir=${output.dir}"/>
- <formatter type="xml" usefile="true"/>
- <batchtest todir="${build.reports}">
- <fileset dir="${jrunit.tests.dir}"
- includes="**/*JRunitTest.java"/>
- </batchtest>
- </junit>
-
- <quit/>
- </target>
-
- <target name="functionalAopTestsWithAnnoC" depends="compile,aopcWithAnnoc,unittests-init" description="Runs all AOP functional tests">
+ <target name="functionalAopTestsWithAnnoC" depends="compile,aopcWithAnnoc,unittests-init"
+ description="Runs all AOP functional tests">
<junit printsummary="yes" timeout="${junit.timeout}" fork="yes">
<classpath refid="library.classpath"/>
<classpath refid="output.classpath"/>
<formatter type="xml" usefile="true"/>
<jvmarg value="-Djboss.aop.path=${output.resources.dir}/jboss-aop.xml"/>
<jvmarg value="-Dbind.address=${bind.address}"/>
+ <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
<batchtest todir="${build.reports}">
<fileset dir="${functional.tests.dir}">
- <include name="**/aop/**/*Test.*" />
- <patternset refid="junit.excludes" />
+ <include name="**/aop/**/*Test.*"/>
+ <patternset refid="junit.excludes"/>
</fileset>
</batchtest>
</junit>
</target>
- <target name="functionalAopTestsWithAopC" depends="compile,aopc,unittests-init" description="Runs all AOP functional tests">
+ <target name="functionalAopTestsWithAopC" depends="compile,aopc,unittests-init"
+ description="Runs all AOP functional tests">
<junit printsummary="yes" timeout="${junit.timeout}" fork="yes">
<classpath refid="library.classpath"/>
<classpath refid="output.classpath"/>
<formatter type="xml" usefile="true"/>
<jvmarg value="-Djboss.aop.path=${output.etc.dir}/jboss-aop.xml"/>
<jvmarg value="-Dbind.address=${bind.address}"/>
- <sysproperty key="log4j.configuration" value="file:${etc.dir}/log4j.xml" />
+ <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
+ <sysproperty key="log4j.configuration" value="file:${etc.dir}/log4j.xml"/>
<batchtest todir="${build.reports}">
<fileset dir="${functional.tests.dir}">
- <include name="**/aop/**/*Test.*" />
- <patternset refid="junit.excludes" />
+ <include name="**/aop/**/*Test.*"/>
+ <patternset refid="junit.excludes"/>
</fileset>
</batchtest>
</junit>
</target>
- <target name="functionalAop50TestsWithAopC" depends="compile,aopc50,unittests-init" description="Runs all AOP functional tests">
+ <target name="functionalAop50TestsWithAopC" depends="compile,aopc50,unittests-init"
+ description="Runs all AOP functional tests">
<junit printsummary="yes" timeout="${junit.timeout}" fork="yes">
<classpath refid="library.classpath"/>
<classpath refid="output.classpath.50"/>
<formatter type="xml" usefile="true"/>
<jvmarg value="-Djboss.aop.path=${output.resources.dir}/jboss-aop.xml"/>
<jvmarg value="-Dbind.address=${bind.address}"/>
- <sysproperty key="log4j.configuration" value="file:${etc.dir}/log4j.xml" />
+ <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
+ <sysproperty key="log4j.configuration" value="file:${etc.dir}/log4j.xml"/>
<batchtest todir="${build.reports}">
<fileset dir="${functional.tests.dir}">
- <include name="**/aop/**/*Test.*" />
- <patternset refid="junit.excludes" />
+ <include name="**/aop/**/*Test.*"/>
+ <patternset refid="junit.excludes"/>
</fileset>
<fileset dir="${functional.tests.dir.50}">
- <include name="**/aop/**/*Test.*" />
- <patternset refid="junit.excludes" />
+ <include name="**/aop/**/*Test.*"/>
+ <patternset refid="junit.excludes"/>
</fileset>
</batchtest>
</junit>
@@ -639,15 +616,16 @@
<classpath refid="library.classpath"/>
<formatter type="xml" usefile="true"/>
<jvmarg value="-Dbind.address=${bind.address}"/>
- <sysproperty key="log4j.configuration" value="file:${etc.dir}/log4j.xml" />
+ <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
+ <sysproperty key="log4j.configuration" value="file:${etc.dir}/log4j.xml"/>
<batchtest todir="${build.reports}">
<fileset dir="${functional.tests.dir}">
- <include name="**/aop/**/*Test.*" />
- <patternset refid="junit.excludes" />
+ <include name="**/aop/**/*Test.*"/>
+ <patternset refid="junit.excludes"/>
</fileset>
<fileset dir="${functional.tests.dir.50}">
- <include name="**/aop/**/*Test.*" />
- <patternset refid="junit.excludes" />
+ <include name="**/aop/**/*Test.*"/>
+ <patternset refid="junit.excludes"/>
</fileset>
</batchtest>
</junit>
@@ -662,15 +640,16 @@
<classpath refid="library.classpath"/>
<formatter type="xml" usefile="true"/>
<jvmarg value="-Dbind.address=${bind.address}"/>
- <sysproperty key="log4j.configuration" value="file:${etc.dir}/log4j.xml" />
+ <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
+ <sysproperty key="log4j.configuration" value="file:${etc.dir}/log4j.xml"/>
<batchtest todir="${build.reports}">
<fileset dir="${functional.tests.dir}">
- <include name="**/pojo/**/*Test.*" />
- <patternset refid="junit.excludes" />
+ <include name="**/pojo/**/*Test.*"/>
+ <patternset refid="junit.excludes"/>
</fileset>
<fileset dir="${functional.tests.dir.50}">
- <include name="**/pojo/**/*Test.*" />
- <patternset refid="junit.excludes" />
+ <include name="**/pojo/**/*Test.*"/>
+ <patternset refid="junit.excludes"/>
</fileset>
</batchtest>
</junit>
@@ -681,7 +660,8 @@
JBossAop 1.3.1 for the new GeneratedInstrumentedClassLoader. But for this to work, we will need this target
to generate a temporarily ClassLoader under gen-bootclasspath directory
-->
- <target name="generateClassLoader" description="Generate a new modified class loader so we can perform load time instrumentation">
+ <target name="generateClassLoader"
+ description="Generate a new modified class loader so we can perform load time instrumentation">
<property name="build.bootclasspath" value="${output.dir}/gen-bootclasspath"/>
<java classname="org.jboss.aop.hook.GenerateInstrumentedClassLoader">
<classpath>
@@ -705,10 +685,11 @@
<jvmarg value="-Djboss.aop.path=${output.etc.dir}/jboss-aop.xml"/>
<jvmarg value="-Xbootclasspath/p:${bootclasspath}"/>
<jvmarg value="-Dbind.address=${bind.address}"/>
+ <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
<batchtest todir="${build.reports}">
<fileset dir="${functional.tests.dir}">
- <include name="**/aop/**/*Test.*" />
- <patternset refid="junit.excludes" />
+ <include name="**/aop/**/*Test.*"/>
+ <patternset refid="junit.excludes"/>
</fileset>
</batchtest>
</junit>
@@ -721,10 +702,11 @@
<formatter type="xml" usefile="true"/>
<jvmarg value="-Djboss.aop.path=${output.etc.dir}/jboss-aop.xml"/>
<jvmarg value="-Dbind.address=${bind.address}"/>
+ <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
<batchtest todir="${build.reports}">
<fileset dir="${perf.tests.dir}">
- <include name="**/aop/**/*AopTest.*" />
- <patternset refid="junit.excludes" />
+ <include name="**/aop/**/*AopTest.*"/>
+ <patternset refid="junit.excludes"/>
</fileset>
</batchtest>
</junit>
@@ -737,10 +719,11 @@
<formatter type="xml" usefile="true"/>
<jvmarg value="-Djboss.aop.path=${output.etc.dir}/jboss-aop.xml"/>
<jvmarg value="-Dbind.address=${bind.address}"/>
+ <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
<batchtest todir="${build.reports}">
<fileset dir="${stress.tests.dir}">
- <include name="**/aop/**/*AopTest.*" />
- <patternset refid="junit.excludes" />
+ <include name="**/aop/**/*AopTest.*"/>
+ <patternset refid="junit.excludes"/>
</fileset>
</batchtest>
</junit>
@@ -756,21 +739,23 @@
<classpath refid="library.classpath"/>
<classpath refid="output.classpath"/>
<jvmarg value="-Dbind.address=${bind.address}"/>
+ <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
<formatter type="xml" usefile="true"/>
<batchtest todir="${build.reports}">
<fileset dir="${perf.tests.dir}">
- <include name="**/*Test.*" />
+ <include name="**/*Test.*"/>
<exclude name="**/aop/**/*"/>
<exclude name="**/*JRunitTest.*"/>
<exclude name="**/benchmark/**/*"/>
- <exclude name="**/optimistic/Local*" />
- <patternset refid="junit.excludes" />
+ <exclude name="**/optimistic/Local*"/>
+ <patternset refid="junit.excludes"/>
</fileset>
</batchtest>
</junit>
</target>
- <target name="all-perftests" depends="perftests, perfAopTests" description="Runs all perf tests (including AOP tests)">
+ <target name="all-perftests" depends="perftests, perfAopTests"
+ description="Runs all perf tests (including AOP tests)">
</target>
<target name="stresstests" depends="compile,unittests-init" description="Runs all non-AOP perf tests">
@@ -778,12 +763,13 @@
<classpath refid="library.classpath"/>
<classpath refid="output.classpath"/>
<jvmarg value="-Dbind.address=${bind.address}"/>
+ <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
<formatter type="xml" usefile="true"/>
<batchtest todir="${build.reports}">
<fileset dir="${stress.tests.dir}">
- <include name="**/*Test.*" />
- <exclude name="**/aop/**/*" />
- <patternset refid="junit.excludes" />
+ <include name="**/*Test.*"/>
+ <exclude name="**/aop/**/*"/>
+ <patternset refid="junit.excludes"/>
</fileset>
</batchtest>
</junit>
@@ -795,26 +781,35 @@
<!-- Download the cache version against which we check interop -->
<mkdir dir="${output.interop.dir}"/>
- <get dest="${output.interop.dir}/jboss-cache.jar" src="http://repository.jboss.com/jboss/cache/1.2.3.1/lib/jboss-cache.jar" verbose="true"/>
+ <get dest="${output.interop.dir}/jboss-cache.jar"
+ src="http://repository.jboss.com/jboss/cache/1.2.3.1/lib/jboss-cache.jar" verbose="true"/>
- <start-interop-target name="previous version" conf="META-INF/interopPrevSync-service.xml" classpath="previous.version.classpath"/>
+ <start-interop-target name="previous version" conf="META-INF/interopPrevSync-service.xml"
+ classpath="previous.version.classpath"/>
<sleep seconds="3"/>
- <run-interop-tests name="current version" desc="PrevTargetSync" conf="META-INF/interopCurSync-service.xml" classpath="current.version.classpath"/>
+ <run-interop-tests name="current version" desc="PrevTargetSync" conf="META-INF/interopCurSync-service.xml"
+ classpath="current.version.classpath"/>
<stop-interop-target/>
- <start-interop-target name="current version" conf="META-INF/interopCurSync-service.xml" classpath="current.version.classpath"/>
+ <start-interop-target name="current version" conf="META-INF/interopCurSync-service.xml"
+ classpath="current.version.classpath"/>
<sleep seconds="3"/>
- <run-interop-tests name="previous version" desc="CurTargetSync" conf="META-INF/interopPrevSync-service.xml" classpath="previous.version.classpath"/>
+ <run-interop-tests name="previous version" desc="CurTargetSync" conf="META-INF/interopPrevSync-service.xml"
+ classpath="previous.version.classpath"/>
<stop-interop-target/>
- <start-interop-target name="previous version" conf="META-INF/interopPrevAsync-service.xml" classpath="previous.version.classpath"/>
+ <start-interop-target name="previous version" conf="META-INF/interopPrevAsync-service.xml"
+ classpath="previous.version.classpath"/>
<sleep seconds="3"/>
- <run-interop-tests name="current version" desc="PrevTargetAsync" conf="META-INF/interopCurAsync-service.xml" classpath="current.version.classpath"/>
+ <run-interop-tests name="current version" desc="PrevTargetAsync" conf="META-INF/interopCurAsync-service.xml"
+ classpath="current.version.classpath"/>
<stop-interop-target/>
- <start-interop-target name="current version" conf="META-INF/interopCurAsync-service.xml" classpath="current.version.classpath"/>
+ <start-interop-target name="current version" conf="META-INF/interopCurAsync-service.xml"
+ classpath="current.version.classpath"/>
<sleep seconds="3"/>
- <run-interop-tests name="previous version" desc="CurTargetAsync" conf="META-INF/interopPrevAsync-service.xml" classpath="previous.version.classpath"/>
+ <run-interop-tests name="previous version" desc="CurTargetAsync" conf="META-INF/interopPrevAsync-service.xml"
+ classpath="previous.version.classpath"/>
<stop-interop-target/>
</target>
@@ -864,10 +859,10 @@
<formatter type="xml" usefile="true" extension="-@{desc}.xml"/>
<batchtest todir="${build.reports}">
<fileset dir="${interop.tests.dir}">
- <include name="**/*Test.*" />
- <exclude name="**/aop/**/*" />
- <exclude name="**/*JRunitTest*" />
- <patternset refid="junit.excludes" />
+ <include name="**/*Test.*"/>
+ <exclude name="**/aop/**/*"/>
+ <exclude name="**/*JRunitTest*"/>
+ <patternset refid="junit.excludes"/>
</fileset>
</batchtest>
@@ -883,14 +878,15 @@
depends="all-functionaltests, all-perftests, stresstests"
description="Run all unit tests, including AOP-based ones (functional, perf, stress)"/>
- <target name="all-unittests-cc" description="Run all unit tests, including AOP-based ones (functional, perf, stress) for CruiseControl, (excludes 'known failures')">
+ <target name="all-unittests-cc"
+ description="Run all unit tests, including AOP-based ones (functional, perf, stress) for CruiseControl, (excludes 'known failures')">
<!--<patternset id="my.junit.excludes">-->
<!--<patternset refid="known.failures" />-->
<!--<exclude name="org/jboss/cache/C*" />-->
<!--</patternset>-->
<antcall target="all-unittests" inheritrefs="false">
<!--<param name="junit.excludes" id="junit.excludes" refid="my.junit.excludes" />-->
- <reference refid="known.failures" torefid="junit.excludes" />
+ <reference refid="known.failures" torefid="junit.excludes"/>
</antcall>
</target>
@@ -940,13 +936,9 @@
<!-- Install & Release -->
<!-- ================================================================== -->
- <target name="dist" description="Creates a full standalone distribution" depends="dist-message, dist50" />
-
- <target name="dist-message" unless="HAVE_JDK_1.5">
- <fail message="WARNING ... Need to use JDK15 compiler to build distro (instead of 1.4). Will not build."/>
- </target>
+ <target name="dist" description="Creates a full standalone distribution" depends="dist50"/>
- <target name="dist50" description="Creates a full standalone distribution" depends="jar, docs, javadocs, javadocs50" if="HAVE_JDK_1.5">
+ <target name="dist50" description="Creates a full standalone distribution" depends="jar, docs, javadocs, javadocs50">
<!-- Now make temp dirs, copy files and create the zip files -->
<mkdir dir="${tmp.dir}"/>
@@ -1000,7 +992,7 @@
<include name="log4j.xml"/>
<include name="jboss-aop.xml"/>
<include name="META-INF/*.xml"/>
- <include name="cache-jdbc.properties" />
+ <include name="cache-jdbc.properties"/>
</fileset>
</copy>
@@ -1031,10 +1023,7 @@
<copy todir="${tmp.dir}/lib" filtering="no">
<fileset dir="${lib.dir}">
<include name="*.jar"/>
- <include name="**/licenses/*" />
- <exclude name="jrunit*.jar"/>
- <exclude name="jfreechart*.jar"/>
- <exclude name="jcommon*.jar"/>
+ <include name="**/licenses/*"/>
</fileset>
<fileset dir="${dist.lib}">
<include name="jboss-cache.jar"/>
@@ -1044,7 +1033,7 @@
<copy todir="${tmp.dir}/lib-50" filtering="no">
<fileset dir="${lib.dir.50}">
<include name="*.jar"/>
- <include name="**/licenses/*" />
+ <include name="**/licenses/*"/>
</fileset>
<fileset dir="${dist.lib.50}">
<include name="jboss-cache-jdk50.jar"/>
@@ -1098,20 +1087,20 @@
</chmod>
<zip zipfile="${dist.dir}/jboss-cache-srcOnly-${module.version}.zip">
- <zipfileset dir="${tmp.dir}" prefix="${module.name}-${module.version}" filemode="755" >
+ <zipfileset dir="${tmp.dir}" prefix="${module.name}-${module.version}" filemode="755">
<include name="src/**"/>
</zipfileset>
</zip>
<zip zipfile="${dist.dir}/jboss-cache-dist-${module.version}.zip">
- <zipfileset dir="${tmp.dir}" prefix="${module.name}-${module.version}" filemode="755" >
+ <zipfileset dir="${tmp.dir}" prefix="${module.name}-${module.version}" filemode="755">
<include name="**/*"/>
<exclude name="src/**"/>
</zipfileset>
</zip>
<!-- now remove stuff to make a minimal zip -->
- <delete dir="${tmp.dir}/docs" />
+ <delete dir="${tmp.dir}/docs"/>
<delete dir="${tmp.dir}/examples"/>
<delete dir="${tmp.dir}/tests"/>
<delete dir="${tmp.dir}/ant-dist"/>
@@ -1119,7 +1108,6 @@
<delete>
<fileset dir="${tmp.dir}" includes="**/*.bsh"/>
<fileset dir="${tmp.dir}" includes="**/junit.jar"/>
- <fileset dir="${tmp.dir}" includes="**/jrunit.jar"/>
<fileset dir="${tmp.dir}" includes="**/runShellDemo.*"/>
<fileset dir="${tmp.dir}" includes="**/bsh*.jar"/>
<fileset dir="${tmp.dir}" includes="**/build.*"/>
@@ -1127,7 +1115,7 @@
<zip zipfile="${dist.dir}/jboss-cache-minimal-dist-${module.version}.zip">
<zipfileset dir="${tmp.dir}" prefix="${module.name}-${module.version}" filemode="755">
- <include name="**/*" />
+ <include name="**/*"/>
</zipfileset>
</zip>
More information about the jboss-cvs-commits
mailing list