You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by rg...@apache.org on 2005/06/05 03:25:56 UTC
svn commit: r180045 - in
/forrest/branches/locationmap_branch/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy:
input.xmap resources/stylesheets/repoRequest2doc.xsl
src/documentation/content/locationmap.xml
src/documentation/content/xdocs/index.xml
Author: rgardler
Date: Sat Jun 4 18:25:55 2005
New Revision: 180045
URL: http://svn.apache.org/viewcvs?rev=180045&view=rev
Log:
use locationmap rather than request parameters to identify source locations.
Added:
forrest/branches/locationmap_branch/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/locationmap.xml (with props)
Removed:
forrest/branches/locationmap_branch/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/repoRequest2doc.xsl
Modified:
forrest/branches/locationmap_branch/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap
forrest/branches/locationmap_branch/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/index.xml
Modified: forrest/branches/locationmap_branch/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap
URL: http://svn.apache.org/viewcvs/forrest/branches/locationmap_branch/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap?rev=180045&r1=180044&r2=180045&view=diff
==============================================================================
--- forrest/branches/locationmap_branch/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap (original)
+++ forrest/branches/locationmap_branch/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap Sat Jun 4 18:25:55 2005
@@ -35,66 +35,22 @@
<!-- ============================================================== -->
<!-- Repository pipeline -->
<!-- ============================================================== -->
- <map:pipeline>
- <map:match
- pattern="do/getRepositoryData/daisy/*/port/*/collection/*/doc/**.source.xml">
- <map:generate type="html" src="http://{1}:{2}/{3}/{4}?navigationType=none" />
- <map:serialize type="xml" />
- </map:match>
-
- <map:match
- pattern="do/getRepositoryData/daisy/*/port/*/collection/*/doc/**.xml">
- <map:generate type="html" src="http://{1}:{2}/{3}/{4}?navigationType=none" />
- <map:transform src="{project:resources.stylesheets}/daisy/preFilter.xsl"/>
- <map:transform src="{forrest:stylesheets}/html2document.xsl" />
- <map:transform src="{project:resources.stylesheets}/daisy/postFilter.xsl"/>
- <map:serialize type="xml" />
- </map:match>
-
- <map:match
- pattern="do/getRepositoryData/daisy/**/collection/*/doc/**.source.xml">
- <map:generate type="html" src="http://{1}/{2}/{3}?navigationType=none" />
- <map:serialize type="xml" />
- </map:match>
-
- <map:match
- pattern="do/getRepositoryData/daisy/**/collection/*/doc/**.xml">
- <map:generate type="html" src="http://{1}/{2}/{3}?navigationType=none" />
- <map:transform src="{project:resources.stylesheets}/daisy/preFilter.xsl"/>
- <map:transform src="{forrest:stylesheets}/html2document.xsl" />
- <map:transform src="{project:resources.stylesheets}/daisy/postFilter.xsl"/>
- <map:serialize type="xml" />
- </map:match>
- </map:pipeline>
-
- <map:pipeline>
- <map:match pattern="*.xml">
- <map:select type="request-parameter">
- <map:parameter name="parameter-name" value="repositoryType"/>
- <map:when test="daisy-wiki">
- <map:generate type="request"/>
- <map:transform src="resources/stylesheets/repoRequest2doc.xsl">
- <map:parameter name="localURL" value="{1}.xml"/>
- </map:transform>
- <map:serialize type="xml" />
+ <map:pipeline>
+ <map:match pattern="daisy/**.xml">
+ <map:generate type="html" src="{lm:{0}}" />
+ <map:select type="exists">
+ <map:when test="{project:resources.stylesheets}/daisy/preFilter.xsl">
+ <map:transform src="{project:resources.stylesheets}/daisy/preFilter.xsl"/>
</map:when>
</map:select>
- </map:match>
- </map:pipeline>
-
- <map:pipeline>
- <map:match pattern="**/*.xml">
- <map:select type="request-parameter">
- <map:parameter name="parameter-name" value="repositoryType"/>
- <map:when test="daisy-wiki">
- <map:generate type="request"/>
- <map:transform src="resources/stylesheets/repoRequest2doc.xsl">
- <map:parameter name="localURL" value="{1}/{2}.xml"/>
- </map:transform>
- <map:serialize type="xml" />
+ <map:transform src="{forrest:stylesheets}/html2document.xsl" />
+ <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:match>
+ <map:serialize type="xml"/>
+ </map:match>
</map:pipeline>
</map:pipelines>
</map:sitemap>
Added: forrest/branches/locationmap_branch/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/locationmap.xml
URL: http://svn.apache.org/viewcvs/forrest/branches/locationmap_branch/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/locationmap.xml?rev=180045&view=auto
==============================================================================
--- forrest/branches/locationmap_branch/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/locationmap.xml (added)
+++ forrest/branches/locationmap_branch/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/locationmap.xml Sat Jun 4 18:25:55 2005
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2002-2004 The Apache Software Foundation or its licensors,
+ as applicable.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<locationmap xmlns="http://apache.org/forrest/locationmap/1.0">
+
+ <components>
+ <matchers default="lm">
+ <matcher
+ name="lm"
+ src="org.apache.forrest.locationmap.WildcardLocationMapHintMatcher"/>
+ </matchers>
+ </components>
+
+ <locator>
+ <match pattern="daisy/**.xml">
+ <location src="http://www.cocoondev.org/daisy/{1}.html?navigationType=none" />
+ </match>
+ </locator>
+</locationmap>
Propchange: forrest/branches/locationmap_branch/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/locationmap.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: forrest/branches/locationmap_branch/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/forrest/branches/locationmap_branch/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/index.xml?rev=180045&r1=180044&r2=180045&view=diff
==============================================================================
--- forrest/branches/locationmap_branch/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/index.xml (original)
+++ forrest/branches/locationmap_branch/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/index.xml Sat Jun 4 18:25:55 2005
@@ -130,10 +130,6 @@
instead of processing the HTML produced by Daisy we will process
the the XML. Use with care in the meantime.</warning>
- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0">
-
-
<section>
<title>Example</title>
<p>To filter out the document heading of the Daisy
@@ -190,13 +186,14 @@
to extend this stylesheet accordingly.</p>
</section>
</section>
-
- <section>
- <title>Examples</title>
- <ul>
- <li><a href="daisy/index.html?repositoryType=daisy-wiki&repositoryURL=www.cocoondev.org&repositoryCollection=daisy&documentID=index">Daisy Home Page</a> (retrieved live, you must be online)</li>
- </ul>
- </section>
</section>
+ </section>
+
+ <section>
+ <title>Examples</title>
+ <ul>
+ <li><a href="daisy/index.html">Daisy Home Page</a> (retrieved live, you must be online)</li>
+ </ul>
+ </section>
</body>
</document>