Update of /cvsroot/mockobjects/mockobjects-java
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28072
Modified Files:
build.xml
Log Message:
Patch from tk...@10... to fix jdk version checks
Patch from Thomas Klaeger <tk...@te...> to fix test execution
Index: build.xml
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/build.xml,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- build.xml 12 Aug 2003 12:16:12 -0000 1.40
+++ build.xml 27 Apr 2004 10:26:06 -0000 1.41
@@ -67,28 +67,54 @@
<pathelement location="${j2ee.lib}"/>
</path>
- <available property="jdk.version" value="1.2" classname="java.lang.ThreadLocal" />
- <available property="jdk.version" value="1.3" classname="java.lang.StrictMath" />
- <available property="jdk.version" value="1.4" classname="java.lang.CharSequence" />
- <available property="j2ee.version" value="1.2"
- classpathref="lib.classpath"
- classname="javax.servlet.Servlet" />
- <available property="j2ee.version" value="1.3"
- classpathref="lib.classpath"
- classname="javax.servlet.Filter" />
- <available property="j2ee.version" value="1.4"
- classpathref="lib.classpath"
- classname="javax.servlet.jsp.ErrorData" />
<available property="httpclient" value="true"
classpathref="lib.classpath"
classname="org.apache.commons.httpclient.HttpClient" />
- <property name="jar.j2ee.name" value="" />
-
+ <condition property="jdk.version" value="1.4">
+ <available classname="java.lang.CharSequence" />
+ </condition>
+ <condition property="jdk.version" value="1.3">
+ <and>
+ <not><isset property="jdk.version" /></not>
+ <available classname="java.lang.StrictMath" />
+ </and>
+ </condition>
+ <condition property="jdk.version" value="1.2">
+ <and>
+ <not><isset property="jdk.version" /></not>
+ <available classname="java.lang.ThreadLocal" />
+ </and>
+ </condition>
+ <condition property="j2ee.version" value="1.4">
+ <available classpathref="lib.classpath"
+ classname="javax.servlet.jsp.ErrorData" />
+ </condition>
+ <condition property="j2ee.version" value="1.3">
+ <and>
+ <not><isset property="j2ee.version" /></not>
+ <available classpathref="lib.classpath"
+ classname="javax.servlet.Filter" />
+ </and>
+ </condition>
+ <condition property="j2ee.version" value="1.2">
+ <and>
+ <not><isset property="j2ee.version" /></not>
+ <available classpathref="lib.classpath"
+ classname="javax.servlet.Servlet" />
+ </and>
+ </condition>
+ <available property="httpclient" value="true"
+ classpathref="lib.classpath"
+ classname="org.apache.commons.httpclient.HttpClient" />
+
<available property="jar.j2ee.name"
value="_j2ee${j2ee.version}"
classpathref="lib.classpath"
classname="javax.servlet.Servlet" />
+ <condition property="jar.j2ee.name" value="">
+ <not><isset property="jar.j2ee.name" /></not>
+ </condition>
</target>
<target name="call-me-first"
@@ -176,6 +202,10 @@
<mkdir dir="${jdk.classes}" />
<mkdir dir="${j2ee.classes}" />
+ <echo>Looking for tests in ${core.classes}</echo>
+ <echo>Looking for tests in ${jdk.classes}</echo>
+ <echo>Looking for tests in ${j2ee.classes}</echo>
+
<junit fork="yes" haltonfailure="yes">
<classpath>
<path refid="lib.classpath" />
@@ -189,20 +219,20 @@
<batchtest>
<fileset dir="${core.classes}">
- <include name="test/**Test*.class" />
- <exclude name="test/**Test*$*.class" />
+ <include name="test/**/*Test*.class" />
+ <exclude name="test/**/*Test*$*.class" />
<exclude name="**/AllTests.class" />
</fileset>
<fileset dir="${jdk.classes}">
- <include name="test/**Test*.class" />
- <exclude name="test/**Test*$*.class" />
+ <include name="test/**/*Test*.class" />
+ <exclude name="test/**/*Test*$*.class" />
<exclude name="**/AllTests.class" />
</fileset>
<fileset dir="${j2ee.classes}">
- <include name="test/**Test*.class" />
- <exclude name="test/**Test*$*.class" />
+ <include name="test/**/*Test*.class" />
+ <exclude name="test/**/*Test*$*.class" />
<exclude name="**/AllTests.class" />
</fileset>
</batchtest>
|
