Return-Path: 
 <forrest-cvs-return-15-apmail-xml-forrest-dev-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-forrest-dev-archive@xml.apache.org
Received: (qmail 31146 invoked by uid 500); 4 Nov 2002 14:43:45 -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 31107 invoked from network); 4 Nov 2002 14:43:42 -0000
Received: from icarus.apache.org (63.251.56.143)
  by daedalus.apache.org with SMTP; 4 Nov 2002 14:43:42 -0000
Received: (qmail 26967 invoked by uid 1352); 4 Nov 2002 14:43:41 -0000
Date: 4 Nov 2002 14:43:41 -0000
Message-ID: <20021104144341.26966.qmail@icarus.apache.org>
From: jefft@apache.org
To: xml-forrest-cvs@apache.org
Subject: cvs commit: xml-forrest/src/resources/forrest-shbat forrest.build.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

jefft       2002/11/04 06:43:41

  Modified:    src/resources/forrest-shbat forrest.build.xml
  Log:
  Copy src/documentation/content/* (except xdocs) into the context root, so all
  content is made available to the sitemap.
  
  Revision  Changes    Path
  1.13      +26 -2     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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- forrest.build.xml	4 Nov 2002 10:48:31 -0000	1.12
  +++ forrest.build.xml	4 Nov 2002 14:43:41 -0000	1.13
  @@ -73,7 +73,11 @@
       <!-- use of these property should be removed when the siteplan becomes active -->
       <property name="project.skin"        value="forrest-site" />
       <property name="project.status"      value="${project.home}/status.xml" />
  +    <!-- FIXME: rename project.content-dir to project.documentation-dir -->
       <property name="project.content-dir" value="${project.home}/src/documentation" />
  +    <!-- NOTE: Do not rely on this 'project.real-content-dir' property, as it
  +    will go away soon -->
  +    <property name="project.real-content-dir" value="${project.content-dir}/content" />
       <property name="project.sitemap"     value="${project.content-dir}/sitemap.xmap" />
       <property name="project.xdocs-dir"   value="${project.content-dir}/content/xdocs" />
       <property name="project.stylesheets-dir" value="${project.content-dir}/resources/stylesheets" />
  @@ -95,6 +99,7 @@
   
     <target name="examine-proj" depends="init-props">
       <available property="conf.present" file="${project.conf-dir}" type="dir"/>
  +    <available property="real-content.present" file="${project.real-content-dir}" type="dir"/>
       <available property="sitemap.present" file="${project.sitemap}"/>
       <available property="xdocs.present" file="${project.xdocs-dir}" type="dir"/>
       <available property="images.present" file="${project.images-dir}" type="dir"/>
  @@ -125,6 +130,7 @@
           <isset property="xdocs.present"/>
         </and>
       </condition>
  +    <echo>validate.xdocs is ${validate.xdocs}</echo>
       <property name="forrest.validate.xdocs.includes" value="*.x*"/>
       <property name="forrest.validate.xdocs.excludes" value=""/>
       <property name="forrest.validate.xdocs.failonerror"
  @@ -351,7 +357,7 @@
       copy-classes, copy-skins, copy-skinconf, copy-status"/>
   
     <target name="project-context" depends="examine-proj, ensure-content, validate, init, bare-context, copy-conf, copy-sitemap,
  -    copy-xdocs, copy-stylesheets, copy-images, copy-schema, copy-lib, 
  +    copy-xdocs, copy-stylesheets, copy-images, copy-schema, copy-content, copy-lib, 
       copy-classes, copy-skins, copy-skinconf, copy-status"/>
   
     <target name="copy-conf" if="conf.present">
  @@ -373,6 +379,14 @@
       </copy>
     </target>
   
  +  <target name="copy-resources" if="resources.present">
  +    <copy toDir="${project.ctxt-dir}/resources" filtering="false"
  +      overwrite="true" failonerror="false">
  +      <fileset dir="${project.resources-dir}">
  +      </fileset>
  +    </copy>
  +  </target>
  +
     <target name="copy-stylesheets" if="stylesheets.present">
       <copy toDir="${project.ctxt-dir}/resources/stylesheets" filtering="false"
         overwrite="true" failonerror="false">
  @@ -381,9 +395,19 @@
     </target>
   
     <target name="copy-images" if="images.present">
  -<copy toDir="${project.ctxt-dir}/resources/images" filtering="false"
  +    <copy toDir="${project.ctxt-dir}/resources/images" filtering="false"
         overwrite="true" failonerror="false">
         <fileset dir="${project.images-dir}"/>
  +    </copy>
  +  </target>
  +
  +  <!-- Copy all non-xdocs content -->
  +  <target name="copy-content" if="real-content.present">
  +    <copy toDir="${project.ctxt-dir}/content" filtering="false"
  +      overwrite="true" failonerror="false">
  +      <fileset dir="${project.real-content-dir}">
  +        <exclude name="xdocs/**"/>
  +      </fileset>
       </copy>
     </target>