ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ehatc...@apache.org
Subject cvs commit: jakarta-ant build.xml
Date Tue, 28 May 2002 11:50:38 GMT
ehatcher    02/05/28 04:50:38

  Modified:    .        Tag: ANT_15_BRANCH build.xml
  Log:
  applying Craeg's patch
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.304.2.12 +7 -8      jakarta-ant/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/build.xml,v
  retrieving revision 1.304.2.11
  retrieving revision 1.304.2.12
  diff -u -r1.304.2.11 -r1.304.2.12
  --- build.xml	28 May 2002 00:33:35 -0000	1.304.2.11
  +++ build.xml	28 May 2002 11:50:38 -0000	1.304.2.12
  @@ -335,7 +335,10 @@
                      classpathref="classpath"/>
         </and>
       </condition>
  -    <condition property="trax.present">
  +    <available property="trax.present"
  +               classname="javax.xml.transform.Transformer"
  +               classpathref="classpath" />
  +    <condition property="trax.impl.present">
         <or>
           <and>
             <isset property="javax.xml.transform.TransformerFactory"/>
  @@ -406,10 +409,6 @@
       <available property="commons.logging.present"
                  classname="org.apache.commons.logging.LogFactory"
                  classpathref="classpath"/>
  -    <!-- this is just a way to check for a TraX implementation -->
  -    <available property="trax.impl.present"
  -               resource="META-INF/services/javax.xml.transform.TransformerFactory"
  -               classpathref="classpath"/>
       <available property="xalan.envcheck"
                  classname="org.apache.xalan.xslt.EnvironmentCheck"
                  classpathref="classpath" />
  @@ -1282,11 +1281,11 @@
             <!-- these tests need to be localised before being ran???? -->
             <exclude name="${optional.package}/PvcsTest.java" />
   
  -          <!-- ehm, these are not really TraX tests but rather xalan2 tests..-->
  +          <!-- These tests need a TraX implementation like xalan2 or saxon -->
             <exclude name="${optional.package}/TraXLiaisonTest.java"
  -                   unless="xalan2.present"/>
  +                   unless="trax.impl.present"/>
             <exclude name="${optional.package}/XsltTest.java"
  -                   unless="xalan2.present"/>
  +                   unless="trax.impl.present"/>
   
             <!-- needs BSF to work -->
             <exclude name="${optional.package}/XalanLiaisonTest.java"
  
  
  

--
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