bruno 2003/06/07 14:20:14
Modified: src/webapp/samples/xinclude samples.xml sitemap.xmap
Added: src/webapp/samples/xinclude/content xmlbase.xml
Log:
Added xml:base sample.
Revision Changes Path
1.2 +1 -0 cocoon-2.1/src/webapp/samples/xinclude/samples.xml
Index: samples.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/xinclude/samples.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- samples.xml 20 May 2003 12:02:50 -0000 1.1
+++ samples.xml 7 Jun 2003 21:20:14 -0000 1.2
@@ -7,6 +7,7 @@
<group name="XInclude Samples">
<sample name="General" href="test.html">Demonstration of various XInclude and
XPointer features.</sample>
+ <sample name="XML Base" href="xmlbase.html">Demonstration of xml:base
support.</sample>
<sample name="Loop inclusion" href="loopinclusion.html">Example of a loop
inclusion. This will show an error page.</sample>
</group>
1.2 +5 -9 cocoon-2.1/src/webapp/samples/xinclude/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/xinclude/sitemap.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sitemap.xmap 20 May 2003 12:02:50 -0000 1.1
+++ sitemap.xmap 7 Jun 2003 21:20:14 -0000 1.2
@@ -34,12 +34,9 @@
<map:serialize/>
</map:match>
- <map:match pattern="test.html">
- <map:generate src="content/test.xml"/>
+ <map:match pattern="*.html">
+ <map:generate src="content/{1}.xml"/>
<map:transform type="xinclude"/>
- <map:transform type="log">
- <map:parameter name="logfile" value="xinclude.txt"/>
- </map:transform>
<map:transform
src="context://samples/common/style/xsl/html/simple-page2html.xsl">
<map:parameter name="contextPath" value="{request:contextPath}"/>
<map:parameter name="servletPath" value="{request:servletPath}"/>
@@ -50,9 +47,8 @@
<map:serialize/>
</map:match>
- <map:match pattern="loopinclusion.html">
- <map:generate src="content/loopinclusion.xml"/>
- <map:transform type="xinclude"/>
+ <map:match pattern="*.xml">
+ <map:generate src="content/{1}.xml"/>
<map:serialize/>
</map:match>
1.1 cocoon-2.1/src/webapp/samples/xinclude/content/xmlbase.xml
Index: xmlbase.xml
===================================================================
<?xml version="1.0"?>
<page xmlns:xi="http://www.w3.org/2001/XInclude";>
<title>XInclude xml:base demo</title>
<content>
This is a test of the xml:base support.
<hr/>
<dummy xml:base="cocoon:/dir1/dir2/dir3/">
<xi:include href="../../../test3.xml"/>
<dummy xml:base="cocoon:/dir1/">
<xi:include href="../test3.xml"/>
</dummy>
<xi:include href="../../../test3.xml"/>
</dummy>
</content>
</page>
