ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit XalanExecutor.java
Date Tue, 28 Jan 2003 09:03:54 GMT
bodewig     2003/01/28 01:03:54

  Modified:    docs/manual install.html platform.html
               src/main/org/apache/tools/ant/taskdefs/optional/junit
                        XalanExecutor.java
  Log:
  More Xerces upgrade changes, better debug output for JUnitReport
  
  Revision  Changes    Path
  1.42      +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.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- install.html	24 Jan 2003 08:55:05 -0000	1.41
  +++ install.html	28 Jan 2003 09:03:52 -0000	1.42
  @@ -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.5       +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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- platform.html	1 Jun 2002 12:26:32 -0000	1.4
  +++ platform.html	28 Jan 2003 09:03:52 -0000	1.5
  @@ -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>
      &nbsp;&nbsp;&nbsp;envset CLASSPATH=SYS:/jakarta-ant/bootstrap/lib/ant.jar<br
/>
      &nbsp;&nbsp;&nbsp;envset CLASSPATH=$CLASSPATH;SYS:/jakarta-ant/lib/xercesImpl.jar
<br />
  -   &nbsp;&nbsp;&nbsp;envset CLASSPATH=$CLASSPATH;SYS:/jakarta-ant/lib/xmlParserAPIs.jar
<br />
  +   &nbsp;&nbsp;&nbsp;envset CLASSPATH=$CLASSPATH;SYS:/jakarta-ant/lib/xml-apis.jar
<br />
      &nbsp;&nbsp;&nbsp;envset CLASSPATH=$CLASSPATH;SYS:/jakarta-ant/lib/optional/junit.jar
<br />
      &nbsp;&nbsp;&nbsp;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 &copy; 2002 Apache Software Foundation. All rights
  +<p align="center">Copyright &copy; 2002-2003 Apache Software Foundation. All
rights
   Reserved.</p>
   </html>
  
  
  
  1.7       +13 -2     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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XalanExecutor.java	15 Aug 2002 10:25:42 -0000	1.6
  +++ XalanExecutor.java	28 Jan 2003 09:03:53 -0000	1.7
  @@ -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
  @@ -58,8 +58,11 @@
   import java.io.FileOutputStream;
   import java.io.IOException;
   import java.io.OutputStream;
  +import java.io.PrintWriter;
  +import java.io.StringWriter;
   import java.lang.reflect.Field;
   import org.apache.tools.ant.BuildException;
  +import org.apache.tools.ant.Project;
   
   /**
    * Command class that encapsulate specific behavior for each
  @@ -106,12 +109,20 @@
               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){
  -                throw new BuildException("Could not find xalan2 nor xalan1 in the classpath.
Check http://xml.apache.org/xalan-j/");
  +                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");
               }
           }
           String version = getXalanVersion(procVersion);
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message