You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by am...@apache.org on 2007/03/02 10:06:31 UTC

svn commit: r513668 [2/2] - in /xerces/c/trunk/tests/src/xinclude: ./ tests/ tests/xinclude/ tests/xinclude/cppoutput/ tests/xinclude/included/ tests/xinclude/included/dir/ tests/xinclude/tests/ tests/xinclude/written/

Added: xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test15.xml
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test15.xml?view=auto&rev=513668
==============================================================================
--- xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test15.xml (added)
+++ xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test15.xml Fri Mar  2 01:06:25 2007
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<x xmlns="http://www.schemaTest.org/xinclude-test"
+   xmlns:xi="http://www.w3.org/2001/XInclude"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
+   <!-- test that parser can be reused -->
+   <xi:include href="../included/elem.xml"/>
+   <xi:include href="../included/elem.xml"/>
+   <xi:include href="../included/elem.xml"/>
+</x>

Added: xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test16.xml
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test16.xml?view=auto&rev=513668
==============================================================================
--- xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test16.xml (added)
+++ xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test16.xml Fri Mar  2 01:06:25 2007
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<x xmlns="http://www.schemaTest.org/xinclude-test"
+   xmlns:xi="http://www.w3.org/2001/XInclude"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
+   <!-- included file includes another file -->
+   <xi:include parse="xml"
+               href="../included/include.xml"/>
+</x>

Added: xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test17.xml
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test17.xml?view=auto&rev=513668
==============================================================================
--- xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test17.xml (added)
+++ xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test17.xml Fri Mar  2 01:06:25 2007
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<x xmlns="http://www.schemaTest.org/xinclude-test"
+   xmlns:xi="http://www.w3.org/2001/XInclude"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
+   <!-- test that empty fallback is valid -->
+   <xi:include parse="xml"
+               href="../included/elem.xml">
+       <xi:fallback/>
+   </xi:include>
+</x>

Added: xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test18.xml
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test18.xml?view=auto&rev=513668
==============================================================================
--- xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test18.xml (added)
+++ xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test18.xml Fri Mar  2 01:06:25 2007
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<x xmlns="http://www.schemaTest.org/xinclude-test"
+   xmlns:xi="http://www.w3.org/2001/XInclude"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
+   <!-- tests that fallback must be child of include -->
+   <!-- EXPECT FAILURE -->
+   <xi:fallback/>
+   <xi:include parse="xml"
+               href="../included/elem.xml"/>
+</x>

Added: xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test19.xml
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test19.xml?view=auto&rev=513668
==============================================================================
--- xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test19.xml (added)
+++ xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test19.xml Fri Mar  2 01:06:25 2007
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<x xmlns="http://www.schemaTest.org/xinclude-test"
+   xmlns:xi="http://www.w3.org/2001/XInclude"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
+   <!-- test including XML as text -->
+   <xi:include parse="text"
+               href="../included/elem.xml"/>
+</x>

Added: xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test20.xml
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test20.xml?view=auto&rev=513668
==============================================================================
--- xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test20.xml (added)
+++ xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test20.xml Fri Mar  2 01:06:25 2007
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<x xmlns="http://www.schemaTest.org/xinclude-test"
+   xmlns:xi="http://www.w3.org/2001/XInclude"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
+   <!-- test including file with different MIME-type as XML -->
+   <xi:include parse="xml"
+               href="../included/elem.jpg"/>
+</x>

Added: xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test21.xml
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test21.xml?view=auto&rev=513668
==============================================================================
--- xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test21.xml (added)
+++ xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test21.xml Fri Mar  2 01:06:25 2007
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<x xmlns="http://www.schemaTest.org/xinclude-test"
+   xmlns:xi="http://www.w3.org/2001/XInclude"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
+   <!-- test including file with different MIME-type as text -->
+   <xi:include parse="text"
+               href="../included/elem.jpg"/>
+</x>

Added: xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test22.xml
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test22.xml?view=auto&rev=513668
==============================================================================
--- xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test22.xml (added)
+++ xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test22.xml Fri Mar  2 01:06:25 2007
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<x xmlns="http://www.schemaTest.org/xinclude-test"
+   xmlns:xi="http://www.w3.org/2001/XInclude"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
+   <!-- include not well formed XML -->
+   <!-- EXPECT FAILURE -->
+   <xi:include parse="xml"
+               href="../included/not-well-formed.xml"/>
+</x>

Added: xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test23.xml
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test23.xml?view=auto&rev=513668
==============================================================================
--- xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test23.xml (added)
+++ xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test23.xml Fri Mar  2 01:06:25 2007
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<x xmlns="http://www.schemaTest.org/xinclude-test"
+   xmlns:xi="http://www.w3.org/2001/XInclude"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
+   <!-- including the same document, but as text -->
+   <xi:include parse="text"
+               href="test24.xml"/>
+</x>

