Return-Path: 
 <cocoon-dev-return-44067-apmail-xml-cocoon-dev-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-cocoon-dev-archive@xml.apache.org
Received: (qmail 58149 invoked by uid 500); 25 Jun 2003 19:59:08 -0000
Mailing-List: contact cocoon-dev-help@xml.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:cocoon-dev-help@xml.apache.org>
list-unsubscribe: <mailto:cocoon-dev-unsubscribe@xml.apache.org>
list-post: <mailto:cocoon-dev@xml.apache.org>
Reply-To: cocoon-dev@xml.apache.org
Delivered-To: mailing list cocoon-dev@xml.apache.org
Received: (qmail 58127 invoked from network); 25 Jun 2003 19:59:07 -0000
Received: from unknown (HELO host.leverageweb.com) (64.91.232.157)
  by daedalus.apache.org with SMTP; 25 Jun 2003 19:59:07 -0000
Received: from dhcp205162.hq.af.mil ([134.205.205.162]
 helo=WHEW00073U.leverageweb.com)
	by host.leverageweb.com with esmtp (Exim 3.36 #1)
	id 19VFou-0005dI-00
	for cocoon-dev@xml.apache.org; Wed, 25 Jun 2003 15:20:40 -0400
Message-Id: <5.2.0.9.0.20030625152232.00a723f8@leverageweb.com>
X-Sender: cocoon@leverageweb.com@leverageweb.com (Unverified)
X-Mailer: QUALCOMM Windows Eudora Version 5.2.0.9
Date: Wed, 25 Jun 2003 15:23:32 -0400
To: cocoon-dev@xml.apache.org
From: Geoff Howard <cocoon@leverageweb.com>
Subject: Re: cvs commit: cocoon-2.1/src/documentation sitemap.xmap
In-Reply-To: <20030625115608.76235.qmail@icarus.apache.org>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"; format=flowed
X-AntiAbuse: This header was added to track abuse,
 please include it with any abuse report
X-AntiAbuse: Primary Hostname - host.leverageweb.com
X-AntiAbuse: Original Domain - xml.apache.org
X-AntiAbuse: Originator/Caller UID/GID - [0 0] / [0 0]
X-AntiAbuse: Sender Address Domain - leverageweb.com
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

Does this make the locally built docs use the new look as the website
does?

Geoff

At 07:56 AM 6/25/2003, you wrote:
>jefft       2003/06/25 04:56:07
>
>   Modified:    src/documentation sitemap.xmap
>   Log:
>   Update overridden sitemap to work with Forrest 'stable-20030625' tag.
>
>   Revision  Changes    Path
>   1.8       +148 -140  cocoon-2.1/src/documentation/sitemap.xmap
>
>   Index: sitemap.xmap
>   ===================================================================
>   RCS file: /home/cvs/cocoon-2.1/src/documentation/sitemap.xmap,v
>   retrieving revision 1.7
>   retrieving revision 1.8
>   diff -u -r1.7 -r1.8
>   --- sitemap.xmap      29 May 2003 11:49:32 -0000      1.7
>   +++ sitemap.xmap      25 Jun 2003 11:56:07 -0000      1.8
>   @@ -18,6 +18,9 @@
>          </map:transformer>
>
>          <map:transformer name="linkrewriter" 
> logger="sitemap.transformer.linkrewriter" 
> src="org.apache.cocoon.transformation.LinkRewriterTransformer">
>   +        <link-attrs>href src</link-attrs>
>   +        <schemes>site ext</schemes>
>   +
>            <input-module name="site">
>              <input-module name="linkmap">
>                <file src="{src}" reloadable="false" />
>   @@ -78,13 +81,8 @@
>          <map:matcher name="regexp" 
> src="org.apache.cocoon.matching.RegexpURIMatcher"/>
>        </map:matchers>
>
>   -    <map:actions>
>   -      <map:action logger="sitemap.action.resource-exists" 
> name="resource-exists" src="org.apache.cocoon.acting.ResourceExistsAction"/>
>   -    </map:actions>
>   -
>   -    <map:selectors default="exists">
>   -      <map:selector logger="sitemap.selector.exists" name="exists"
>   -        src="org.apache.cocoon.selection.ResourceExistsSelector" />
>   +    <map:selectors>
>   +      <map:selector logger="sitemap.selector.exists" name="exists" 
> src="org.apache.cocoon.selection.ResourceExistsSelector" />
>        </map:selectors>
>
>        <map:pipes default="caching">
>   @@ -115,6 +113,7 @@
>            <map:parameter name="isfaq" value="{notoc}"/>
>            <map:parameter name="nopdf" value="{nopdf}"/>
>            <map:parameter name="path" value="{path}"/>
>   +        <map:parameter name="obfuscate-mail-links" value="false"/>
>            <!-- Can set an alternative project skinconfig here
>            <map:parameter name="config-file" 
> value="../../../../skinconf.xml"/>
>            -->
>   @@ -131,91 +130,60 @@
>        <map:pipeline internal-only="false">
>
>          <!-- 
> ============================================================ -->
>   -      <!-- OUTPUT 
> FORMATS                                               -->
>   -      <!--                  Serves content directly to the 
> user         -->
>   -      <!-- 
> +==========================================================+ -->
>   +      <!-- SOURCE 
> FORMATS                                               -->
>   +      <!--                 Raw XML sources, typically doc-v11 
> format    -->
>   +      <!-- 
> ============================================================ -->
>
>   -      <!-- COCOON SPECIFIC -->
>   -      <map:match pattern="**.txt">
>   -        <!-- Handle .txt files (incorrectly) placed in xdocs.  Forrest 
> will
>   -        eventually evolve to handle mixed-content scenarios  (JT) -->
>   -        <map:read src="content/xdocs/{0}" mime-type="text/plain"/>
>   +      <map:match pattern="changes.xml">
>   +        <map:mount uri-prefix="" src="status.xmap" check-reload="yes" />
>          </map:match>
>   -      <!-- /COCOON SPECIFIC -->
>
>   -       <map:match type="regexp" pattern="^.+$">
>   -        <map:select type="exists">
>   -          <map:when test="content/{0}">
>   -            <map:mount uri-prefix="" src="raw.xmap" check-reload="yes" />
>   -          </map:when>
>   -        </map:select>
>   +      <map:match pattern="todo.xml">
>   +        <map:mount uri-prefix="" src="status.xmap" check-reload="yes" />
>          </map:match>
>
>   -      <map:match pattern="*.html">
>   -        <map:aggregate element="site">
>   -          <map:part src="cocoon:/tab-{1}.xml"/>
>   -          <map:part src="cocoon:/menu-{1}.xml"/>
>   -          <map:part src="cocoon:/body-{1}.xml"/>
>   -        </map:aggregate>
>   -        <map:call resource="skinit">
>   -          <map:parameter name="type" value="site2xhtml"/>
>   -          <map:parameter name="path" value="{0}"/>
>   -        </map:call>
>   -      </map:match>
>   -
>   -      <map:match pattern="**/*.html">
>   -        <map:aggregate element="site">
>   -          <map:part src="cocoon:/{1}/tab-{2}.xml"/>
>   -          <map:part src="cocoon:/{1}/menu-{2}.xml"/>
>   -          <map:part src="cocoon:/{1}/body-{2}.xml"/>
>   -        </map:aggregate>
>   -        <map:call resource="skinit">
>   -          <map:parameter name="type" value="site2xhtml"/>
>   -          <map:parameter name="path" value="{0}"/>
>   -        </map:call>
>   +      <map:match pattern="**dtdx.xml">
>   +        <map:mount uri-prefix="" src="dtd.xmap" check-reload="yes" />
>          </map:match>
>
>   +      <map:match pattern="**linkmap*">
>   +        <map:mount uri-prefix="" src="linkmap.xmap" check-reload="yes" />
>   +      </map:match>
>
>   -      <!-- Special matcher for FAQ PDFs, so we can pass an extra
>   -      'numbersections' param into document2fo.xsl -->
>   -      <map:match pattern="**faq.pdf">
>   -        <map:generate src="cocoon:/{1}faq.xml"/>
>   -        <map:transform src="skins/{forrest:skin}/xslt/fo/document2fo.xsl">
>   -          <map:parameter name="numbersections" value="false"/>
>   -          <map:parameter name="ctxbasedir" value="{realpath:.}/"/>
>   -          <map:parameter name="xmlbasedir" value="content/xdocs/{1}"/>
>   -        </map:transform>
>   -        <map:serialize type="fo2pdf"/>
>   +      <map:match pattern="**menulinks*">
>   +        <map:mount uri-prefix="" src="linkmap.xmap" check-reload="yes" />
>          </map:match>
>
>   -      <map:match type="regexp" pattern="^(.*?)([^/]*).pdf$">
>   -        <map:generate src="cocoon:/{1}{2}.xml"/>
>   -        <map:transform src="skins/{forrest:skin}/xslt/fo/document2fo.xsl">
>   -          <map:parameter name="ctxbasedir" value="{realpath:.}/"/>
>   -          <map:parameter name="xmlbasedir" value="content/xdocs/{1}"/>
>   -        </map:transform>
>   -        <map:serialize type="fo2pdf"/>
>   +      <map:match pattern="**issues.xml">
>   +        <map:mount uri-prefix="" src="issues.xmap" check-reload="yes" />
>          </map:match>
>
>   -      <map:match pattern="**changes.rss">
>   -        <map:mount uri-prefix="" src="status.xmap" check-reload="yes" />
>   +      <!-- COCOON SPECIFIC -->
>   +      <map:match pattern="faq/**.xml">
>   +        <map:mount uri-prefix="" src="faq.xmap" check-reload="yes" />
>          </map:match>
>   +      <!-- /COCOON SPECIFIC -->
>
>   -      <map:match pattern="profiler">
>   -        <map:mount uri-prefix="" src="profiler.xmap" check-reload="yes" />
>   +      <map:match pattern="**faq.xml">
>   +        <map:mount uri-prefix="" src="faq.xmap" check-reload="yes" />
>          </map:match>
>   -      <map:match pattern="**.js">
>   -        <map:mount uri-prefix="" src="static.xmap" check-reload="yes" />
>   +
>   +      <map:match pattern="community/**index.xml">
>   +        <map:mount uri-prefix="" src="forrest.xmap" check-reload="yes" />
>          </map:match>
>   -      <map:match pattern="**.css">
>   -        <map:mount uri-prefix="" src="static.xmap" check-reload="yes" />
>   +
>   +      <map:match pattern="community/*/**.xml">
>   +        <map:mount uri-prefix="" src="revisions.xmap" 
> check-reload="yes" />
>          </map:match>
>   -      <map:match pattern="**images**">
>   -        <map:mount uri-prefix="" src="static.xmap" check-reload="yes" />
>   +
>   +      <map:match pattern="site.xml">
>   +        <map:mount uri-prefix="" src="aggregate.xmap" 
> check-reload="yes" />
>          </map:match>
>   -     <map:match pattern="**favicon.ico">
>   -        <map:mount uri-prefix="" src="static.xmap" check-reload="yes" />
>   +
>   +      <map:match pattern="**.xml">
>   +        <map:mount uri-prefix="" src="forrest.xmap" check-reload="yes" />
>          </map:match>
>   +
>        </map:pipeline>
>
>
>   @@ -226,41 +194,37 @@
>        <!-- ============================================================ -->
>        <map:pipeline internal-only="false">
>
>   -      <!-- External matches -->
>   -      <!-- (HTML rendered directly from special formats) -->
>   -
>          <!-- COCOON SPECIFIC -->
>   -      <map:match pattern="faq/**body-*.xml">
>   +      <map:match pattern="faq/**body-*.html">
>            <map:mount uri-prefix="" src="faq.xmap" check-reload="yes" />
>          </map:match>
>          <!-- /COCOON SPECIFIC -->
>
>   -      <map:match pattern="**body-faq.xml">
>   +
>   +      <!-- External matches -->
>   +      <!-- (HTML rendered directly from special formats) -->
>   +      <map:match pattern="**body-faq.html">
>            <map:mount uri-prefix="" src="faq.xmap" check-reload="yes" />
>          </map:match>
>
>   -      <map:match pattern="**body-*.xml">
>   -        <map:act type="resource-exists">
>   -          <map:parameter name="url" value="content/xdocs/{1}{2}.ehtml" />
>   -          <map:generate src="content/xdocs/{../1}{../2}.ehtml" />
>   -          <map:transform src="resources/stylesheets/html2htmlbody.xsl" />
>   -          <map:transform type="linkrewriter" src="cocoon:/{1}linkmap">
>   -            <map:parameter name="link-attrs" value="href src"/>
>   -            <map:parameter name="schemes" value="site ext"/>
>   -          </map:transform>
>   -          <map:serialize type="xml" />
>   -        </map:act>
>   +      <map:match pattern="**body-*.html">
>   +        <map:select type="exists">
>   +          <map:when test="content/xdocs/{1}{2}.ehtml">
>   +            <map:generate src="content/xdocs/{1}{2}.ehtml" />
>   +            <map:transform 
> src="resources/stylesheets/html2htmlbody.xsl" />
>   +            <map:transform type="linkrewriter" 
> src="cocoon:/{1}linkmap-{2}.html"/>
>   +            <map:serialize type="xml" />
>   +          </map:when>
>   +        </map:select>
>          </map:match>
>
>          <!-- Default matches -->
>          <!-- (HTML rendered from doc-v11 intermediate format -->
>   -      <map:match pattern="**body-*.xml">
>   +      <map:match pattern="**body-*.html">
>            <map:generate src="cocoon:/{1}{2}.xml"/>
>   +        <map:transform type="idgen"/>
>            <map:transform type="xinclude"/>
>   -        <map:transform type="linkrewriter" src="cocoon:/{1}linkmap">
>   -          <map:parameter name="link-attrs" value="href src"/>
>   -          <map:parameter name="schemes" value="site ext"/>
>   -        </map:transform>
>   +        <map:transform type="linkrewriter" 
> src="cocoon:/{1}linkmap-{2}.html"/>
>            <map:call resource="skinit">
>              <map:parameter name="type" value="document2html"/>
>              <map:parameter name="path" value="/{1}{2}.xml"/>
>   @@ -268,86 +232,130 @@
>            </map:call>
>          </map:match>
>
>   -      <map:match pattern="**menu-*.xml">
>   -        <map:generate src="cocoon:/{1}book.xml"/>
>   -        <map:transform type="linkrewriter" src="cocoon:/{1}linkmap">
>   -          <map:parameter name="schemes" value="site ext"/>
>   -        </map:transform>
>   +      <map:match pattern="**menu-*.html">
>   +        <map:generate src="cocoon:/{1}book-{2}.html"/>
>   +        <map:transform type="linkrewriter" 
> src="cocoon:/{1}linkmap-{2}.html"/>
>            <map:call resource="skinit">
>              <map:parameter name="type" value="book2menu"/>
>              <map:parameter name="path" value="/{1}{2}.xml"/>
>            </map:call>
>          </map:match>
>
>   -      <map:match pattern="**tab-*.xml">
>   -        <map:generate src="cocoon:/{1}tab.xml" />
>   -        <map:transform type="linkrewriter" src="cocoon:/{1}linkmap">
>   -          <map:parameter name="schemes" value="site ext"/>
>   -        </map:transform>
>   +      <map:match pattern="**tab-*.html">
>   +        <map:generate src="content/xdocs/tabs.xml" />
>   +        <map:transform type="linkrewriter" 
> src="cocoon:/{1}linkmap-{2}.html"/>
>            <map:call resource="skinit">
>              <map:parameter name="type" value="tab2menu"/>
>              <map:parameter name="path" value="{1}{2}"/>
>            </map:call>
>          </map:match>
>   -    </map:pipeline>
>
>   -    <!-- ============================================================ -->
>   -    <!-- SOURCE FORMATS                                               -->
>   -    <!--                 Raw XML sources, typically doc-v11 format    -->
>   -    <!-- ============================================================ -->
>   -    <map:pipeline internal-only="false">
>   -
>   -      <map:match pattern="**book.xml">
>   +      <map:match pattern="**book-*.html">
>            <map:mount uri-prefix="" src="navigation.xmap" 
> check-reload="yes" />
>          </map:match>
>
>   -      <map:match pattern="**tab.xml">
>   -        <map:mount uri-prefix="" src="navigation.xmap" 
> check-reload="yes" />
>   -      </map:match>
>
>   -      <map:match pattern="changes.xml">
>   -        <map:mount uri-prefix="" src="status.xmap" check-reload="yes" />
>   -      </map:match>
>
>   -      <map:match pattern="todo.xml">
>   -        <map:mount uri-prefix="" src="status.xmap" check-reload="yes" />
>   -      </map:match>
>
>   -      <map:match pattern="**dtdx.xml">
>   -        <map:mount uri-prefix="" src="dtd.xmap" check-reload="yes" />
>   -      </map:match>
>   +    </map:pipeline>
>
>   -      <map:match pattern="**linkmap**">
>   -        <map:mount uri-prefix="" src="linkmap.xmap" check-reload="yes" />
>   -      </map:match>
>
>   -      <map:match pattern="**issues.xml">
>   -        <map:mount uri-prefix="" src="issues.xmap" check-reload="yes" />
>   -      </map:match>
>   +    <map:pipeline internal-only="false">
>   +
>   +      <!-- 
> ============================================================ -->
>   +      <!-- OUTPUT 
> FORMATS                                               -->
>   +      <!--                  Serves content directly to the 
> user         -->
>   +      <!-- 
> +==========================================================+ -->
>
>          <!-- COCOON SPECIFIC -->
>   -      <map:match pattern="faq/**.xml">
>   -        <map:mount uri-prefix="" src="faq.xmap" check-reload="yes" />
>   +      <map:match pattern="**.txt">
>   +        <!-- Handle .txt files (incorrectly) placed in xdocs.  Forrest 
> will
>   +        eventually evolve to handle mixed-content scenarios  (JT) -->
>   +        <map:read src="content/xdocs/{0}" mime-type="text/plain"/>
>          </map:match>
>          <!-- /COCOON SPECIFIC -->
>
>   -      <map:match pattern="**faq.xml">
>   -        <map:mount uri-prefix="" src="faq.xmap" check-reload="yes" />
>   +      <map:match type="regexp" pattern="^.+$">
>   +        <map:select type="exists">
>   +          <map:when test="content/{0}">
>   +            <map:mount uri-prefix="" src="raw.xmap" check-reload="yes" />
>   +          </map:when>
>   +        </map:select>
>          </map:match>
>
>   -      <map:match pattern="community/**index.xml">
>   -        <map:mount uri-prefix="" src="forrest.xmap" check-reload="yes" />
>   +      <map:match pattern="*.html">
>   +        <map:aggregate element="site">
>   +          <map:part src="cocoon:/tab-{0}"/>
>   +          <map:part src="cocoon:/menu-{0}"/>
>   +          <map:part src="cocoon:/body-{0}"/>
>   +        </map:aggregate>
>   +        <map:call resource="skinit">
>   +          <map:parameter name="type" value="site2xhtml"/>
>   +          <map:parameter name="path" value="{0}"/>
>   +        </map:call>
>   +      </map:match>
>   +
>   +      <map:match pattern="**/*.html">
>   +        <map:aggregate element="site">
>   +          <map:part src="cocoon:/{1}/tab-{2}.html"/>
>   +          <map:part src="cocoon:/{1}/menu-{2}.html"/>
>   +          <map:part src="cocoon:/{1}/body-{2}.html"/>
>   +        </map:aggregate>
>   +        <map:call resource="skinit">
>   +          <map:parameter name="type" value="site2xhtml"/>
>   +          <map:parameter name="path" value="{0}"/>
>   +        </map:call>
>          </map:match>
>
>   -      <map:match pattern="community/*/**">
>   -        <map:mount uri-prefix="" src="revisions.xmap" 
> check-reload="yes" />
>   +
>   +      <!-- Special matcher for FAQ PDFs, so we can pass an extra
>   +      'numbersections' param into document2fo.xsl -->
>   +      <map:match pattern="**faq.pdf">
>   +        <map:generate src="cocoon:/{1}faq.xml"/>
>   +        <map:transform src="skins/{forrest:skin}/xslt/fo/document2fo.xsl">
>   +          <map:parameter name="numbersections" value="false"/>
>   +          <map:parameter name="ctxbasedir" value="{realpath:.}/"/>
>   +          <map:parameter name="xmlbasedir" value="content/xdocs/{1}"/>
>   +        </map:transform>
>   +        <map:serialize type="fo2pdf"/>
>          </map:match>
>
>   -      <map:match pattern="**.xml">
>   -        <map:mount uri-prefix="" src="forrest.xmap" check-reload="yes" />
>   +      <map:match type="regexp" pattern="^(.*?)([^/]*).pdf$">
>   +        <map:generate src="cocoon:/{1}{2}.xml"/>
>   +        <!--
>   +        <map:transform type="idgen"/>
>   +        -->
>   +        <map:transform type="xinclude"/>
>   +        <map:transform type="linkrewriter" 
> src="cocoon://{1}linkmap-{2}.pdf"/>
>   +        <map:transform src="skins/{forrest:skin}/xslt/fo/document2fo.xsl">
>   +          <map:parameter name="ctxbasedir" value="{realpath:.}/"/>
>   +          <map:parameter name="xmlbasedir" value="content/xdocs/{1}"/>
>   +        </map:transform>
>   +        <map:serialize type="fo2pdf"/>
>          </map:match>
>
>   +      <map:match pattern="**changes.rss">
>   +        <map:mount uri-prefix="" src="status.xmap" check-reload="yes" />
>   +      </map:match>
>   +
>   +      <map:match pattern="profiler">
>   +        <map:mount uri-prefix="" src="profiler.xmap" check-reload="yes" />
>   +      </map:match>
>   +      <map:match pattern="**.js">
>   +        <map:mount uri-prefix="" src="static.xmap" check-reload="yes" />
>   +      </map:match>
>   +      <map:match pattern="**.css">
>   +        <map:mount uri-prefix="" src="static.xmap" check-reload="yes" />
>   +      </map:match>
>   +      <map:match pattern="**images**">
>   +        <map:mount uri-prefix="" src="static.xmap" check-reload="yes" />
>   +      </map:match>
>   +     <map:match pattern="**favicon.ico">
>   +        <map:mount uri-prefix="" src="static.xmap" check-reload="yes" />
>   +      </map:match>
>        </map:pipeline>
>   +
>   +
>
>        <!-- ============================================================ -->
>        <!-- REDIRECTS                                                    -->
>
>
>