You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by je...@apache.org on 2003/06/02 07:40:02 UTC
cvs commit: xml-forrest/src/resources/conf navigation.xmap sitemap.xmap
jefft 2003/06/01 22:40:01
Modified: src/resources/conf navigation.xmap sitemap.xmap
Log:
Roll back.. can't make this change incrementally
Revision Changes Path
1.5 +69 -61 xml-forrest/src/resources/conf/navigation.xmap
Index: navigation.xmap
===================================================================
RCS file: /home/cvs/xml-forrest/src/resources/conf/navigation.xmap,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- navigation.xmap 2 Jun 2003 05:27:58 -0000 1.4
+++ navigation.xmap 2 Jun 2003 05:40:01 -0000 1.5
@@ -1,61 +1,69 @@
-<?xml version="1.0"?>
-
-<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <map:components>
- <map:generators default="file"/>
- <map:serializers default="html"/>
- <map:transformers default="xslt"/>
- <map:readers default="resource"/>
- <map:matchers default="wildcard"/>
- <map:selectors default="browser"/>
- </map:components>
-
- <map:resources>
-
- <map:resource name="book">
- <map:act type="resource-exists">
- <!-- If a hand-created book.xml exists, use it -->
- <map:parameter name="url" value="content/xdocs/{dir}book.xml" />
- <map:generate src="content/xdocs/{../dir}book.xml" />
- <map:serialize type="xml"/>
- </map:act>
-
- <!-- If no book.xml, generate it from the linkmap. -->
- <map:generate src="cocoon://{dir}linkmap/{path}" />
- <!-- The above generates the subset of the linkmap relevant to our directory. -->
- <map:transform src="resources/stylesheets/site2book.xsl" />
- <map:serialize type="xml"/>
- </map:resource>
- </map:resources>
-
- <map:pipelines>
- <map:pipeline>
-
- <map:match pattern="**/book-*.xml">
- <map:call resource="book">
- <map:parameter name="dir" value="{1}/" />
- <map:parameter name="path" value="{1}/{2}" />
- </map:call>
- </map:match>
-
- <map:match pattern="book-*.xml">
- <map:call resource="book">
- <map:parameter name="dir" value="" />
- <map:parameter name="path" value="{1}" />
- </map:call>
- </map:match>
-
- <map:match pattern="**/tab.xml">
- <map:generate src="content/xdocs/tabs.xml" />
- <map:serialize type="xml"/>
- </map:match>
-
- <map:match pattern="tab.xml">
- <map:generate src="content/xdocs/tabs.xml" />
- <map:serialize type="xml"/>
- </map:match>
-
- </map:pipeline>
-
- </map:pipelines>
-</map:sitemap>
+Index: navigation.xmap
+===================================================================
+RCS file: /home/cvs/xml-forrest/src/resources/conf/navigation.xmap,v
+retrieving revision 1.3
+diff -p -r1.3 navigation.xmap
+*** navigation.xmap 27 Mar 2003 12:35:15 -0000 1.3
+--- navigation.xmap 2 Jun 2003 05:38:00 -0000
+***************
+*** 1,59 ****
+- <?xml version="1.0"?>
+-
+- <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+- <map:components>
+- <map:generators default="file"/>
+- <map:serializers default="html"/>
+- <map:transformers default="xslt"/>
+- <map:readers default="resource"/>
+- <map:matchers default="wildcard"/>
+- <map:selectors default="browser"/>
+- </map:components>
+-
+- <map:resources>
+-
+- <map:resource name="book">
+- <map:act type="resource-exists">
+- <!-- If a hand-created book.xml exists, use it -->
+- <map:parameter name="url" value="content/xdocs/{dir}book.xml" />
+- <map:generate src="content/xdocs/{../dir}book.xml" />
+- <map:serialize type="xml"/>
+- </map:act>
+-
+- <!-- If no book.xml, generate it from the linkmap. -->
+- <map:generate src="cocoon://{dir}linkmap/{dir}" />
+- <!-- The above generates the subset of the linkmap relevant to our directory. -->
+- <map:transform src="resources/stylesheets/site2book.xsl" />
+- <map:serialize type="xml"/>
+- </map:resource>
+- </map:resources>
+-
+- <map:pipelines>
+- <map:pipeline>
+-
+- <map:match pattern="**/book.xml">
+- <map:call resource="book">
+- <map:parameter name="dir" value="{1}/" />
+- </map:call>
+- </map:match>
+-
+- <map:match pattern="book.xml">
+- <map:call resource="book">
+- <map:parameter name="dir" value="" />
+- </map:call>
+- </map:match>
+-
+- <map:match pattern="**/tab.xml">
+- <map:generate src="content/xdocs/tabs.xml" />
+- <map:serialize type="xml"/>
+- </map:match>
+-
+- <map:match pattern="tab.xml">
+- <map:generate src="content/xdocs/tabs.xml" />
+- <map:serialize type="xml"/>
+- </map:match>
+-
+- </map:pipeline>
+-
+- </map:pipelines>
+- </map:sitemap>
+--- 0 ----
1.99 +2 -2 xml-forrest/src/resources/conf/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-forrest/src/resources/conf/sitemap.xmap,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- sitemap.xmap 2 Jun 2003 05:27:58 -0000 1.98
+++ sitemap.xmap 2 Jun 2003 05:40:01 -0000 1.99
@@ -249,7 +249,7 @@
</map:match>
<map:match pattern="**menu-*.xml">
- <map:generate src="cocoon:/{1}book-{2}.xml"/>
+ <map:generate src="cocoon:/{1}book.xml"/>
<map:transform type="linkrewriter" src="cocoon:/{1}linkmap">
<map:parameter name="schemes" value="site ext"/>
</map:transform>
@@ -277,7 +277,7 @@
<!-- ============================================================ -->
<map:pipeline internal-only="false">
- <map:match pattern="**book-*.xml">
+ <map:match pattern="**book.xml">
<map:mount uri-prefix="" src="navigation.xmap" check-reload="yes" />
</map:match>