Return-Path: 
 <ant-dev-return-22653-qmlist-jakarta-archive-ant-dev=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-ant-dev-archive@apache.org
Received: (qmail 13690 invoked from network); 9 Jan 2002 09:08:55 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 9 Jan 2002 09:08:55 -0000
Received: (qmail 14420 invoked by uid 97); 9 Jan 2002 09:08:53 -0000
Delivered-To: qmlist-jakarta-archive-ant-dev@jakarta.apache.org
Received: (qmail 14404 invoked by uid 97); 9 Jan 2002 09:08:52 -0000
Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:ant-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:ant-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:ant-dev-help@jakarta.apache.org>
List-Post: <mailto:ant-dev@jakarta.apache.org>
List-Id: "Ant Developers List" <ant-dev.jakarta.apache.org>
Reply-To: "Ant Developers List" <ant-dev@jakarta.apache.org>
Delivered-To: mailing list ant-dev@jakarta.apache.org
Received: (qmail 14392 invoked by uid 97); 9 Jan 2002 09:08:52 -0000
Date: 9 Jan 2002 09:08:39 -0000
Message-ID: <20020109090839.64996.qmail@icarus.apache.org>
From: bodewig@apache.org
To: jakarta-ant-cvs@apache.org
Subject: cvs commit:
 jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/optional
 AdaptxLiaisonTest.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

