bodewig 2003/01/28 00:56:16
Modified: . Tag: ANT_15_BRANCH WHATSNEW build.xml
docs/manual Tag: ANT_15_BRANCH install.html platform.html
lib Tag: ANT_15_BRANCH README xercesImpl.jar
src/main/org/apache/tools/ant/taskdefs/optional/junit Tag:
ANT_15_BRANCH XalanExecutor.java
Log:
Upgrade to Xerces 2.3.0, improve debug output for JUnitReport
Revision Changes Path
No revision
No revision
1.263.2.116 +1 -1 jakarta-ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
retrieving revision 1.263.2.115
retrieving revision 1.263.2.116
diff -u -r1.263.2.115 -r1.263.2.116
--- WHATSNEW 27 Jan 2003 16:25:27 -0000 1.263.2.115
+++ WHATSNEW 28 Jan 2003 08:56:12 -0000 1.263.2.116
@@ -74,7 +74,7 @@
* MailLogger now sets the Date header correctly.
-* Shipped XML parser is now Xerces 2.2.1
+* Shipped XML parser is now Xerces 2.3.0
* signjar now accepts a maxmemory attribute to allow the memory allocated to
the
jarsigner tool to be specified. The jarsigner from the JDK's JAVA_HOME bin
1.304.2.40 +4 -0 jakarta-ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/build.xml,v
retrieving revision 1.304.2.39
retrieving revision 1.304.2.40
diff -u -r1.304.2.39 -r1.304.2.40
--- build.xml 24 Jan 2003 10:49:11 -0000 1.304.2.39
+++ build.xml 28 Jan 2003 08:56:12 -0000 1.304.2.40
@@ -1262,6 +1262,10 @@
</and>
</or>
</condition>
+ <echo>run.junitreport: ${run.junitreport}</echo>
+ <echo>xalan2.present: ${xalan2.present}</echo>
+ <echo>xalan.present: ${xalan.present}</echo>
+ <echo>bsf.present: ${bsf.present}</echo>
<junit printsummary="${junit.summary}" haltonfailure="yes"
filtertrace="${junit.filtertrace}"
No revision
No revision
1.29.2.14 +1 -1 jakarta-ant/docs/manual/install.html
Index: install.html
===================================================================
RCS file: /home/cvs/jakarta-ant/docs/manual/install.html,v
retrieving revision 1.29.2.13
retrieving revision 1.29.2.14
diff -u -r1.29.2.13 -r1.29.2.14
--- install.html 24 Jan 2003 10:04:07 -0000 1.29.2.13
+++ install.html 28 Jan 2003 08:56:13 -0000 1.29.2.14
@@ -44,7 +44,7 @@
<a href="http://java.sun.com/xml/"; target="_top">http://java.sun.com/xml/</a>
for more information about JAXP.
If you wish to use a different JAXP-compliant parser, you should remove
-<code>xercesImpl.jar</code> and <code>xmlParserAPIs.jar</code>
+<code>xercesImpl.jar</code> and <code>xml-apis.jar</code>
from Ant's <code>lib</code> directory.
You can then either put the jars from your preferred parser into Ant's
1.3.2.2 +3 -3 jakarta-ant/docs/manual/platform.html
Index: platform.html
===================================================================
RCS file: /home/cvs/jakarta-ant/docs/manual/platform.html,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- platform.html 3 May 2002 10:48:24 -0000 1.3.2.1
+++ platform.html 28 Jan 2003 08:56:13 -0000 1.3.2.2
@@ -50,7 +50,7 @@
<p>To give the same level of sophisticated control as Ant's startup scripts
on other platforms, it was decided to make the main ant startup on NetWare be
via a Perl Script, "runant.pl". This is found in the bin directory (for
instance - bootstrap\bin or dist\bin).</p>
<p>One important item of note is that you need to set up the following to
run ant:</p>
-<ul><li><code>CLASSPATH</code> - put ant.jar, xercesImpl.jar,
xmlParserAPIs.jar and any other needed jars on the system classpath.</li>
+<ul><li><code>CLASSPATH</code> - put ant.jar, xercesImpl.jar, xml-apis.jar
and any other needed jars on the system classpath.</li>
<li><code>ANT_OPTS</code> - On NetWare, <code>ANT_OPTS</code> needs to
include a parameter of the form, <nobr>"-envCWD=<code>ANT_HOME</code>"</nobr>,
with <code>ANT_HOME</code> being the fully expanded location of Ant, <b>not</b>
an environment variable. This is due to the fact that the NetWare System
Console has no notion of a current working directory.</li>
</ul>
<p>It is suggested that you create up an ant.ncf that sets up these
parameters, and calls <code>perl ANT_HOME/dist/bin/runant.pl</code></p>
@@ -58,7 +58,7 @@
<code>
envset
CLASSPATH=SYS:/jakarta-ant/bootstrap/lib/ant.jar<br />
envset
CLASSPATH=$CLASSPATH;SYS:/jakarta-ant/lib/xercesImpl.jar <br />
- envset
CLASSPATH=$CLASSPATH;SYS:/jakarta-ant/lib/xmlParserAPIs.jar <br />
+ envset
CLASSPATH=$CLASSPATH;SYS:/jakarta-ant/lib/xml-apis.jar <br />
envset
CLASSPATH=$CLASSPATH;SYS:/jakarta-ant/lib/optional/junit.jar <br />
envset
CLASSPATH=$CLASSPATH;SYS:/jakarta-ant/bootstrap/lib/optional.jar <br />
<br />
@@ -80,6 +80,6 @@
tested on every particular platform. Contributions in this area are welcome.
<hr>
-<p align="center">Copyright © 2002 Apache Software Foundation. All
rights
+<p align="center">Copyright © 2002-2003 Apache Software Foundation. All
rights
Reserved.</p>
</html>
No revision
No revision
1.9.2.6 +1 -1 jakarta-ant/lib/README
Index: README
===================================================================
RCS file: /home/cvs/jakarta-ant/lib/README,v
retrieving revision 1.9.2.5
retrieving revision 1.9.2.6
diff -u -r1.9.2.5 -r1.9.2.6
--- README 12 Nov 2002 08:41:39 -0000 1.9.2.5
+++ README 28 Jan 2003 08:56:13 -0000 1.9.2.6
@@ -2,7 +2,7 @@
Dependencies for a list of the jar requirements for various optional
tasks and features.
-This directory contains xercesImpl.jar from the 2.2.1 release of
+This directory contains xercesImpl.jar from the 2.3.0 release of
Apache Xerces. For more information or newer releases see
<http://xml.apache.org/xerces2-j/>. See the file LICENSE.xerces for
the terms of distribution.
1.1.2.5 +2507 -2387jakarta-ant/lib/xercesImpl.jar
<<Binary file>>
No revision
No revision
1.4.2.1 +12 -1
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java
Index: XalanExecutor.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- XalanExecutor.java 3 Apr 2002 13:18:03 -0000 1.4
+++ XalanExecutor.java 28 Jan 2003 08:56:16 -0000 1.4.2.1
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -54,12 +54,15 @@
package org.apache.tools.ant.taskdefs.optional.junit;
import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
import java.io.ByteArrayOutputStream;
import java.io.FileOutputStream;
+import java.io.StringWriter;
+import java.io.PrintWriter;
import java.lang.reflect.Field;
@@ -108,11 +111,19 @@
executor = (XalanExecutor) Class.forName(
"org.apache.tools.ant.taskdefs.optional.junit.Xalan2Executor").newInstance();
} catch (Exception xalan2missing){
+ StringWriter swr = new StringWriter();
+ xalan2missing.printStackTrace(new PrintWriter(swr));
+ caller.task.log("Didn't find Xalan2.", Project.MSG_DEBUG);
+ caller.task.log(swr.toString(), Project.MSG_DEBUG);
try {
procVersion =
Class.forName("org.apache.xalan.xslt.XSLProcessorVersion");
executor = (XalanExecutor) Class.forName(
"org.apache.tools.ant.taskdefs.optional.junit.Xalan1Executor").newInstance();
} catch (Exception xalan1missing){
+ swr = new StringWriter();
+ xalan1missing.printStackTrace(new PrintWriter(swr));
+ caller.task.log("Didn't find Xalan1.", Project.MSG_DEBUG);
+ caller.task.log(swr.toString(), Project.MSG_DEBUG);
throw new BuildException("Could not find xalan2 nor xalan1
in the classpath. Check http://xml.apache.org/xalan-j";);
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
