You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/02/15 13:01:39 UTC
svn commit: r507907 - in /lenya/trunk/src: modules/sitetree/sitemap.xmap
pubs/default/sitemap.xmap
Author: andreas
Date: Thu Feb 15 04:01:38 2007
New Revision: 507907
URL: http://svn.apache.org/viewvc?view=rev&rev=507907
Log:
Don't use input modules when generating navigation elements to allow complete caching
Modified:
lenya/trunk/src/modules/sitetree/sitemap.xmap
lenya/trunk/src/pubs/default/sitemap.xmap
Modified: lenya/trunk/src/modules/sitetree/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sitetree/sitemap.xmap?view=diff&rev=507907&r1=507906&r2=507907
==============================================================================
--- lenya/trunk/src/modules/sitetree/sitemap.xmap (original)
+++ lenya/trunk/src/modules/sitetree/sitemap.xmap Thu Feb 15 04:01:38 2007
@@ -39,18 +39,6 @@
<map:resources>
- <map:resource name="fallback-transformation">
- <map:transform src="fallback://lenya/modules/sitetree/xslt/navigation/{stylesheet}.xsl">
- <map:parameter name="url" value="{url}"/>
- <map:parameter name="root" value="{page-envelope:context-prefix}/{publication-id}/{page-envelope:area}/"/>
- <map:parameter name="area" value="{page-envelope:area}"/>
- <map:parameter name="chosenlanguage" value="{page-envelope:document-language}"/>
- <map:parameter name="defaultlanguage" value="{page-envelope:default-language}"/>
- <map:parameter name="breadcrumbprefix" value="{page-envelope:breadcrumb-prefix}"/>
- </map:transform>
- <map:serialize type="xml"/>
- </map:resource>
-
<map:resource name="i18n">
<map:transform type="i18n">
<map:parameter name="locale" value="{request:locale}"/>
@@ -61,32 +49,35 @@
<map:pipelines>
- <map:pipeline>
-
- <!-- sitetree -->
- <!-- pattern: {pub-id}/{area}/sitetree/{url}.xml -->
- <map:match pattern="*/*/sitetree/**.xml">
- <map:generate src="lenya://lenya/pubs/{1}/content/{2}/sitetree.xml"/>
- <map:transform type="i18n">
- <map:parameter name="locale" value="{request:locale}"/>
- </map:transform>
- <map:call resource="fallback-transformation">
- <map:parameter name="publication-id" value="{1}"/>
- <map:parameter name="url" value="/{3}"/>
- <map:parameter name="stylesheet" value="sitetree2nav"/>
- </map:call>
- </map:match>
+ <map:pipeline type="caching">
+
+ <!-- sitetree -->
+ <!-- pattern: sitetree/{pub-id}/{area}/{default-language}/{language}/{url}.xml -->
+ <map:match pattern="sitetree/*/*/*/*/**.xml">
+ <map:generate src="lenya://lenya/pubs/{1}/content/{2}/sitetree.xml"/>
+ <map:transform src="fallback://lenya/modules/sitetree/xslt/navigation/sitetree2nav.xsl">
+ <map:parameter name="url" value="/{5}"/>
+ <map:parameter name="area" value="{2}"/>
+ <map:parameter name="root" value="{request:contextPath}/{1}/{2}/"/>
+ <map:parameter name="chosenlanguage" value="{4}"/>
+ <map:parameter name="defaultlanguage" value="{3}"/>
+ </map:transform>
+ <map:serialize type="xml"/>
+ </map:match>
- <!-- navigation element -->
- <!-- pattern: {pub-id}/{area}/{nav-element}/{url}.xml -->
- <map:match pattern="*/*/*/**.xml">
- <map:generate src="cocoon:/{1}/{2}/sitetree/{4}.xml"/>
- <map:call resource="fallback-transformation">
- <map:parameter name="publication-id" value="{1}"/>
- <map:parameter name="url" value="/{4}"/>
- <map:parameter name="stylesheet" value="{3}"/>
- </map:call>
- </map:match>
+ <!-- navigation element -->
+ <!-- pattern: {nav-element}/{pub-id}/{area}/{default-language}/{language}/{url}.xml -->
+ <map:match pattern="*/*/*/*/*/**.xml">
+ <map:generate src="cocoon:/sitetree/{2}/{3}/{4}/{5}/{6}.xml"/>
+ <map:transform src="fallback://lenya/modules/sitetree/xslt/navigation/{1}.xsl">
+ <map:parameter name="url" value="/{6}"/>
+ <map:parameter name="area" value="{2}"/>
+ <map:parameter name="root" value="{request:contextPath}/{1}/{2}/"/>
+ <map:parameter name="chosenlanguage" value="{5}"/>
+ <map:parameter name="defaultlanguage" value="{4}"/>
+ </map:transform>
+ <map:serialize type="xml"/>
+ </map:match>
</map:pipeline>
Modified: lenya/trunk/src/pubs/default/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/sitemap.xmap?view=diff&rev=507907&r1=507906&r2=507907
==============================================================================
--- lenya/trunk/src/pubs/default/sitemap.xmap (original)
+++ lenya/trunk/src/pubs/default/sitemap.xmap Thu Feb 15 04:01:38 2007
@@ -102,12 +102,8 @@
<map:redirect-to uri="index.html"/>
</map:match>
</map:pipeline>
-
- <!-- This is the pipeline that builds the page. It aggregates all
- the navigational elements (breadcrumb, tabs, menu) with the actual
- content of the document. -->
- <map:pipeline>
+ <map:pipeline type="caching">
<!-- pattern="meta?docid={docid}&lang={lang}" -->
<map:match pattern="*/**.html.meta">
<map:generate type="lenyaMetaData">
@@ -127,16 +123,34 @@
</map:generate>
<map:serialize type="xml"/>
</map:match>
- <!-- /lenyabody-{rendertype}/{publication-id}/{area}/{doctype}/{url} -->
- <map:match pattern="lenyabody-*/*/*/*/**">
+
+ <!-- navigation/{nav-element}/{pub-id}/{area}/{url} -->
+ <map:match pattern="navigation-element/*/*/*/*/*/**">
+ <map:generate src="cocoon://modules/sitetree/{1}/{2}/{3}/{4}/{5}/{6}.xml"/>
+ <map:serialize type="xml"/>
+ </map:match>
+
+ <!-- /lenyabody-{rendertype}/{publication-id}/{area}/{doctype}/{default-language}/{language}/{url} -->
+ <map:match pattern="lenyabody-raw-*/*/*/*/*/*/**">
<map:aggregate element="cmsbody">
- <map:part src="cocoon://modules/sitetree/{2}/{3}/breadcrumb/{5}.xml"/>
- <map:part src="cocoon://modules/sitetree/{2}/{3}/tabs/{5}.xml"/>
- <map:part src="cocoon://modules/sitetree/{2}/{3}/menu/{5}.xml"/>
- <map:part src="cocoon://modules/sitetree/{2}/{3}/search/{5}.xml"/>
+ <map:part src="cocoon:/navigation-element/breadcrumb/{2}/{3}/{5}/{6}/{7}"/>
+ <map:part src="cocoon:/navigation-element/tabs/{2}/{3}/{5}/{6}/{7}"/>
+ <map:part src="cocoon:/navigation-element/menu/{2}/{3}/{5}/{6}/{7}"/>
+ <map:part src="cocoon:/navigation-element/search/{2}/{3}/{5}/{6}/{7}"/>
<map:part src="cocoon://modules/languageselector/text-none/flagsize-10"/>
<map:part src="{resource-type:format-xhtml}?rendertype={1}"/>
</map:aggregate>
+ <map:serialize type="xml"/>
+ </map:match>
+ </map:pipeline>
+
+ <!-- This is the pipeline that builds the page. It aggregates all
+ the navigational elements (breadcrumb, tabs, menu) with the actual
+ content of the document. -->
+ <map:pipeline type="noncaching">
+ <!-- /lenyabody-{rendertype}/{publication-id}/{area}/{doctype}/{url} -->
+ <map:match pattern="lenyabody-*/*/*/*/**">
+ <map:generate src="cocoon:/lenyabody-raw-{1}/{2}/{3}/{page-envelope:default-language}/{page-envelope:document-language}/{4}/{5}"/>
<map:transform type="link-rewrite"/>
<map:transform src="fallback://lenya/modules/svg/xslt/image2svg.xsl"/>
<map:select type="resource-exists">
@@ -148,13 +162,13 @@
<map:parameter name="area" value="{3}"/>
<map:parameter name="url" value="{5}"/>
<map:parameter name="document-path" value="{page-envelope:document-path}"/>
- <map:parameter name="document-type" value="{page-envelope:document-type}"/>
+ <map:parameter name="document-type" value="{4}"/>
<map:parameter name="language" value="{page-envelope:document-language}"/>
<map:parameter name="contextprefix" value="{request:contextPath}"/>
<map:parameter name="title" value="{dublincore:title}"/>
<map:parameter name="lastPublishedUser" value="{access-control:user-name:{workflow:lastUser.publish}}"/>
<map:parameter name="lastPublishedDate" value="{workflow:lastDate.publish}"/>
- <!--Following is a show off to explain lenya.properties.xml -->
+ <!-- Following is a show off to explain lenya.properties.xml -->
<map:parameter name="author" value="{properties:pubs.default.author}"/>
<map:parameter name="nodeName" value="{page-envelope:document-name}"/>
</map:transform>
@@ -166,13 +180,13 @@
<map:parameter name="area" value="{3}"/>
<map:parameter name="url" value="{5}"/>
<map:parameter name="document-path" value="{page-envelope:document-path}"/>
- <map:parameter name="document-type" value="{page-envelope:document-type}"/>
+ <map:parameter name="document-type" value="{4}"/>
<map:parameter name="language" value="{page-envelope:document-language}"/>
<map:parameter name="contextprefix" value="{request:contextPath}"/>
<map:parameter name="title" value="{dublincore:title}"/>
<map:parameter name="lastPublishedUser" value="{access-control:user-name:{workflow:lastUser.publish}}"/>
<map:parameter name="lastPublishedDate" value="{workflow:lastDate.publish}"/>
- <!--Following is a show off to explain lenya.properties.xml -->
+ <!-- Following is a show off to explain lenya.properties.xml -->
<map:parameter name="author" value="{properties:pubs.default.author}"/>
<map:parameter name="nodeName" value="{page-envelope:document-name}"/>
</map:transform>
@@ -248,7 +262,7 @@
<map:otherwise>
<map:generate src="cocoon:/lenyabody-view/{page-envelope:publication-id}/{page-envelope:area}/{page-envelope:document-type}{page-envelope:document-url}"/>
</map:otherwise>
- </map:select>
+ </map:select>
<map:select type="browser">
<map:when test="mozilla5DISABLED">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org