ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r417020 - in /ant/core/trunk: ./ docs/ docs/manual/CoreTasks/ docs/manual/OptionalTasks/ src/main/org/apache/tools/ant/taskdefs/ src/main/org/apache/tools/ant/taskdefs/optional/ src/main/org/apache/tools/ant/taskdefs/optional/junit/ src/tes...
Date Sun, 25 Jun 2006 14:38:28 GMT
Author: jkf
Date: Sun Jun 25 07:38:27 2006
New Revision: 417020

URL: http://svn.apache.org/viewvc?rev=417020&view=rev
Log:
Removed support for Xalan1.

Removed:
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/XalanLiaison.java
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan1Executor.java
    ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/XalanLiaisonTest.java
Modified:
    ant/core/trunk/WHATSNEW
    ant/core/trunk/build.xml
    ant/core/trunk/docs/faq.html
    ant/core/trunk/docs/manual/CoreTasks/style.html
    ant/core/trunk/docs/manual/OptionalTasks/junitreport.html
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java
    ant/core/trunk/xdocs/faq.xml

Modified: ant/core/trunk/WHATSNEW
URL: http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=417020&r1=417019&r2=417020&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Sun Jun 25 07:38:27 2006
@@ -2,7 +2,10 @@
 =============================================================
 
 Changes that could break older environments:
---------------------------------------------
+-------------------------------------------
+
+* Removed support for xalan1 completely. Users of Xalan1 for ant builds will
+  have to stay at ant 1.6.5 or upgrade to xalan2.
 
 * Improved recursion detection for lines with multiple matches of same token on one single
line.
   Bugzilla report 38456.

Modified: ant/core/trunk/build.xml
URL: http://svn.apache.org/viewvc/ant/core/trunk/build.xml?rev=417020&r1=417019&r2=417020&view=diff
==============================================================================
--- ant/core/trunk/build.xml (original)
+++ ant/core/trunk/build.xml Sun Jun 25 07:38:27 2006
@@ -200,13 +200,6 @@
     </or>
   </selector>
 
-  <selector id="needs.xalan1">
-    <or>
-      <filename name="${optional.package}/XalanLiaison*"/>
-      <filename name="${optional.package}/junit/Xalan1Executor*"/>
-    </or>
-  </selector>
-
   <selector id="needs.apache-resolver">
     <filename name="${apache.resolver.type.package}/**"/>
   </selector>
@@ -407,9 +400,6 @@
     <available property="apache.resolver.present"
       classname="org.apache.xml.resolver.tools.CatalogResolver"
       classpathref="classpath"/>
-    <available property="xalan.present"
-      classname="org.apache.xalan.xslt.XSLTProcessorFactory"
-      classpathref="classpath"/>
     <available property="xalan2.present"
       classname="org.apache.xalan.transformer.TransformerImpl"
       classpathref="classpath"/>
@@ -657,7 +647,6 @@
             <selector refid="needs.sun.b64" unless="base64.present"/>
 
             <selector refid="needs.trax" unless="trax.present"/>
-            <selector refid="needs.xalan1" unless="xalan.present"/>
             <selector refid="needs.apache-resolver" unless="apache.resolver.present"/>
             <selector refid="needs.junit" unless="junit.present"/>
             <selector refid="needs.apache-regexp"
@@ -838,7 +827,6 @@
         <not>
           <or>
             <selector refid="needs.trax"/>
-            <selector refid="needs.xalan1"/>
             <selector refid="needs.apache-resolver"/>
             <selector refid="needs.junit"/>
             <selector refid="needs.apache-regexp"/>
@@ -883,7 +871,6 @@
     </macrodef>
 
     <optional-jar dep="trax"/>
-    <optional-jar dep="xalan1"/>
     <optional-jar dep="apache-resolver"/>
     <optional-jar dep="junit"/>
     <optional-jar dep="apache-regexp"/>
@@ -1698,10 +1685,6 @@
             unless="trax.impl.present"/>
 
           <!-- needs xerces to work -->
