You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by je...@apache.org on 2002/12/01 13:20:47 UTC

cvs commit: xml-forrest/tools/ant/lib ant-apache-resolver.jar ant-trax.jar ant-xalan2.jar ant.jar nodeps.jar resolver.jar

jefft       2002/12/01 04:20:47

  Modified:    src/resources/forrest-shbat forrest.build.xml
               tools/ant/lib ant-apache-resolver.jar ant-trax.jar
                        ant-xalan2.jar ant.jar nodeps.jar resolver.jar
  Log:
  Update to 2002-12-01 Ant build, with a patch applied to allow optional
  catalogs:
  http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14978
  
  Revision  Changes    Path
  1.29      +5 -6      xml-forrest/src/resources/forrest-shbat/forrest.build.xml
  
  Index: forrest.build.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/forrest-shbat/forrest.build.xml,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- forrest.build.xml	29 Nov 2002 06:44:13 -0000	1.28
  +++ forrest.build.xml	1 Dec 2002 12:20:47 -0000	1.29
  @@ -718,12 +718,11 @@
       <basename file="${project.catalog}" property="catalog-file"/>
       <xmlvalidate failonerror="${forrest.validate.xdocs.failonerror}" lenient="no" warn="yes">
         <xmlcatalog>
  -        <catalogfiles dir="${project.schema-dir}">
  -          <include name="${catalog-file}"/>
  -        </catalogfiles>
  -        <catalogfiles dir="${forrest.home}/context/resources/schema">
  -          <include name="catalog" />
  -        </catalogfiles>
  +        <catalogpath>
  +          <pathelement location="${project.schema-dir}/${catalog-file}"/>
  +          <pathelement
  +            location="${forrest.home}/context/resources/schema/catalog"/>
  +        </catalogpath>
         </xmlcatalog>
         <fileset dir="${project.xdocs-dir}"
           includes="${forrest.validate.xdocs.includes}"
  
  
  
  1.2       +25 -30    xml-forrest/tools/ant/lib/ant-apache-resolver.jar
  
  	<<Binary file>>
  
  
  1.2       +72 -77    xml-forrest/tools/ant/lib/ant-trax.jar
  
  	<<Binary file>>
  
  
  1.2       +16 -16    xml-forrest/tools/ant/lib/ant-xalan2.jar
  
  	<<Binary file>>
  
  
  1.3       +963 -957  xml-forrest/tools/ant/lib/ant.jar
  
  	<<Binary file>>
  
  
  1.2       +539 -471  xml-forrest/tools/ant/lib/nodeps.jar
  
  	<<Binary file>>
  
  
  1.2       +263 -257  xml-forrest/tools/ant/lib/resolver.jar
  
  	<<Binary file>>