Return-Path: 
 <forrest-cvs-return-79-apmail-xml-forrest-dev-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-forrest-dev-archive@xml.apache.org
Received: (qmail 6372 invoked by uid 500); 11 Nov 2002 05:22:35 -0000
Mailing-List: contact forrest-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:forrest-cvs-help@xml.apache.org>
list-unsubscribe: <mailto:forrest-cvs-unsubscribe@xml.apache.org>
list-post: <mailto:forrest-cvs@xml.apache.org>
Reply-To: forrest-dev@xml.apache.org
Delivered-To: mailing list forrest-cvs@xml.apache.org
Received: (qmail 6361 invoked from network); 11 Nov 2002 05:22:34 -0000
Received: from icarus.apache.org (63.251.56.143)
  by daedalus.apache.org with SMTP; 11 Nov 2002 05:22:34 -0000
Received: (qmail 47053 invoked by uid 1352); 11 Nov 2002 05:22:32 -0000
Date: 11 Nov 2002 05:22:32 -0000
Message-ID: <20021111052232.47052.qmail@icarus.apache.org>
From: jefft@apache.org
To: xml-forrest-cvs@apache.org
Subject: cvs commit: xml-forrest/src/resources/fresh-site forrest.properties
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

jefft       2002/11/10 21:22:32

  Modified:    .        build.xml
               src/resources/forrest-shbat forrest.build.xml
               src/resources/fresh-site forrest.properties
  Log:
  Adapt sitemap authentication to run on any project's sitemap
  
  Revision  Changes    Path
  1.42      +0 -2      xml-forrest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/build.xml,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- build.xml	11 Nov 2002 02:21:27 -0000	1.41
  +++ build.xml	11 Nov 2002 05:22:31 -0000	1.42
  @@ -188,7 +188,6 @@
       <echo message="validating **/skinconf.xml ..."/>
       <jing rngfile="./src/resources/schema/relaxng/skinconf-v10.rng">
         <fileset dir="./src/resources" includes="**/skinconf.xml"/>
  -      <fileset dir="./src/documentation" includes="**/skinconf.xml"/>
       </jing>
       <!-- All stylesheets **/*.xsl -->
       <echo message="validating stylesheets **/*.xsl ..."/>
  @@ -208,7 +207,6 @@
   <!-- FIXME: Need Norm Walsh catalog entity resolver or Jeff's DoctypeChanger.
       <echo message="validating **/book.xml ..."/>
       <jing rngfile="./src/resources/schema/relaxng/book-v01.rng">
  -      <fileset dir="./src/documentation" includes="**/book.xml"/>
         <fileset dir="./src/resources" includes="**/book.xml"/>
       </jing>
   -->
  
  
  
  1.17      +24 -1     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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- forrest.build.xml	7 Nov 2002 06:37:02 -0000	1.16
  +++ forrest.build.xml	11 Nov 2002 05:22:32 -0000	1.17
  @@ -148,6 +148,19 @@
       <property name="forrest.validate.skinconf.failonerror"
         value="${forrest.validate.failonerror}" />
   
  +    <property name="forrest.validate.sitemap" value="${forrest.validate}"/>
  +    <condition property="validate.sitemap">
  +      <and>
  +        <istrue value="${forrest.validate.sitemap}"/>
  +        <isset property="sitemap.present"/>
  +      </and>
  +    </condition>
  +    <basename file="${project.sitemap}" property="sitemap-file"/>
  +    <property name="forrest.validate.sitemap.includes" value="${sitemap-file}"/>
  +    <property name="forrest.validate.sitemap.excludes" value=""/>
  +    <property name="forrest.validate.sitemap.failonerror"
  +      value="${forrest.validate.failonerror}" />
  +
       <property name="forrest.validate.stylesheets" value="${forrest.validate}"/>
       <condition property="validate.stylesheets">
         <and>
  @@ -694,7 +707,7 @@
   
   
     <target name="validate" depends="validation-props, validate-xdocs,
  -    validate-skinconf, validate-skins,
  +    validate-skinconf, validate-sitemap, validate-skins,
       validate-stylesheets"  description="Validates XML doc files in the project"/>
   
     <target name="validate-xdocs" depends="validation-props" if="validate.xdocs">
  @@ -722,6 +735,16 @@
           excludes="${forrest.validate.skinconf.excludes}"/>
       </jing>
       <echo message="...validated skinconf"/>
  +  </target>
  +
  +  <target name="validate-sitemap" depends="validation-props"
  +    if="validate.sitemap">
  +    <jing rngfile="${forrest.home}/context/resources/schema/relaxng/sitemap-v05.rng">
  +      <fileset dir="${project.content-dir}"
  +        includes="${forrest.validate.sitemap.includes}"
  +        excludes="${forrest.validate.sitemap.excludes}"/>
  +    </jing>
  +    <echo message="...validated sitemap"/>
     </target>
   
     <target name="validate-stylesheets" depends="validation-props"
  
  
  
  1.13      +5 -0      xml-forrest/src/resources/fresh-site/forrest.properties
  
  Index: forrest.properties
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/fresh-site/forrest.properties,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- forrest.properties	8 Nov 2002 04:20:21 -0000	1.12
  +++ forrest.properties	11 Nov 2002 05:22:32 -0000	1.13
  @@ -40,6 +40,7 @@
   #forrest.validate=true
   #forrest.validate.xdocs=${forrest.validate}
   #forrest.validate.skinconf=${forrest.validate}
  +#forrest.validate.sitemap=${forrest.validate}
   #forrest.validate.stylesheets=${forrest.validate}
   #forrest.validate.skins=${forrest.validate}
   #forrest.validate.skins.stylesheets=${forrest.validate.skins}
  @@ -62,6 +63,10 @@
   #forrest.validate.skinconf.includes=${skinconf-file}
   #forrest.validate.skinconf.excludes=
   #forrest.validate.skinconf.failonerror=${forrest.validate.failonerror}
  +#
  +#forrest.validate.sitemap.includes=${sitemap-file}
  +#forrest.validate.sitemap.excludes=
  +#forrest.validate.sitemap.failonerror=${forrest.validate.failonerror}
   #
   #forrest.validate.skinconf.includes=${skinconf-file}
   #forrest.validate.skinconf.excludes=