Added: xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test24.xml
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test24.xml?view=auto&rev=513668
==============================================================================
--- xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test24.xml (added)
+++ xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test24.xml Fri Mar  2 01:06:25 2007
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<x xmlns="http://www.schemaTest.org/xinclude-test"
+   xmlns:xi="http://www.w3.org/2001/XInclude"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
+   <!-- test that including the same document fails -->
+   <!-- EXPECT FAILURE -->
+   <xi:include parse="xml"
+               href="test24.xml"/>
+</x>

Added: xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test25.xml
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test25.xml?view=auto&rev=513668
==============================================================================
--- xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test25.xml (added)
+++ xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test25.xml Fri Mar  2 01:06:25 2007
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<x xmlns="http://www.schemaTest.org/xinclude-test"
+   xmlns:xi="http://www.w3.org/2001/XInclude"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
+   <!-- test including a resource that isn't there, when parse="xml" -->
+   <!-- EXPECT FAILURE -->
+   <xi:include parse="xml"
+               href="../included/invalid.xml"/>
+</x>

Added: xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test26.xml
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test26.xml?view=auto&rev=513668
==============================================================================
--- xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test26.xml (added)
+++ xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test26.xml Fri Mar  2 01:06:25 2007
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<x xmlns="http://www.schemaTest.org/xinclude-test"
+   xmlns:xi="http://www.w3.org/2001/XInclude"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
+   <!-- test including a resource that isn't there, when parse="text" -->
+   <!-- EXPECT FAILURE -->
+   <xi:include parse="text"
+               href="../included/invalid.xml"/>
+</x>

Added: xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test27.xml
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test27.xml?view=auto&rev=513668
==============================================================================
--- xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test27.xml (added)
+++ xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test27.xml Fri Mar  2 01:06:25 2007
@@ -0,0 +1,11 @@
+<?xml version='1.0'?>
+<!DOCTYPE x SYSTEM "tests.dtd">
+<x xmlns="http://www.schemaTest.org/xinclude-test"
+   xmlns:xi="http://www.w3.org/2001/XInclude"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
+   <elem bar="xjpg"/>
+   <!-- test including a document with a non-conflicting notation -->
+   <xi:include parse="xml"
+               href="../included/not.xml"/>
+</x>

Added: xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test28.xml
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test28.xml?view=auto&rev=513668
==============================================================================
--- xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test28.xml (added)
+++ xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test28.xml Fri Mar  2 01:06:25 2007
@@ -0,0 +1,11 @@
+<?xml version='1.0'?>
+<!DOCTYPE x SYSTEM "tests.dtd">
+<x xmlns="http://www.schemaTest.org/xinclude-test"
+   xmlns:xi="http://www.w3.org/2001/XInclude"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
+   <elem bar="jpg"/>
+   <!-- test including a document with a duplicate notation -->
+   <xi:include parse="xml"
+               href="../included/not.xml"/>
+</x>

Added: xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test29.xml
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test29.xml?view=auto&rev=513668
==============================================================================
--- xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test29.xml (added)
+++ xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test29.xml Fri Mar  2 01:06:25 2007
@@ -0,0 +1,12 @@
+<?xml version='1.0'?>
+<!DOCTYPE x SYSTEM "tests.dtd">
+<x xmlns="http://www.schemaTest.org/xinclude-test"
+   xmlns:xi="http://www.w3.org/2001/XInclude"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
+   <elem bar="jpg"/>
+   <!-- test including a document with a conflicting notation -->
+   <!-- EXPECT FAILURE -->
+   <xi:include parse="xml"
+               href="../included/not2.xml"/>
+</x>

Added: xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test30.xml
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test30.xml?view=auto&rev=513668
==============================================================================
--- xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test30.xml (added)
+++ xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test30.xml Fri Mar  2 01:06:25 2007
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE x SYSTEM "tests.dtd">
+<x xmlns="http://www.schemaTest.org/xinclude-test"
+   xmlns:xi="http://www.w3.org/2001/XInclude"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
+   <!-- including document with non-conflicting unparsed entity -->
+   <elem foo="ximage"/>
+   <xi:include parse="xml"
+               href="../included/ue.xml"/>
+</x>

Added: xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test31.xml
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test31.xml?view=auto&rev=513668
==============================================================================
--- xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test31.xml (added)
+++ xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test31.xml Fri Mar  2 01:06:25 2007
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE x SYSTEM "tests.dtd">
+<x xmlns="http://www.schemaTest.org/xinclude-test"
+   xmlns:xi="http://www.w3.org/2001/XInclude"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
+   <!-- including document with duplicate unparsed entity -->
+   <elem foo="image"/>
+   <xi:include parse="xml"
+               href="../included/ue.xml"/>
+</x>

