cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgard...@apache.org
Subject svn commit: r357095 - in /cocoon/whiteboard/daisy-to-docs: forrest.properties.xml src/documentation/resources/stylesheets/daisy/navigation-to-locationmap.xsl src/documentation/sitemap.xmap
Date Fri, 16 Dec 2005 00:29:37 GMT
Author: rgardler
Date: Thu Dec 15 16:29:26 2005
New Revision: 357095

URL: http://svn.apache.org/viewcvs?rev=357095&view=rev
Log:
update for latest Daisy plugin

Removed:
    cocoon/whiteboard/daisy-to-docs/src/documentation/resources/stylesheets/daisy/navigation-to-locationmap.xsl
Modified:
    cocoon/whiteboard/daisy-to-docs/forrest.properties.xml
    cocoon/whiteboard/daisy-to-docs/src/documentation/sitemap.xmap

Modified: cocoon/whiteboard/daisy-to-docs/forrest.properties.xml
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/daisy-to-docs/forrest.properties.xml?rev=357095&r1=357094&r2=357095&view=diff
==============================================================================
--- cocoon/whiteboard/daisy-to-docs/forrest.properties.xml (original)
+++ cocoon/whiteboard/daisy-to-docs/forrest.properties.xml Thu Dec 15 16:29:26 2005
@@ -1,5 +1,13 @@
 <?cml version="1.0" encoding="UTF-8"?>
 <properties>
+  
+  <!-- Daisy plugin properties -->
+  <property name="daisy.navigation.docID" value="655"/>
+  <property name="daisy.index.docID" value="653"/>
+  <property name="daisy.publisher.URL" value="http://publish:publish@cocoon.zones.apache.org:9263/publisher/"/>
+  <property name="daisy.pathPrefix" value="2.1/"/>
+   <property name="daisy.fileExt" value=""/>
+       
   <!-- A comma separated list defining the way actions are sorted in the changes file.
        none = no sorting, will be listed in chronological order
        type = group by the type attribute -->

Modified: cocoon/whiteboard/daisy-to-docs/src/documentation/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/daisy-to-docs/src/documentation/sitemap.xmap?rev=357095&r1=357094&r2=357095&view=diff
==============================================================================
--- cocoon/whiteboard/daisy-to-docs/src/documentation/sitemap.xmap (original)
+++ cocoon/whiteboard/daisy-to-docs/src/documentation/sitemap.xmap Thu Dec 15 16:29:26 2005
@@ -21,88 +21,25 @@
       <map:parameter name="expires" value="access plus 2 hours"/>
       
       <map:match pattern="locationmap-project.xml">
-        <map:generate src="cocoon:/daisy.navigation.655"/>
-        <map:transform src="{project:resources.stylesheets}/daisy/navigation-to-locationmap.xsl">
-          <map:parameter name="publisherURL" value="http://publish:publish@cocoon.zones.apache.org:9263/publisher/"/>
-          <map:parameter name="pathPrefix" value="2.1/"/>
-          <map:parameter name="indexSource" value="cocoon://2.1/index.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:transform>
+        <map:transform type="xinclude"/>
         <map:serialize type="xml"/>
       </map:match>
-      
+            
       <map:match pattern="daisy.navigation.*">
-        <map:generate src="http://publish:publish@cocoon.zones.apache.org:9263/publisher/blob?documentId={1}&amp;version=live&amp;partType=1"/>
+        <map:generate src="{project:daisy.publisher.URL}blob?documentId={1}&amp;version=live&amp;partType=1"/>
         <map:transform src="{forrest:plugins}/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-includes.xsl">
-          <map:parameter name="publisherURL" value="http://publish:publish@cocoon.zones.apache.org:9263/publisher/"/>
+          <map:parameter name="publisherURL" value="{project:daisy.publisher.URL}"/>
         </map:transform>
         <map:transform type="xinclude"/>
         <map:serialize type="xml" />
       </map:match>   
-      
-      <map:match pattern="daisy.site.*">
-        <map:generate src="http://publish:publish@cocoon.zones.apache.org:9263/publisher/blob?documentId={1}&amp;version=live&amp;partType=1"
/>
-        <map:transform src="{forrest:plugins}/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-siteSnippet.xsl"/>
-        <map:transform type="xinclude"/>
-        <map:serialize type="xml" />
-      </map:match>
     </map:pipeline>
-    
-    <map:pipeline>
-      
-      <!-- The following two matchers are from the projectInfo plugin
-           This is a hack to prevent the Daisy matchers below from intercepting
-           the call to projectInfo, the need for this hack will be removed in a 
-           future version of the Daisy plugin. -->
-      <map:match type="regexp" pattern="^(.*?)([^/]*)changes.xml$">
-        <map:generate type="file" src="{lm:project.status}" />
-        <map:transform src="{forrest:plugins}/org.apache.forrest.plugin.input.projectInfo/resources/stylesheets/changes-to-document.xsl"
>
-          <map:parameter name="bugtracking-url" value="{defaults:bugtracking-url}"/>
-          <map:parameter name="path" value="{1}{2}"/>
-        </map:transform>
-        <map:serialize type="xml-document"/>
-      </map:match>
-
-      <map:match type="regexp" pattern="^(.*?)([^/]*)todo.xml$">
-        <map:generate type="file" src="{lm:project.status}" />
-        <map:transform src="{forrest:plugins}/org.apache.forrest.plugin.input.projectInfo/resources/stylesheets/todo-to-document.xsl"/>
-        <map:serialize type="xml-document"/>
-      </map:match>
 
-      <map:match pattern="2.1/*.xml">
-        <map:aggregate element="daisyDocument">
-          <map:part src="cocoon://2.1/{1}.daisy.source" />
-          <map:part src="cocoon://daisy.site.655" />
-        </map:aggregate>
-        <map:transform src="{forrest:plugins}/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/daisy-to-html.xsl">
-          <map:parameter name="documentPath" value="{0}"/>
-          <map:parameter name="pathPrefix" value="2.1/"/>
-        </map:transform>
-        <map:transform src="{lm:transform.html.document}"/>
-        <map:select type="exists">
-          <map:when test="{project:resources.stylesheets}/daisy/postFilter.xsl">
-            <map:transform src="{project:resources.stylesheets}/daisy/postFilter.xsl"/>
-          </map:when>
-        </map:select>
-        <map:serialize type="xml"/>
-      </map:match>
-
-      <map:match pattern="2.1/**.xml">
-        <map:aggregate element="daisyDocument">
-          <map:part src="cocoon://2.1/{1}.daisy.source" />
-          <map:part src="cocoon://daisy.site.655" />
-        </map:aggregate>
-        <map:transform src="{forrest:plugins}/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/daisy-to-html.xsl">
-          <map:parameter name="documentPath" value="{0}"/>
-          <map:parameter name="pathPrefix" value="2.1/"/>
-        </map:transform>
-        <map:transform src="{lm:transform.html.document}"/>
-        <map:select type="exists">
-          <map:when test="{project:resources.stylesheets}/daisy/postFilter.xsl">
-            <map:transform src="{project:resources.stylesheets}/daisy/postFilter.xsl"/>
-          </map:when>
-        </map:select>
-        <map:serialize type="xml"/>
-      </map:match>
-    </map:pipeline>
   </map:pipelines>
 </map:sitemap>



Mime
View raw message