-          <exclude name="${optional.package}/XalanLiaisonTest.java"
-            unless="bsf.present"/>
-          <exclude name="${optional.package}/XalanLiaisonTest.java"
-            unless="xerces1.present"/>
           <exclude name="${ant.package}/IncludeTest.java"
             unless="xerces1.present"/>
           <exclude name="${type.package}/selectors/ModifiedSelectorTest.java"

Modified: ant/core/trunk/docs/faq.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/faq.html?rev=417020&r1=417019&r2=417020&view=diff
==============================================================================
--- ant/core/trunk/docs/faq.html (original)
+++ ant/core/trunk/docs/faq.html Sun Jun 25 07:38:27 2006
@@ -1813,8 +1813,7 @@
         "offending" jar out of <code>ANT_HOME/lib</code>.  For the
         <code>&lt;junit&gt;</code> task it would be
         <code>ant-junit.jar</code> and for <code>&lt;style&gt;</code>
-        it would be <code>ant-trax.jar</code>,
-        <code>ant-xalan1.jar</code> or <code>ant-xslp.jar</code>
-
+        it would be <code>ant-trax.jar</code> or <code>ant-xslp.jar</code>
-
         depending on the processor you use.</p>
                         <p>If you do so, you will have to <code>&lt;taskdef&gt;</code>
         all optional tasks that need the external library and use

Modified: ant/core/trunk/docs/manual/CoreTasks/style.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/CoreTasks/style.html?rev=417020&r1=417019&r2=417020&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/CoreTasks/style.html (original)
+++ ant/core/trunk/docs/manual/CoreTasks/style.html Sun Jun 25 07:38:27 2006
@@ -114,20 +114,12 @@
     <td valign="top">processor</td>
 
     <td valign="top">name of the XSLT processor to use.
-      Permissible values are :<ul>
+      Permissible value is :<ul>
       <li>&quot;trax&quot; for a TraX compliant processor (ie JAXP interface
-      implementation such as Xalan 2 or Saxon)</li>
-      <li>&quot;xalan&quot; for
-      the Apache XML Xalan (version 1) processor</li>
-      <li>the name of a custom class implementing the interface
-          <code>org.apache.tools.ant.taskdefs.XSLTLiaison.</code></li>
-      </ul>
-      Defaults to trax, followed by xalan
-      The first one found in your class
-      path is the one that is used.
+      implementation such as Xalan 2 or Saxon)</li></ul>
+      Defaults to trax.
       <br/>
-      <em><strong>DEPRECATED</strong> - xalan (xalan1) is deprecated and
no
-      more supported.</em>.
+      Support for xalan1 has been removed in ant 1.7.
       </td>
     <td align="center" valign="top">No</td>
   </tr>

Modified: ant/core/trunk/docs/manual/OptionalTasks/junitreport.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/OptionalTasks/junitreport.html?rev=417020&r1=417019&r2=417020&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/OptionalTasks/junitreport.html (original)
+++ ant/core/trunk/docs/manual/OptionalTasks/junitreport.html Sun Jun 25 07:38:27 2006
@@ -29,12 +29,13 @@
 <tr><td>XSLTC</td><td>JDK 1.5.x</td><td>OK</td></tr>
 <tr><td>2.x</td><td>JDK 1.4.x</td><td>DEPRECATED<br><i>Use
${ant.home}/etc/junit-frames-xalan1.xsl
 <br> Upgrade Xalan using the JDK endorsement mechanism</i></td></tr>
-<tr><td>1.2</td><td>N/A</td><td>DEPRECATED<br><i>Use
${ant.home}/etc/junit-frames-xalan1.xsl</i><td></tr> 
 </table>
 
 <p>With Ant 1.6.2 we had to decide between supporting Xalan-J 1/Xalan J 2.4.1-
 and Xalan 2.4.1+/XSLTC, since there was no way to support both couples at the same
 time.</p>
+<p>With Ant 1.7 we had to drop support Xalan-J 1, since Xalan-J 1 has not 
+available anymore for quite some time.</p>
 
 <h3>Parameters</h3>
 <table border="1" cellpadding="2" cellspacing="0">

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java?rev=417020&r1=417019&r2=417020&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java Sun Jun 25 07:38:27
2006
@@ -99,10 +99,6 @@
     private static final String TRAX_LIAISON_CLASS =
                         "org.apache.tools.ant.taskdefs.optional.TraXLiaison";
 
