Return-Path: 
 <forrest-cvs-return-999-apmail-xml-forrest-dev-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-forrest-dev-archive@xml.apache.org
Received: (qmail 24972 invoked by uid 500); 10 Jun 2003 09:34:59 -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 24945 invoked from network); 10 Jun 2003 09:34:57 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 10 Jun 2003 09:34:57 -0000
Received: (qmail 18515 invoked by uid 1352); 10 Jun 2003 09:34:56 -0000
Date: 10 Jun 2003 09:34:56 -0000
Message-ID: <20030610093456.18514.qmail@icarus.apache.org>
From: jefft@apache.org
To: xml-forrest-cvs@apache.org
Subject: cvs commit: xml-forrest/src/resources/conf aggregate.xmap
 cocoon.xconf linkmap-tabs.xmap linkmap.xmap
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

jefft       2003/06/10 02:34:56

  Modified:    src/resources/conf aggregate.xmap cocoon.xconf
                        linkmap-tabs.xmap linkmap.xmap
  Log:
  Make skinconf.xml fields available as {conf:*} sitemap variables, and use
  project-name and project-url in PDFs, for title and external links
  respectively.
  
  Revision  Changes    Path
  1.2       +1 -0      xml-forrest/src/resources/conf/aggregate.xmap
  
  Index: aggregate.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/aggregate.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- aggregate.xmap	9 Jun 2003 10:27:39 -0000	1.1
  +++ aggregate.xmap	10 Jun 2003 09:34:56 -0000	1.2
  @@ -27,6 +27,7 @@
           <map:transform src="resources/stylesheets/site2book.xsl" />
           <map:transform src="resources/stylesheets/aggregates/book2cinclude.xsl">
             <map:parameter name="ignore" value="site"/>
  +          <map:parameter name="title" value="{conf:project-name} Documentation"/>
           </map:transform>
           <map:transform type="cinclude"/>
           <map:transform src="resources/stylesheets/aggregates/doc2doc-uniqueids.xsl"/>
  
  
  
  1.19      +13 -0     xml-forrest/src/resources/conf/cocoon.xconf
  
  Index: cocoon.xconf
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/cocoon.xconf,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- cocoon.xconf	24 May 2003 07:26:20 -0000	1.18
  +++ cocoon.xconf	10 Jun 2003 09:34:56 -0000	1.19
  @@ -91,6 +91,19 @@
         <input-module name="defaults"/>
       </component-instance>
   
  +    <component-instance
  +      class="org.apache.cocoon.components.modules.input.XMLFileModule"
  +      logger="core.modules.xml" name="skinconf"/>
  +
  +    <component-instance
  +      class="org.apache.cocoon.components.modules.input.SimpleMappingMetaModule"
  +      logger="core.modules.mapper" name="conf">
  +      <input-module name="skinconf">
  +        <file src="skinconf.xml" reloadable="true" />
  +      </input-module>
  +      <prefix>/skinconfig/</prefix>
  +    </component-instance>
  +
       <!-- For the site: scheme -->
       <component-instance
         class="org.apache.cocoon.components.modules.input.XMLFileModule"
  
  
  
  1.4       +1 -0      xml-forrest/src/resources/conf/linkmap-tabs.xmap
  
  Index: linkmap-tabs.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/linkmap-tabs.xmap,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- linkmap-tabs.xmap	9 Jun 2003 12:53:27 -0000	1.3
  +++ linkmap-tabs.xmap	10 Jun 2003 09:34:56 -0000	1.4
  @@ -40,6 +40,7 @@
           <map:generate src="cocoon://abs-linkmap" />
           <map:transform src="resources/stylesheets/relativize-linkmap.xsl">
             <map:parameter name="path" value="{1}{2}" />
  +          <map:parameter name="site-root" value="{conf:project-url}" />
           </map:transform>
           <map:serialize type="xml" />
         </map:match>
  
  
  
  1.9       +1 -0      xml-forrest/src/resources/conf/linkmap.xmap
  
  Index: linkmap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/linkmap.xmap,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- linkmap.xmap	9 Jun 2003 12:53:13 -0000	1.8
  +++ linkmap.xmap	10 Jun 2003 09:34:56 -0000	1.9
  @@ -38,6 +38,7 @@
           <map:generate src="cocoon://abs-linkmap" />
           <map:transform src="resources/stylesheets/relativize-linkmap.xsl">
             <map:parameter name="path" value="{1}{2}" />
  +          <map:parameter name="site-root" value="{conf:project-url}" />
           </map:transform>
           <map:serialize type="xml" />
         </map:match>