forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From je...@apache.org
Subject cvs commit: xml-forrest/src/resources/forrest-shbat forrest.build.xml
Date Thu, 04 Sep 2003 13:12:05 GMT
jefft       2003/09/04 06:12:05

  Modified:    .        status.xml
               src/resources/forrest-shbat forrest.build.xml
  Log:
  Allow version-specific sitemaps
  
  Revision  Changes    Path
  1.200     +7 -0      xml-forrest/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/status.xml,v
  retrieving revision 1.199
  retrieving revision 1.200
  diff -u -r1.199 -r1.200
  --- status.xml	4 Sep 2003 03:03:10 -0000	1.199
  +++ status.xml	4 Sep 2003 13:12:04 -0000	1.200
  @@ -25,6 +25,13 @@
   
     <changes>
       <release version="0.5-dev" date="unreleased">
  +      <action dev="JT" type="add" context="core">
  +        Added ability to have version-specific overridden sitemaps.  For
  +        example, src/documentation/sitemap-0.5.xmap will be used by Forrest 0.5
  +        in preference to any others present in the same directory.  This means a
  +        site with overridden sitemaps can build with Cocoon versions expecting
  +        different sitemap formats.
  +      </action>
         <action dev="JJP" type="update" context="skins"
           due-to="Dave Brondsema" due-to-email="dave@brondsema.net" >
           Added email template for html content in common skin.
  
  
  
  1.88      +26 -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.87
  retrieving revision 1.88
  diff -u -r1.87 -r1.88
  --- forrest.build.xml	3 Sep 2003 23:14:44 -0000	1.87
  +++ forrest.build.xml	4 Sep 2003 13:12:04 -0000	1.88
  @@ -11,10 +11,12 @@
   
   <project default="site" basedir="." name="Forrest template targets">
   
  +  <property name="version" value="0.5"/>
  +
     <description>
       *=======================================================*
       |                 Forrest Site Builder                  |
  -    |                        0.5-dev                        |
  +    |                        ${version}-dev                        |
       |             $Date$              |
       *=======================================================*
     
  @@ -393,25 +395,42 @@
       copy-xdocs, copy-stylesheets, copy-images, copy-grammars, copy-content, copy-lib, 
       copy-classes, copy-skins, copy-skinconf, copy-status"/>
   
  -  <target name="project-context" depends="examine-proj, ensure-content, validate, init,
bare-context, copy-sitemap, copy-conf,
  +  <target name="project-context" depends="examine-proj, ensure-content,
  +    validate, init, bare-context, copy-sitemap, copy-conf,
       copy-xdocs, copy-stylesheets, copy-images, copy-grammars, copy-resources, copy-content,
copy-lib, 
       copy-classes, copy-skins, copy-skinconf, copy-status"/>
   
     <target name="copy-conf" if="conf.present">
       <copy toDir="${project.ctxt-dir}/WEB-INF" filtering="true"
         overwrite="true" failonerror="false">
  -      <fileset dir="${project.conf-dir}"/>
  +      <fileset dir="${project.conf-dir}">
  +        <exclude name="*-${version}.xconf"/>
  +      </fileset>
       </copy>
  -  </target>
  +    <copy toDir="${project.ctxt-dir}/WEB-INF" filtering="true" overwrite="true"
  +      failonerror="false">
  +      <fileset dir="${project.conf-dir}">
  +        <include name="*-${version}.*"/>
  +      </fileset>
  +      <mapper type="glob" from="*-${version}.xconf" to="*.xconf"/>
  +    </copy>
  +   </target>
   
     <target name="copy-sitemap" if="sitemap.present">
       <copy toDir="${project.ctxt-dir}" filtering="true" overwrite="true" failonerror="false">
         <fileset dir="${project.sitemap-dir}">
  +        <exclude name="*-${version}.xmap"/>
           <include name="*.xmap"/>
           <include name="jtidy.properties"/>
         </fileset>
       </copy>
  -   </target>
  +    <copy toDir="${project.ctxt-dir}" filtering="true" overwrite="true">
  +      <fileset dir="${project.sitemap-dir}">
  +        <include name="*-${version}.xmap"/>
  +      </fileset>
  +      <mapper type="glob" from="*-${version}.xmap" to="*.xmap"/>
  +    </copy>
  +  </target>
   
     <target name="copy-xdocs" if="xdocs.present">
       <sync toDir="${project.ctxt-dir}/content/xdocs">
  @@ -854,6 +873,7 @@
   
     <target name="validate-sitemap" depends="validation-props"
       if="validate.sitemap">
  +
       <jing rngfile="${forrest.home}/context/resources/schema/relaxng/sitemap-v06.rng">
         <fileset dir="${project.content-dir}"
           includes="${forrest.validate.sitemap.includes}"
  
  
  

Mime
View raw message