balld 00/07/25 11:56:58
Modified: samples/xinclude foo.xml xinclude.xml xincludeptr.xml
Added: samples/xinclude nested_xinclude.xml
Log:
brought examples into conformance with 2000-07-17 WD
Revision Changes Path
1.2 +1 -3 xml-cocoon/samples/xinclude/foo.xml
Index: foo.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/samples/xinclude/foo.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- foo.xml 2000/05/20 04:40:44 1.1
+++ foo.xml 2000/07/25 18:56:57 1.2
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<message>This is a message</message>
- <message>This is another message
- <message>and a third one</message>
- </message>
+ <message>This is another message</message>
</root>
1.2 +3 -3 xml-cocoon/samples/xinclude/xinclude.xml
Index: xinclude.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/samples/xinclude/xinclude.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xinclude.xml 2000/05/20 04:40:44 1.1
+++ xinclude.xml 2000/07/25 18:56:57 1.2
@@ -1,11 +1,11 @@
<?xml version="1.0"?>
<?cocoon-process type="xinclude"?>
-<?cocoon-format type="text/xml"?>
+<!--<?cocoon-format type="text/xml"?>-->
<page
xmlns:xinclude="http://www.w3.org/1999/XML/xinclude";
>
-<xinclude:include parse="text" href="foo.txt"/>
-<xinclude:include parse="xml" href="foo.xml"/>
+<include xinclude:parse="text" xinclude:href="foo.txt"/>
+<include xinclude:parse="xml" xinclude:href="foo.xml"/>
</page>
1.2 +2 -2 xml-cocoon/samples/xinclude/xincludeptr.xml
Index: xincludeptr.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/samples/xinclude/xincludeptr.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xincludeptr.xml 2000/05/20 04:40:44 1.1
+++ xincludeptr.xml 2000/07/25 18:56:57 1.2
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<?cocoon-process type="xinclude"?>
-<?cocoon-format type="text/xml"?>
+<!--<?cocoon-format type="text/xml"?>-->
<page
xmlns:xinclude="http://www.w3.org/1999/XML/xinclude";
>
-<xinclude:include parse="xml" href="foo.xml#xpointer(//message)"/>
+<include xinclude:parse="xml" xinclude:href="foo.xml#xpointer(//message)"/>
</page>
1.1 xml-cocoon/samples/xinclude/nested_xinclude.xml
Index: nested_xinclude.xml
===================================================================
<?xml version="1.0"?>
<?cocoon-process type="xinclude"?>
<?cocoon-format type="text/xml"?>
<outer-page
xmlns:xinclude="http://www.w3.org/1999/XML/xinclude";
>
<include xinclude:parse="xml" xinclude:href="xinclude.xml"/>
</outer-page>