Added: xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test32.xml
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test32.xml?view=auto&rev=513668
==============================================================================
--- xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test32.xml (added)
+++ xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test32.xml Fri Mar  2 01:06:25 2007
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE x SYSTEM "tests.dtd">
+<x xmlns="http://www.schemaTest.org/xinclude-test"
+   xmlns:xi="http://www.w3.org/2001/XInclude"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
+   <!-- test including document with conflicting unparsed entity -->
+   <!-- Note: this actually fails because of the conflicting notation; I'm not
+        sure how to make a conflicting unparsed entity without having a conflicting
+        notation -->
+   <!-- EXPECT FAILURE -->
+   <elem foo="image"/>
+   <xi:include parse="xml"
+               href="../included/ue2.xml"/>
+</x>

Added: xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test33.xml
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test33.xml?view=auto&rev=513668
==============================================================================
--- xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test33.xml (added)
+++ xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test33.xml Fri Mar  2 01:06:25 2007
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<x xmlns="http://www.schemaTest.org/xinclude-test"
+   xmlns:xi="http://www.w3.org/2001/XInclude"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
+   <!-- including document with a DTD, and unparsed entities and notations,
+        when the root document doesn't have one -->
+   <xi:include parse="xml"
+               href="../included/ue.xml"/>
+</x>

Added: xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test34.xml
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test34.xml?view=auto&rev=513668
==============================================================================
--- xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test34.xml (added)
+++ xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test34.xml Fri Mar  2 01:06:25 2007
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<x xmlns="http://www.schemaTest.org/xinclude-test"
+   xmlns:xi="http://www.w3.org/2001/XInclude"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd"
+   xml:base="../">
+   <!-- using xml:base on parent element to move back a directory -->
+   <xi:include parse="xml"
+               href="included/elem.xml"/>
+</x>

Added: xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test35.xml
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test35.xml?view=auto&rev=513668
==============================================================================
--- xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test35.xml (added)
+++ xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test35.xml Fri Mar  2 01:06:25 2007
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<x xmlns="http://www.schemaTest.org/xinclude-test"
+   xmlns:xi="http://www.w3.org/2001/XInclude"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
+   <!-- using xml:base on include element to move back a directory -->
+   <xi:include xml:base="../"
+               parse="xml"
+               href="included/elem.xml"/>
+</x>

Added: xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test36.xml
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test36.xml?view=auto&rev=513668
==============================================================================
--- xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test36.xml (added)
+++ xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test36.xml Fri Mar  2 01:06:25 2007
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<x xmlns="http://www.schemaTest.org/xinclude-test"
+   xmlns:xi="http://www.w3.org/2001/XInclude"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.schemaTest.org/xinclude-test ../tests/tests.xsd"
+   xml:base="../included/">
+   <!-- using xml:base on parent element to move to the included directory -->
+   <xi:include parse="xml"
+               href="elem.xml"/>
+</x>

Added: xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test37.xml
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test37.xml?view=auto&rev=513668
==============================================================================
--- xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test37.xml (added)
+++ xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test37.xml Fri Mar  2 01:06:25 2007
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<x xmlns="http://www.schemaTest.org/xinclude-test"
+   xmlns:xi="http://www.w3.org/2001/XInclude"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
+   <!-- using xml:base on include element to move to the included directory -->
+   <xi:include xml:base="../included/"
+               parse="xml"
+               href="elem.xml"/>
+</x>

Added: xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test38.xml
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test38.xml?view=auto&rev=513668
==============================================================================
--- xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test38.xml (added)
+++ xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test38.xml Fri Mar  2 01:06:25 2007
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<x xmlns="http://www.schemaTest.org/xinclude-test"
+   xmlns:xi="http://www.w3.org/2001/XInclude"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd"
+   xml:base="../">
+   <!-- using xml:base on both parent element and include element -->
+   <xi:include xml:base="included/"
+               parse="xml"
+               href="elem.xml"/>
+</x>

Added: xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test39.xml
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test39.xml?view=auto&rev=513668
==============================================================================
--- xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test39.xml (added)
+++ xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test39.xml Fri Mar  2 01:06:25 2007
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<x xmlns="http://www.schemaTest.org/xinclude-test"
+   xmlns:xi="http://www.w3.org/2001/XInclude"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd"
+   xml:base="../">
+   <!-- using xml:base on both parent element to move to wrong directory -->
+   <!-- EXPECT FAILURE -->
+   <xi:include parse="xml"
+               href="../included/elem.xml"/>
+</x>

