conf/test.xml: add commented section for xinclude, fix encoding set in testID.xml

0f992990 · Vitaly Lipatov · 7ef28af3 · 0f992990 · 0f992990
Commit 0f992990 authored Dec 17, 2010 by Vitaly Lipatov
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

test.xml conf/test.xml +3 -1

testID.xml tests/testID.xml +1 -1

No files found.
--- a/conf/test.xml
+++ b/conf/test.xml
 <?xml version="1.0" encoding="utf-8"?>
-<UNISETPLC>
+<UNISETPLC xmlns:xi="http://www.w3.org/2001/XInclude">
 	<UserData/>
 	<!-- Общие(стартовые) параметры по UniSet -->
 	<UniSet>
@@ -171,4 +171,6 @@
 		<item id="104" name="midMsg4" text="Text for message 4"/>
 		<item id="105" name="midMsg5" text="Text for message 5"/>
 	</messages>
+	<!-- <xi:include href="testID.xml"/> -->
+	<!-- <xi:include href="testIDnon-exist.xml"/> -->
 </UNISETPLC>
--- a/tests/testID.xml
+++ b/tests/testID.xml
-<?xml version = '1.0' encoding = 'koi8-r' ?>
+<?xml version = '1.0' encoding = 'UTF-8' ?>
 <UNISETPLC>
 <UserData></UserData>