You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by br...@apache.org on 2003/05/23 15:10:08 UTC
cvs commit: cocoon-2.1/src/webapp/samples/xinclude/content test.xml test4.xml
bruno 2003/05/23 06:10:08
Modified: src/webapp/samples/xinclude/content test.xml test4.xml
Log:
Corrected xpointer expressions (by removing things like whitespace which should otherwise be encoded).
Revision Changes Path
1.2 +4 -6 cocoon-2.1/src/webapp/samples/xinclude/content/test.xml
Index: test.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/xinclude/content/test.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test.xml 20 May 2003 12:02:50 -0000 1.1
+++ test.xml 23 May 2003 13:10:08 -0000 1.2
@@ -32,11 +32,9 @@
<hr/>
<para><b><![CDATA[
- <xi:include href="#xmlns(xi=http://www.w3.org/2001/XInclude)
- xpointer(/page/content/xi:include[1])"/>
+ <xi:include href="#xmlns(xi=http://www.w3.org/2001/XInclude)xpointer(/page/content/xi:include[1])"/>
]]></b></para>
- <xi:include href="#xmlns(xi=http://www.w3.org/2001/XInclude)
- xpointer(/page/content/xi:include[1])"/>
+ <xi:include href="#xmlns(xi=http://www.w3.org/2001/XInclude)xpointer(/page/content/xi:include[1])"/>
<hr/>
<para><b>This sample demonstrates the recursive inclusion: here file4.xml
@@ -49,7 +47,7 @@
one after the other. If one doesn't return a result, it is skipped and
the next one is evaluated, until one is found that returns a
result.</b></para>
- <para><b><![CDATA[<xi:include href="test2.xml#xpointer(/x) xpointer(/y) xpointer(/z) xpointer(/page/content/para[2])"/>]]></b></para>
- <xi:include href="test2.xml#xpointer(/x) xpointer(/y) xpointer(/z) xpointer(/page/content/para[2])"/>
+ <para><b><![CDATA[<xi:include href="test2.xml#xpointer(/x)xpointer(/y)xpointer(/z)xpointer(/page/content/para[2])"/>]]></b></para>
+ <xi:include href="test2.xml#xpointer(/x)xpointer(/y)xpointer(/z)xpointer(/page/content/para[2])"/>
</content>
</page>
1.2 +1 -1 cocoon-2.1/src/webapp/samples/xinclude/content/test4.xml
Index: test4.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/xinclude/content/test4.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test4.xml 20 May 2003 12:02:50 -0000 1.1
+++ test4.xml 23 May 2003 13:10:08 -0000 1.2
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<para xmlns:xi="http://www.w3.org/2001/XInclude">
This is content in test4.xml, will do a include of test5.xml here:
- <xi:include href="test5.xml#xpointer(/para/node^(^))"/>
+ <xi:include href="test5.xml#xpointer(/para/node())"/>
</para>