Added: xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test40.xml
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test40.xml?view=auto&rev=513668
==============================================================================
--- xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test40.xml (added)
+++ xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test40.xml Fri Mar  2 01:06:25 2007
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<x xmlns="http://www.schemaTest.org/xinclude-test"
+   xmlns:xi="http://www.w3.org/2001/XInclude"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
+   <!-- using xml:base on include element to move to wrong directory -->
+   <!-- EXPECT FAILURE -->
+   <xi:include xml:base="../"
+               parse="xml"
+               href="../included/elem.xml"/>
+</x>

Added: xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test41.xml
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test41.xml?view=auto&rev=513668
==============================================================================
--- xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test41.xml (added)
+++ xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/test41.xml Fri Mar  2 01:06:25 2007
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<x xmlns="http://www.schemaTest.org/xinclude-test"
+   xmlns:xi="http://www.w3.org/2001/XInclude"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
+   <!-- final included element specifies an xml:base attribute, which will be
+        overwritten by the new xml:base attribute -->
+   <xi:include parse="xml"
+               href="../included/base.xml"/>
+</x>

Added: xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/tests.dtd
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/tests.dtd?view=auto&rev=513668
==============================================================================
--- xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/tests.dtd (added)
+++ xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/tests.dtd Fri Mar  2 01:06:25 2007
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding="UTF-8"?>
+<!NOTATION jpg SYSTEM "jpg">
+<!NOTATION xjpg SYSTEM "jpg">
+<!ENTITY image SYSTEM "foobar.jpg" NDATA jpg>
+<!ENTITY ximage SYSTEM "foobar.jpg" NDATA xjpg>

Added: xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/tests.xsd
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/tests.xsd?view=auto&rev=513668
==============================================================================
--- xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/tests.xsd (added)
+++ xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/tests.xsd Fri Mar  2 01:06:25 2007
@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+	xmlns:xml="http://www.w3.org/XML/1998/namespace"
+	targetNamespace="http://www.schemaTest.org/xinclude-test"
+	xmlns:xit="http://www.schemaTest.org/xinclude-test">
+
+<import namespace="http://www.w3.org/XML/1998/namespace"
+        schemaLocation="./xmlbase.xsd"/>
+
+<!-- used for test01.xml -->
+<complexType name="childType" mixed="true">
+	<sequence>
+		<element name="desc">
+			<simpleType>
+				<restriction base="string">
+					<pattern value="Text\d"/>
+				</restriction>
+			</simpleType>
+		</element>
+	</sequence>
+	<attribute name="name" type="ID"/>
+	<attribute ref="xml:base"/>
+</complexType>
+
+<!-- used for test01.xml -->
+<complexType name="selectType">
+	<attribute name="name" type="IDREF"/>
+</complexType>
+
+<!-- used for test01.xml -->
+<element name="myRoot">
+	<complexType>
+		<sequence>
+			<element name="child1" type="xit:childType"/>
+			<element name="child2" type="xit:childType"/>		
+			<element name="child3" type="xit:childType"/>
+			<element name="select" type="xit:selectType"/>
+			<element name="view">
+				<complexType>
+					<attribute ref="xml:base"/>
+					<attribute name="sun" type="string"/>
+				</complexType>
+			</element>
+		</sequence>
+	</complexType>
+</element>
+
+<attribute name="foo" type="string"/>
+
+<attribute name="bar" type="string"/>
+
+<element name="elem">
+	<complexType>
+		<attribute name="foo" type="string"/>
+		<attribute name="bar" type="string"/>
+		<attribute ref="xml:base"/>
+	</complexType>
+</element>
+
+<element name="x">
+	<complexType mixed="true">
+		<sequence>
+			<element ref="xit:elem" minOccurs="0" maxOccurs="unbounded"/>
+		</sequence>
+	</complexType>
+</element>
+
+</schema>

Added: xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/xmlbase.xsd
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/xmlbase.xsd?view=auto&rev=513668
==============================================================================
--- xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/xmlbase.xsd (added)
+++ xerces/c/trunk/tests/src/xinclude/tests/xinclude/tests/xmlbase.xsd Fri Mar  2 01:06:25 2007
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:xml="http://www.w3.org/XML/1998/namespace"
+            targetNamespace="http://www.w3.org/XML/1998/namespace">
+
+<xsd:attribute name="base" type="xsd:anyURI">
+   <xsd:annotation>
+      <xsd:documentation>A definition for xml:base.</xsd:documentation>
+   </xsd:annotation>
+</xsd:attribute>
+
+</xsd:schema>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org