-    /** Name of the now-deprecated Xalan liaison class */
-    private static final String XALAN_LIAISON_CLASS =
-                        "org.apache.tools.ant.taskdefs.optional.XalanLiaison";
-
     /** Utilities used for file operations */
     private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
 
@@ -163,11 +159,6 @@
      * @since Ant 1.7
      */
     public static final String PROCESSOR_TRAX = "trax";
-    /**
-     * The xalan1 processor (deprecated option)
-     * @since Ant 1.7
-     */
-    public static final String PROCESSOR_XALAN1 = "xalan";
 
     /**
      * Creates a new XSLTProcess Task.
@@ -493,10 +484,6 @@
         String classname;
         if (proc.equals(PROCESSOR_TRAX)) {
             classname = TRAX_LIAISON_CLASS;
-        } else if (proc.equals(PROCESSOR_XALAN1)) {
-            log("DEPRECATED - xalan processor is deprecated. Use trax "
-                + "instead.");
-            classname = XALAN_LIAISON_CLASS;
         } else {
             //anything else is a classname
             classname = proc;
@@ -753,12 +740,8 @@
                 try {
                     resolveProcessor(PROCESSOR_TRAX);
                 } catch (Throwable e1) {
-                    try {
-                        resolveProcessor(PROCESSOR_XALAN1);
-                    } catch (Throwable e2) {
-                        e2.printStackTrace();
-                        throw new BuildException(e1);
-                    }
+                    e1.printStackTrace();
+                    throw new BuildException(e1);
                 }
             }
         }

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java?rev=417020&r1=417019&r2=417020&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java
Sun Jun 25 07:38:27 2006
@@ -60,9 +60,8 @@
     abstract void execute() throws Exception;
 
     /**
-     * Create a valid Xalan executor. It checks first if Xalan2 is
-     * present, if not it checks for xalan1. If none is available, it
-     * fails.
+     * Create a valid Xalan executor. It checks if Xalan2 is
+     * present. If none is available, it fails.
      * @param caller object containing the transformation information.
      * @throws BuildException thrown if it could not find a valid xalan
      * executor.
@@ -75,15 +74,9 @@
             executor = (XalanExecutor) clazz.newInstance();
         } catch (Exception xsltcApacheMissing) {
             caller.task.log(xsltcApacheMissing.toString());
-            try {
-                Class clazz = Class.forName(PACKAGE + "Xalan1Executor");
-                executor = (XalanExecutor) clazz.newInstance();
-            } catch (Exception xalan1Missing) {
-                caller.task.log(xalan1Missing.toString());
-                throw new BuildException("Could not find xstlc nor xalan2 nor "
-                                         + "xalan1 in the classpath. Check "
+                throw new BuildException("Could not find xstlc nor xalan2 "
+                                         + "in the classpath. Check "
                                          + "http://xml.apache.org/xalan-j");
-            }
         }
         String classNameImpl = executor.getImplementation();
         String version = executor.getProcVersion(classNameImpl);

Modified: ant/core/trunk/xdocs/faq.xml
URL: http://svn.apache.org/viewvc/ant/core/trunk/xdocs/faq.xml?rev=417020&r1=417019&r2=417020&view=diff
==============================================================================
--- ant/core/trunk/xdocs/faq.xml (original)
+++ ant/core/trunk/xdocs/faq.xml Sun Jun 25 07:38:27 2006
@@ -1568,8 +1568,8 @@
         "offending" jar out of <code>ANT_HOME/lib</code>.  For the
         <code>&lt;junit&gt;</code> task it would be
         <code>ant-junit.jar</code> and for <code>&lt;style&gt;</code>
-        it would be <code>ant-trax.jar</code>,
-        <code>ant-xalan1.jar</code> or <code>ant-xslp.jar</code>
-
+        it would be <code>ant-trax.jar</code>
+        or <code>ant-xslp.jar</code> - 
         depending on the processor you use.</p>
 
         <p>If you do so, you will have to <code>&lt;taskdef&gt;</code>



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


Mime
View raw message