Return-Path: 
 <forrest-cvs-return-1018-apmail-xml-forrest-dev-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-forrest-dev-archive@xml.apache.org
Received: (qmail 7942 invoked by uid 500); 22 Jun 2003 06:29:32 -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 7931 invoked from network); 22 Jun 2003 06:29:31 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 22 Jun 2003 06:29:31 -0000
Received: (qmail 7678 invoked by uid 1352); 22 Jun 2003 06:29:30 -0000
Date: 22 Jun 2003 06:29:30 -0000
Message-ID: <20030622062930.7677.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       2003/06/21 23:29:30

  Modified:    .        status.xml
               src/resources/fresh-site forrest.properties
               src/resources/forrest-shbat forrest.build.xml
  Log:
  Define ${project.resources-dir}, and copy across all content into the webapp.
  The idea is to allow resource files (eg. XML lookup files) which are made
  available to the XSLTs.  Conceptually, this is where skinconf.xml belongs.
  
  Revision  Changes    Path
  1.168     +5 -0      xml-forrest/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/status.xml,v
  retrieving revision 1.167
  retrieving revision 1.168
  diff -u -r1.167 -r1.168
  --- status.xml	19 Jun 2003 10:51:49 -0000	1.167
  +++ status.xml	22 Jun 2003 06:29:30 -0000	1.168
  @@ -24,6 +24,11 @@
   
     <changes>
       <release version="0.5-dev" date="unreleased">
  +      <action dev="JT" type="update" context="core">
  +        Allow any sort of content inside <code>resources/</code>, which will be
  +        made available to the sitemap but not automatically copied to the
  +        generated site output.
  +      </action>
         <action dev="JT" type="update" context="skins">
           Add a flag for email obfuscation, and turn it off by default.
         </action>
  
  
  
  1.26      +4 -3      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.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- forrest.properties	13 May 2003 01:15:12 -0000	1.25
  +++ forrest.properties	22 Jun 2003 06:29:30 -0000	1.26
  @@ -27,9 +27,10 @@
   #project.conf-dir=${project.content-dir}/conf
   #project.sitemap-dir=${project.content-dir}
   #project.xdocs-dir=${project.content-dir}/content/xdocs
  -#project.stylesheets-dir=${project.content-dir}/resources/stylesheets
  -#project.images-dir=${project.content-dir}/resources/images
  -#project.schema-dir=${project.content-dir}/resources/schema
  +#project.resources-dir=${project.content-dir}/resources
  +#project.stylesheets-dir=${project.resources-dir}/stylesheets
  +#project.images-dir=${project.resources-dir}/images
  +#project.schema-dir=${project.resources-dir}/schema
   #project.skins-dir=${project.content-dir}/skins
   #project.skinconf=${project.content-dir}/skinconf.xml
   #project.lib-dir=${project.content-dir}/lib
  
  
  
  1.73      +12 -8     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.72
  retrieving revision 1.73
  diff -u -r1.72 -r1.73
  --- forrest.build.xml	28 May 2003 02:36:22 -0000	1.72
  +++ forrest.build.xml	22 Jun 2003 06:29:30 -0000	1.73
  @@ -84,10 +84,11 @@
       <property name="project.real-content-dir" location="${project.content-dir}/content" />
       <property name="project.sitemap-dir"     location="${project.content-dir}" />
       <property name="project.xdocs-dir"   location="${project.content-dir}/content/xdocs" />
  -    <property name="project.stylesheets-dir" location="${project.content-dir}/resources/stylesheets" />
  -    <property name="project.images-dir"  location="${project.content-dir}/resources/images" />
  -    <property name="project.schema-dir"  location="${project.content-dir}/resources/schema" />
  -    <property name="project.grammars-dir" location="${project.content-dir}/resources/grammars" />
  +    <property name="project.resources-dir"   location="${project.content-dir}/resources"/>
  +    <property name="project.stylesheets-dir" location="${project.resources-dir}/stylesheets" />
  +    <property name="project.images-dir"  location="${project.resources-dir}/images" />
  +    <property name="project.schema-dir"  location="${project.resources-dir}/schema" />
  +    <property name="project.grammars-dir" location="${project.resources-dir}/grammars" />
       <property name="project.catalog"     location="${project.schema-dir}/catalog.xcat" />
       <property name="forrest.catalog.verbosity" value="1" />
       <property name="forrest.maxmemory" value="64m" />
  @@ -111,6 +112,7 @@
       <available property="real-content.present" file="${project.real-content-dir}" type="dir"/>
       <available property="sitemap.present" file="${project.sitemap-dir}" type="dir"/>
       <available property="xdocs.present" file="${project.xdocs-dir}" type="dir"/>
  +    <available property="resources.present" file="${project.resources-dir}" type="dir"/>
       <available property="images.present" file="${project.images-dir}" type="dir"/>
       <available property="grammars.present" file="${project.grammars-dir}" type="dir"/>
       <available property="schema.present" file="${project.schema-dir}" type="dir"/>
  @@ -386,7 +388,7 @@
       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,
  -    copy-xdocs, copy-stylesheets, copy-images, copy-grammars, copy-content, copy-lib, 
  +    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">
  @@ -412,9 +414,11 @@
     </target>
   
     <target name="copy-resources" if="resources.present">
  -    <copy toDir="${project.ctxt-dir}/resources" filtering="false"
  -      overwrite="true" failonerror="false">
  +    <copy toDir="${project.ctxt-dir}/resources" filtering="false" failonerror="false">
         <fileset dir="${project.resources-dir}">
  +        <exclude name="stylesheets"/>
  +        <exclude name="images"/>
  +        <exclude name="grammars"/>
         </fileset>
       </copy>
     </target>