You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by th...@apache.org on 2006/08/15 01:15:08 UTC
svn commit: r431464 - in /cocoon/whiteboard/daisy-to-docs/src/documentation:
locationmap-daisy-include.xml sitemap.xmap
Author: thorsten
Date: Mon Aug 14 16:15:08 2006
New Revision: 431464
URL: http://svn.apache.org/viewvc?rev=431464&view=rev
Log:
FOR-920 Merging the defaults and project modules to the new properties module. You need to use it like {properties:forrest.home}, please refer to the forrest documentation for more detail. I updated now the custom code of the cocoon staging docu (forrest-docs).
Modified:
cocoon/whiteboard/daisy-to-docs/src/documentation/locationmap-daisy-include.xml
cocoon/whiteboard/daisy-to-docs/src/documentation/sitemap.xmap
Modified: cocoon/whiteboard/daisy-to-docs/src/documentation/locationmap-daisy-include.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/daisy-to-docs/src/documentation/locationmap-daisy-include.xml?rev=431464&r1=431463&r2=431464&view=diff
==============================================================================
--- cocoon/whiteboard/daisy-to-docs/src/documentation/locationmap-daisy-include.xml (original)
+++ cocoon/whiteboard/daisy-to-docs/src/documentation/locationmap-daisy-include.xml Mon Aug 14 16:15:08 2006
@@ -1,6 +1,6 @@
<locationmapInclude>
<match pattern="project.index.xml">
- <location src="cocoon://{project:daisy.index.docID}.daisy.xml" />
+ <location src="cocoon://{properties:daisy.index.docID}.daisy.xml" />
</match>
<match pattern="project.status">
Modified: cocoon/whiteboard/daisy-to-docs/src/documentation/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/daisy-to-docs/src/documentation/sitemap.xmap?rev=431464&r1=431463&r2=431464&view=diff
==============================================================================
--- cocoon/whiteboard/daisy-to-docs/src/documentation/sitemap.xmap (original)
+++ cocoon/whiteboard/daisy-to-docs/src/documentation/sitemap.xmap Mon Aug 14 16:15:08 2006
@@ -21,20 +21,20 @@
<map:parameter name="expires" value="access plus 2 hours"/>
<map:match pattern="locationmap-project.xml">
- <map:generate src="cocoon://daisy.navigation.{project:daisy.navigation.docID}"/>
- <map:transform src="{forrest:plugins}/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-locationmap.xsl">
- <map:parameter name="publisherURL" value="{project:daisy.publisher.URL}"/>
- <map:parameter name="pathPrefix" value="{project:daisy.pathPrefix}"/>
- <map:parameter name="navigationID" value="{project:daisy.navigation.docID}"/>
+ <map:generate src="cocoon://daisy.navigation.{properties:daisy.navigation.docID}"/>
+ <map:transform src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-locationmap.xsl">
+ <map:parameter name="publisherURL" value="{properties:daisy.publisher.URL}"/>
+ <map:parameter name="pathPrefix" value="{properties:daisy.pathPrefix}"/>
+ <map:parameter name="navigationID" value="{properties:daisy.navigation.docID}"/>
</map:transform>
<map:transform type="xinclude"/>
<map:serialize type="xml"/>
</map:match>
<map:match pattern="daisy.navigation.*">
- <map:generate src="{project:daisy.publisher.URL}blob?documentId={1}&version=live&partType=1"/>
- <map:transform src="{forrest:plugins}/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-includes.xsl">
- <map:parameter name="publisherURL" value="{project:daisy.publisher.URL}"/>
+ <map:generate src="{properties:daisy.publisher.URL}blob?documentId={1}&version=live&partType=1"/>
+ <map:transform src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-includes.xsl">
+ <map:parameter name="publisherURL" value="{properties:daisy.publisher.URL}"/>
</map:transform>
<map:transform type="xinclude"/>
<map:serialize type="xml" />