Return-Path: 
 <cocoon-cvs-return-11149-apmail-xml-cocoon-cvs-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-cocoon-cvs-archive@xml.apache.org
Received: (qmail 81383 invoked by uid 500); 16 Mar 2003 11:23:58 -0000
Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
Reply-To: cocoon-dev@xml.apache.org
list-help: <mailto:cocoon-cvs-help@xml.apache.org>
list-unsubscribe: <mailto:cocoon-cvs-unsubscribe@xml.apache.org>
list-post: <mailto:cocoon-cvs@xml.apache.org>
Delivered-To: mailing list cocoon-cvs@xml.apache.org
Received: (qmail 81372 invoked by uid 500); 16 Mar 2003 11:23:58 -0000
Delivered-To: apmail-cocoon-2.1-cvs@apache.org
Received: (qmail 81369 invoked from network); 16 Mar 2003 11:23:58 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 16 Mar 2003 11:23:58 -0000
Received: (qmail 73458 invoked by uid 1010); 16 Mar 2003 11:23:56 -0000
Date: 16 Mar 2003 11:23:56 -0000
Message-ID: <20030316112356.73457.qmail@icarus.apache.org>
From: stefano@apache.org
To: cocoon-2.1-cvs@apache.org
Subject: cvs commit: cocoon-2.1 build.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

stefano     2003/03/16 03:23:55

  Modified:    .        build.xml
  Log:
  validation of config and xdocs now works again
  
  Revision  Changes    Path
  1.15      +15 -50    cocoon-2.1/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/build.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- build.xml	16 Mar 2003 10:38:00 -0000	1.14
  +++ build.xml	16 Mar 2003 11:23:55 -0000	1.15
  @@ -78,7 +78,14 @@
       <condition property="unless.exclude.idldocs">
         <istrue value="${exclude.idldocs}"/>
       </condition>
  -        
  +
  +    <condition property="exclude.validate.config">
  +      <isfalse value="${validate.config}"/>
  +    </condition>
  +    <condition property="exclude.validate.xdocs">
  +      <isfalse value="${validate.xdocs}"/>
  +    </condition>
  +            
       <filter token="Name"                value="${fullname}"/>
       <filter token="name"                value="${fullname}"/>
       <filter token="year"                value="${year}"/>
  @@ -724,7 +731,7 @@
       <xpatch directory="${resources.javadoc}" extension="xwelcome" configuration="${build.webapp}/welcome.xml"/>    
     </target>
       
  -  <target name="prepare-webapp-docs" depends="init" unless="unless.exclude.webapp.documentation">
  +  <target name="prepare-webapp-docs" depends="validate-xdocs" unless="unless.exclude.webapp.documentation">
       <mkdir dir="${build.webapp.docs}"/>
       
       <copy todir="${build.webapp.docs}" filtering="on">
  @@ -795,61 +802,19 @@
       </xslt>
     </target>
   
  -  <!-- Validate some important default core configuration files. Process the
  -       default config files here, then do them again later in validate-config
  -       after the blocks have been processed and fragments added.
  -  -->
  -  <target name="validate-core-config" depends="prepare,init-jing"
  -          description="Validation of default core configuration files using RELAX NG"
  -          if="validate.config">
  -    <echo message="Conducting validation of default core configuration files."/>
  -    <echo message="(You can turn validation off if you must - comment out the validate.config property in build.properties)"/>
  -    <jing rngfile="./src/webapp/WEB-INF/entities/any.rng">
  -      <fileset dir="./src/webapp/WEB-INF" includes="cocoon.xconf"/>
  -    </jing>
  -    <jing rngfile="./src/webapp/WEB-INF/entities/roles-v01.rng">
  -      <fileset dir="./src/java/org/apache/cocoon" includes="cocoon.roles"/>
  -    </jing>
  -<!-- FIXME: recent sitemap changes have broken validation
  -    <jing rngfile="${build.webapp}/WEB-INF/entities/sitemap-v06.rng">
  -      <fileset dir="./src/webapp" includes="sitemap.xmap"/>
  -    </jing>
  --->
  -  </target>
  +  <!-- Validate configuration files. -->
  +  <target name="validate-config" depends="init-jing" unless="exclude.validate.config">
  +    <echo message="Validating configuration files"/>
   
  -  <!-- Validate some important final configuration files. At this stage
  -       the fragments from blocks have been added to the default core config.
  -  -->
  -  <target name="validate-config" depends="init-jing" if="validate.config">
  -    <echo message="Conducting validation of final configuration files."/>
  -    <echo message="(You can turn validation off if you must - comment out the validate.config property in build.properties)"/>
  +    <echo message="Validating cocoon.xconf using RELAX NG ..."/>
       <jing rngfile="${build.webapp}/WEB-INF/entities/any.rng">
         <fileset dir="${build.webapp}/WEB-INF" includes="cocoon.xconf"/>
       </jing>
  -<!-- FIXME: precept.xroles has a new un-defined attribute "default-hint"
  -     which is breaking validation.
  -    <jing rngfile="${build.webapp}/WEB-INF/entities/roles-v01.rng">
  -      <fileset dir="${build}/classes/org/apache/cocoon"
  -               includes="cocoon.roles"/>
  -    </jing>
  --->
  -<!-- FIXME: recent sitemap changes have broken validation
  -    <jing rngfile="${build.webapp}/WEB-INF/entities/sitemap-v06.rng">
  -      <fileset dir="${build.webapp}" includes="sitemap.xmap"/>
  -    </jing>
  --->
     </target>
   
     <!-- Validation of xdocs  -->
  -  <!-- This only does documentation/xdocs/**.xml and does not attempt to do
  -       webapps, blocks, java, etc. because most of their xdocs do not bother
  -       to declare a ruleset. -->
  -  <target name="validate-xdocs"
  -          description="Validation of all core XML documentation"
  -          depends="prepare-docs,init-jing"
  -          if="validate.xdocs">
  +  <target name="validate-xdocs" depends="prepare-docs,init-jing" unless="exclude.validate.xdocs">
       <echo message="Conducting validation of core XML documentation."/>
  -    <echo message="(You can turn validation off if you must - comment out the validate.xdocs property in build.properties)"/>
   
       <echo message="Validating all **/book.xml instances using RELAX NG ..."/>
       <jing rngfile="${webapp}/WEB-INF/entities/book-v01.rng">