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 2008/03/29 20:53:50 UTC
svn commit: r642594 - in /lenya/trunk/src:
modules-core/metadata/sitemap.xmap modules/resource/sitemap.xmap
Author: andreas
Date: Sat Mar 29 12:53:49 2008
New Revision: 642594
URL: http://svn.apache.org/viewvc?rev=642594&view=rev
Log:
Adding revision-based pipeline to metadata module, removing corresponding pipeline from resource module, removing unnecessary transformer declaration.
Modified:
lenya/trunk/src/modules-core/metadata/sitemap.xmap
lenya/trunk/src/modules/resource/sitemap.xmap
Modified: lenya/trunk/src/modules-core/metadata/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/metadata/sitemap.xmap?rev=642594&r1=642593&r2=642594&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/metadata/sitemap.xmap (original)
+++ lenya/trunk/src/modules-core/metadata/sitemap.xmap Sat Mar 29 12:53:49 2008
@@ -22,9 +22,15 @@
<map:pipeline type="noncaching">
- <!-- {1:pub-id}/{2:area}/{3:uuid}/{4:language} -->
+ <!-- {1:pubId}/{2:area}/{3:uuid}/{4:language} -->
<map:match pattern="*/*/*/*">
<map:generate type="lenyaMetaData" src="lenya-document:{3},pub={1},area={2},lang={4}"/>
+ <map:serialize type="xml"/>
+ </map:match>
+
+ <!-- {1:pubId}/{2:area}/{3:uuid}/{4:language}/{5:revision} -->
+ <map:match pattern="*/*/*/*/*">
+ <map:generate type="lenyaMetaData" src="lenya-document:{3},pub={1},area={2},lang={4},rev={5}"/>
<map:serialize type="xml"/>
</map:match>
Modified: lenya/trunk/src/modules/resource/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/resource/sitemap.xmap?rev=642594&r1=642593&r2=642594&view=diff
==============================================================================
--- lenya/trunk/src/modules/resource/sitemap.xmap (original)
+++ lenya/trunk/src/modules/resource/sitemap.xmap Sat Mar 29 12:53:49 2008
@@ -21,9 +21,6 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
<map:components>
<map:generators default="file">
- <map:generator label="content" logger="sitemap.generator.directory"
- name="lenyaMetaData" pool-max="16"
- src="org.apache.lenya.modules.metadata.LenyaMetaDataGenerator"/>
<map:generator name="pdf" pool-max="16" src="org.apache.lenya.modules.resource.PdfToTextGenerator"/>
</map:generators>
<map:serializers default="xhtml">
@@ -35,13 +32,6 @@
<map:pipeline>
- <!-- Generates the lenya metadata to be aggregated for each page -->
- <!-- {1:pubId}/{2:area}/{3:uuid}/{4:language}/{5:revision} -->
- <map:match pattern="lenyametadata.xml/*/*/*/*/*">
- <map:generate type="lenyaMetaData" src="lenya-document:{3},pub={1},area={2},lang={4},rev={5}"/>
- <map:serialize type="xml"/>
- </map:match>
-
<!-- {1:pubId}/{2:area}/{3:uuid}/{4:language}/{5:extension} -->
<map:match pattern="lucene-index-content/*/*/*/*.pdf">
<map:generate type="pdf" src="lenya-document:{3},pub={1},area={2},lang={4}"/>
@@ -77,7 +67,7 @@
<!-- {format}.xml/{pubId}/{area}/{uuid}/{language} -->
<map:match pattern="downloadLink.xml/*/*/*/*">
- <map:generate src="cocoon:/lenyametadata.xml/{1}/{2}/{3}/{4}/"/>
+ <map:generate src="cocoon://modules/metadata/{1}/{2}/{3}/{4}"/>
<map:transform src="fallback://lenya/modules/resource/xslt/downloadLink.xsl">
<map:parameter name="contentLength" value="{doc-info:{1}:{2}:{3}:{4}}"/>
<map:parameter name="mimeType" value="{doc-info:{1}:{2}:{3}:{4}}"/>
@@ -90,7 +80,7 @@
<!-- {format}.xml/{pubId}/{area}/{uuid}/{language} -->
<map:match pattern="xhtml.xml/*/*/*/*">
- <map:generate src="cocoon:/lenyametadata.xml/{1}/{2}/{3}/{4}/{request-param:lenya.revision}"/>
+ <map:generate src="cocoon://modules/metadata/{1}/{2}/{3}/{4}/{request-param:lenya.revision}"/>
<map:transform src="fallback://lenya/modules/resource/xslt/resource2xhtml.xsl">
<map:parameter name="document-type" value="{doc-info:{1}:{2}:{3}:{4}:resourceType:{request-param:lenya.revision}}"/>
<map:parameter name="nodeId" value="{doc-info:{1}:{2}:{3}:{4}:nodeName}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org