bodewig     02/01/09 01:08:39

  Modified:    .        build.xml
               docs/manual install.html
               docs/manual/CoreTasks style.html
               src/main/org/apache/tools/ant/taskdefs XSLTProcess.java
  Removed:     src/main/org/apache/tools/ant Constants.java
                        DesirableFilter.java Launcher.java
               src/main/org/apache/tools/ant/taskdefs CompileTask.java
                        JavacOutputStream.java
               src/main/org/apache/tools/ant/taskdefs/optional
                        AdaptxLiaison.java ManifestFile.java
               src/testcases/org/apache/tools/ant/taskdefs/optional
                        AdaptxLiaisonTest.java
  Log:
  Remove code that has never been used in any released version of Ant.
  
  Revision  Changes    Path
  1.223     +0 -10     jakarta-ant/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/build.xml,v
  retrieving revision 1.222
  retrieving revision 1.223
  diff -u -r1.222 -r1.223
  --- build.xml	8 Jan 2002 09:46:26 -0000	1.222
  +++ build.xml	9 Jan 2002 09:08:38 -0000	1.223
  @@ -174,9 +174,6 @@
                  classname="javax.servlet.Servlet"
                  classpathref="classpath"/>
   
  -    <available property="adaptx.present"
  -               classname="org.exolab.adaptx.xslt.XSLTProcessor"
  -               classpathref="classpath" />
       <available property="xerces.present"
                  classname="org.apache.xerces.parsers.SAXParser"
                  classpathref="classpath" />
  @@ -269,7 +266,6 @@
                  unless="trax.present" />
         <exclude name="${optional.package}/XslpLiaison.java" unless="xslp.present" />
         <exclude name="${optional.package}/XalanLiaison.java" unless="xalan.present" />
  -      <exclude name="${optional.package}/AdaptxLiaison.java" unless="adaptx.present" />
         <exclude name="${optional.package}/ejb/Ejbc*.java" unless="ejb.ejbc.present" />
         <exclude name="${optional.package}/ejb/DDCreator*.java" unless="ejb.DDCreator.present" />
         <exclude name="${optional.package}/ejb/WLRun.java" unless="ejb.wls.present" />
  @@ -813,8 +809,6 @@
                  unless="xslp.present"/>
         <exclude name="org/apache/tools/ant/taskdefs/optional/XalanLiaisonTest.java"
                  unless="xalan.present"/>
  -      <exclude name="org/apache/tools/ant/taskdefs/optional/AdaptxLiaisonTest.java"
  -               unless="adaptx.present"/>
         <exclude name="${optional.package}/TraXLiaisonTest.java"
                  unless="trax.present"/>
   
  @@ -897,10 +891,6 @@
             <exclude name="org/apache/tools/ant/taskdefs/optional/XalanLiaisonTest.java" 
                      unless="xalan.present"/>
   
  -          <exclude name="org/apache/tools/ant/taskdefs/optional/AdaptxLiaisonTest.java"
  -                   unless="adaptx.present"/>
  -          <exclude name="org/apache/tools/ant/taskdefs/optional/AdaptxLiaisonTest.java"
  -                   unless="xerces.present"/>
             <exclude name="${optional.package}/perforce/*.java"
                      unless="jakarta.oro.present" />
   
  
  
  
  1.22      +1 -3      jakarta-ant/docs/manual/install.html
  
  Index: install.html
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/docs/manual/install.html,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- install.html	24 Dec 2001 03:21:05 -0000	1.21
  +++ install.html	9 Jan 2002 09:08:39 -0000	1.22
  @@ -264,12 +264,10 @@
       <td><b>Available At</b></td>
     </tr>
     <tr>
  -    <td>An XSL transformer like Xalan, Adaptx or XSL:P</td>
  +    <td>An XSL transformer like Xalan or XSL:P</td>
       <td>style task</td>
       <td><a href="http://xml.apache.org/xalan-j/index.html"
       target="_top">http://xml.apache.org/xalan-j/index.html</a> for Xalan.<br> 
  -    CVS module adaptx from :pserver:anoncvs@virtuals.intalio.com:/cvs/adaptx
  -    with password anoncvs for AdaptX.<br>
       XSL:P used to live at <a href="http://www.clc-marketing.com/xslp/"
       target="_top">http://www.clc-marketing.com/xslp/</a>, but the link
       doesn't work any longer and we are not aware of a replacement site.</td>
  
  
  
  1.14      +10 -10    jakarta-ant/docs/manual/CoreTasks/style.html
  
  Index: style.html
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/docs/manual/CoreTasks/style.html,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- style.html	26 Nov 2001 18:10:45 -0000	1.13
  +++ style.html	9 Jan 2002 09:08:39 -0000	1.14
  @@ -84,17 +84,17 @@
     </tr>
     <tr>
       <td valign="top">processor</td>
  +
       <td valign="top">name of the XSLT processor to use.  Permissible values are
  -      &quot;trax&quot; for a TraX compliant processor, &quot;xslp&quot; for the 
  -      XSL:P processor, &quot;xalan&quot; for the Apache XML Xalan (version 1) 
  -      processor, &quot;adaptx&quot; for the Exolab Adaptx processor
  -      or the name of an arbitrary XSLTLiaison class. Defaults to trax,
  -      followed by xalan, then adaptx and then xslp (in that
  -      order). The first one found in your class path is the one that
  -      is used.
  -      <em><strong>DEPRECATED</strong> - XSL:P and Adaptx are
  -      deprecated and will be removed in the next version. Use trax or
  -      xalan instead.</em>.
  +      &quot;trax&quot; for a TraX compliant processor,
  +      &quot;xslp&quot; for the XSL:P processor, &quot;xalan&quot; for
  +      the Apache XML Xalan (version 1) processor the name of an
  +      arbitrary XSLTLiaison class. Defaults to trax, followed by xalan
  +      and then xslp (in that order). The first one found in your class
  +      path is the one that is used.
  +
  +      <em><strong>DEPRECATED</strong> - XSL:P is deprecated and will
  +      be removed in the next version. Use trax or xalan instead.</em>.
         </td>
       <td align="center" valign="top">No</td>
     </tr>
  
  
  
  1.32      +4 -14     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
  
  Index: XSLTProcess.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- XSLTProcess.java	8 Jan 2002 19:55:11 -0000	1.31
  +++ XSLTProcess.java	9 Jan 2002 09:08:39 -0000	1.32
  @@ -288,11 +288,6 @@
               final Class clazz =
                   loadClass("org.apache.tools.ant.taskdefs.optional.XalanLiaison");
               liaison = (XSLTLiaison)clazz.newInstance();
  -        } else if (proc.equals("adaptx")) {
  -            log("DEPRECATED - adaptx processor is deprecated. Use trax or xalan instead.");
  -            final Class clazz =
  -                loadClass("org.apache.tools.ant.taskdefs.optional.AdaptxLiaison");
  -            liaison = (XSLTLiaison) clazz.newInstance();
           } else {
               liaison = (XSLTLiaison) loadClass(proc).newInstance();
           }
  @@ -422,16 +417,11 @@
                           resolveProcessor("xalan");
                       } catch (Throwable e2) {
                           try {
  -                            resolveProcessor("adaptx");
  +                            resolveProcessor("xslp");
                           } catch (Throwable e3) {
  -                            try {
  -                                resolveProcessor("xslp");
  -                            } catch (Throwable e4) {
  -                                e4.printStackTrace();
  -                                e3.printStackTrace();
  -                                e2.printStackTrace();
  -                                throw new BuildException(e1);
  -                            }
  +                            e3.printStackTrace();
  +                            e2.printStackTrace();
  +                            throw new BuildException(e1);
                           }
                       }
                   }
  
  
  

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