From fabb174fd15d129e6b8d668cd3d621b0b9481c4f Mon Sep 17 00:00:00 2001
From: Andreas Stöckel <astoecke@techfak.uni-bielefeld.de>
Date: Sun, 15 Feb 2015 22:49:48 +0100
Subject: Renamed files from oxm and oxd to osxml

---
 testdata/xmlparser/affiliation.osxml         | 10 +++
 testdata/xmlparser/affiliation.oxm           | 10 ---
 testdata/xmlparser/bibliography_domain.osxml | 26 ++++++++
 testdata/xmlparser/bibliography_domain.oxm   | 26 --------
 testdata/xmlparser/book_domain.osxml         | 98 ++++++++++++++++++++++++++++
 testdata/xmlparser/book_domain.oxm           | 98 ----------------------------
 testdata/xmlparser/color.osxml               | 18 +++++
 testdata/xmlparser/color.oxm                 | 18 -----
 testdata/xmlparser/comments_domain.osxml     | 40 ++++++++++++
 testdata/xmlparser/comments_domain.oxm       | 40 ------------
 testdata/xmlparser/email.osxml               |  8 +++
 testdata/xmlparser/email.oxm                 |  8 ---
 testdata/xmlparser/generic.osxml             | 37 +++++++++++
 testdata/xmlparser/generic.oxm               | 37 -----------
 testdata/xmlparser/headings_domain.osxml     | 33 ++++++++++
 testdata/xmlparser/headings_domain.oxm       | 33 ----------
 testdata/xmlparser/lists_domain.osxml        | 26 ++++++++
 testdata/xmlparser/lists_domain.oxm          | 26 --------
 testdata/xmlparser/meta_domain.osxml         | 35 ++++++++++
 testdata/xmlparser/meta_domain.oxm           | 35 ----------
 testdata/xmlparser/mismatchedTag.osxml       |  2 +
 testdata/xmlparser/mismatchedTag.oxm         |  2 -
 testdata/xmlparser/test.osxml                | 15 +++++
 testdata/xmlparser/test.oxm                  | 15 -----
 testdata/xmlparser/version.osxml             |  8 +++
 testdata/xmlparser/version.oxm               |  8 ---
 26 files changed, 356 insertions(+), 356 deletions(-)
 create mode 100644 testdata/xmlparser/affiliation.osxml
 delete mode 100644 testdata/xmlparser/affiliation.oxm
 create mode 100644 testdata/xmlparser/bibliography_domain.osxml
 delete mode 100644 testdata/xmlparser/bibliography_domain.oxm
 create mode 100644 testdata/xmlparser/book_domain.osxml
 delete mode 100644 testdata/xmlparser/book_domain.oxm
 create mode 100644 testdata/xmlparser/color.osxml
 delete mode 100644 testdata/xmlparser/color.oxm
 create mode 100644 testdata/xmlparser/comments_domain.osxml
 delete mode 100644 testdata/xmlparser/comments_domain.oxm
 create mode 100644 testdata/xmlparser/email.osxml
 delete mode 100644 testdata/xmlparser/email.oxm
 create mode 100644 testdata/xmlparser/generic.osxml
 delete mode 100644 testdata/xmlparser/generic.oxm
 create mode 100644 testdata/xmlparser/headings_domain.osxml
 delete mode 100644 testdata/xmlparser/headings_domain.oxm
 create mode 100644 testdata/xmlparser/lists_domain.osxml
 delete mode 100644 testdata/xmlparser/lists_domain.oxm
 create mode 100644 testdata/xmlparser/meta_domain.osxml
 delete mode 100644 testdata/xmlparser/meta_domain.oxm
 create mode 100644 testdata/xmlparser/mismatchedTag.osxml
 delete mode 100644 testdata/xmlparser/mismatchedTag.oxm
 create mode 100644 testdata/xmlparser/test.osxml
 delete mode 100644 testdata/xmlparser/test.oxm
 create mode 100644 testdata/xmlparser/version.osxml
 delete mode 100644 testdata/xmlparser/version.oxm

(limited to 'testdata')

diff --git a/testdata/xmlparser/affiliation.osxml b/testdata/xmlparser/affiliation.osxml
new file mode 100644
index 0000000..d84dc30
--- /dev/null
+++ b/testdata/xmlparser/affiliation.osxml
@@ -0,0 +1,10 @@
+<?xml version="1.0" standalone="yes"?>
+<typesystem name="affiliation">
+	<struct name="affiliation">
+		<field name="workgroup" type="string"/>
+		<field name="departement" type="string"/>
+		<field name="institution" type="string"/>
+	</struct>
+
+	<constant name="citec.sc" type="affiliation" value="[workgroup=Semantic Computing Group,departement=Center of Excellence Cognitive Interaction Technology (CITEC), institution=Bielefeld University]"/>
+</typesystem>
diff --git a/testdata/xmlparser/affiliation.oxm b/testdata/xmlparser/affiliation.oxm
deleted file mode 100644
index d84dc30..0000000
--- a/testdata/xmlparser/affiliation.oxm
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<typesystem name="affiliation">
-	<struct name="affiliation">
-		<field name="workgroup" type="string"/>
-		<field name="departement" type="string"/>
-		<field name="institution" type="string"/>
-	</struct>
-
-	<constant name="citec.sc" type="affiliation" value="[workgroup=Semantic Computing Group,departement=Center of Excellence Cognitive Interaction Technology (CITEC), institution=Bielefeld University]"/>
-</typesystem>
diff --git a/testdata/xmlparser/bibliography_domain.osxml b/testdata/xmlparser/bibliography_domain.osxml
new file mode 100644
index 0000000..f1d25f8
--- /dev/null
+++ b/testdata/xmlparser/bibliography_domain.osxml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<domain name="bibliography">
+
+	<import rel="domain" src="./book_domain.oxm"/>
+	<import rel="domain" src="./meta_domain.oxm"/>
+
+	<struct name="bibliography" transparent="true">
+		<field>
+			<childRef ref="bibEntry"/>
+		</field>
+		<parentRef ref="book">
+			<field name="bibliography" isSubtree="true"/>
+		</parentRef>
+	</struct>
+	<struct name="bibEntry">
+		<field name="authors" optional="true">
+			<childRef ref="meta.author"/>
+		</field>
+		<primitive name="name" type="string" isSubtree="true"/>
+		<primitive name="year" type="int" isSubtree="true"/>
+		<primitive name="journal" type="string" isSubtree="true" optional="true"/>
+		<primitive name="pages" type="cardinality" isSubtree="true" optional="true"/>
+		<!-- Here a geographical enum or something would be more exact -->
+		<primitive name="location" type="string" isSubtree="true" optional="true"/>
+	</struct>
+</domain>
diff --git a/testdata/xmlparser/bibliography_domain.oxm b/testdata/xmlparser/bibliography_domain.oxm
deleted file mode 100644
index f1d25f8..0000000
--- a/testdata/xmlparser/bibliography_domain.oxm
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<domain name="bibliography">
-
-	<import rel="domain" src="./book_domain.oxm"/>
-	<import rel="domain" src="./meta_domain.oxm"/>
-
-	<struct name="bibliography" transparent="true">
-		<field>
-			<childRef ref="bibEntry"/>
-		</field>
-		<parentRef ref="book">
-			<field name="bibliography" isSubtree="true"/>
-		</parentRef>
-	</struct>
-	<struct name="bibEntry">
-		<field name="authors" optional="true">
-			<childRef ref="meta.author"/>
-		</field>
-		<primitive name="name" type="string" isSubtree="true"/>
-		<primitive name="year" type="int" isSubtree="true"/>
-		<primitive name="journal" type="string" isSubtree="true" optional="true"/>
-		<primitive name="pages" type="cardinality" isSubtree="true" optional="true"/>
-		<!-- Here a geographical enum or something would be more exact -->
-		<primitive name="location" type="string" isSubtree="true" optional="true"/>
-	</struct>
-</domain>
diff --git a/testdata/xmlparser/book_domain.osxml b/testdata/xmlparser/book_domain.osxml
new file mode 100644
index 0000000..4218915
--- /dev/null
+++ b/testdata/xmlparser/book_domain.osxml
@@ -0,0 +1,98 @@
+<?xml version="1.0" standalone="yes"?>
+<!-- The domain node is the root node of a single domain definition -->
+<domain name="book">
+	<!-- We start by declaring the structured classes. This implicitly defines
+	     a context free grammar, which specifies the language of documents that
+	     may be constructed using this domain. Note that this grammar may be
+	     influenced by other domains depending on this one. -->
+	<!-- Note that we specify neither attributes, 
+	     nor parent, nor transparency, meaning that we refer to the default
+	     values. Also note that we need to specify explicitly, which classes
+	     are allowed as root nodes. -->
+	<struct name="book" cardinality="{1}" isRoot="true">
+	<!-- implicitly:
+	<struct name="book" cardinality="{1}" isRoot="true" 
+	                 transparent="false" isa="" attributesDescriptor="">
+	-->
+		<!-- Note that we assume that, if not specified, a
+		     field is assumed to have no name, be of type TREE
+		     and not optional. -->
+		<field>
+		<!-- implicitly:
+		<field name="" isSubtree="false" optional="false">
+		-->
+			<!-- Using such child references might be problematic if
+			     multiple nodes are matched. This should probably
+			     result in an exception.
+			     Also note that we only reference the child classes.
+			     We do _not_ declare them here. This might lead to
+			     some difficulties in the parsing process as I
+			     effectively use forward declarations here. So the
+			     resolve() process may only be started _after_ all
+			     delcarations are read. -->
+			<childRef ref="book.chapter"/>
+			<!-- The dot notation as path separator might be changed
+			     but I think it to be intuitive. If we want a more
+			     CSS like style we can use whitespaces here. -->
+			<childRef ref="book.paragraph"/>
+		</field>
+	</struct>
+	<struct name="chapter">
+	<!-- implicitly:
+	<struct name="chapter" isRoot="false" cardinality="{*}"
+	                 transparent="false" isa="" attributesDescriptor="">
+	-->
+		<field>
+		<!-- implicitly:
+		<field name="" isSubtree="false" optional="false">
+		-->
+			<childRef ref="book.section"/>
+			<childRef ref="book.paragraph"/>
+		</field>
+	</struct>
+	<struct name="section">
+	<!-- implicitly:
+	<struct name="section" isRoot="false" cardinality="{*}"
+	                 transparent="false" isa="" attributesDescriptor="">
+	-->
+		<field>
+		<!-- implicitly:
+		<field name="" isSubtree="false" optional="false">
+		-->
+			<childRef ref="book.subsection"/>
+			<childRef ref="book.paragraph"/>
+		</field>
+	</struct>
+	<struct name="subsection">
+	<!-- implicitly:
+	<struct name="subsection" isRoot="false" cardinality="{*}"
+	                 transparent="false" isa="" attributesDescriptor="">
+	-->
+		<field>
+		<!-- implicitly:
+		<field name="" isSubtree="false" optional="false">
+		-->
+			<childRef ref="book.paragraph"/>
+		</field>
+	</struct>
+	<struct name="paragraph" transparent="true" role="paragraph">
+	<!-- implicitly:
+	<struct name="subsection" isRoot="false" cardinality="{*}"
+	                 transparent="true" isa="" attributesDescriptor="">
+	-->
+		<field>
+		<!-- implicitly:
+		<field name="" type="TREE" optional="false">
+		-->
+			<childRef ref="book.text"/>
+		</field>
+	</struct>
+	<struct name="text" transparent="true" role="text">
+	<!-- implicitly:
+	<struct name="text" isRoot="false" cardinality="{*}"
+	                 transparent="true" isa="" attributesDescriptor="">
+	-->
+		<!-- we might want to specify std.string here -->
+		<primitive type="string"/>
+	</struct>
+</domain>
diff --git a/testdata/xmlparser/book_domain.oxm b/testdata/xmlparser/book_domain.oxm
deleted file mode 100644
index 4218915..0000000
--- a/testdata/xmlparser/book_domain.oxm
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<!-- The domain node is the root node of a single domain definition -->
-<domain name="book">
-	<!-- We start by declaring the structured classes. This implicitly defines
-	     a context free grammar, which specifies the language of documents that
-	     may be constructed using this domain. Note that this grammar may be
-	     influenced by other domains depending on this one. -->
-	<!-- Note that we specify neither attributes, 
-	     nor parent, nor transparency, meaning that we refer to the default
-	     values. Also note that we need to specify explicitly, which classes
-	     are allowed as root nodes. -->
-	<struct name="book" cardinality="{1}" isRoot="true">
-	<!-- implicitly:
-	<struct name="book" cardinality="{1}" isRoot="true" 
-	                 transparent="false" isa="" attributesDescriptor="">
-	-->
-		<!-- Note that we assume that, if not specified, a
-		     field is assumed to have no name, be of type TREE
-		     and not optional. -->
-		<field>
-		<!-- implicitly:
-		<field name="" isSubtree="false" optional="false">
-		-->
-			<!-- Using such child references might be problematic if
-			     multiple nodes are matched. This should probably
-			     result in an exception.
-			     Also note that we only reference the child classes.
-			     We do _not_ declare them here. This might lead to
-			     some difficulties in the parsing process as I
-			     effectively use forward declarations here. So the
-			     resolve() process may only be started _after_ all
-			     delcarations are read. -->
-			<childRef ref="book.chapter"/>
-			<!-- The dot notation as path separator might be changed
-			     but I think it to be intuitive. If we want a more
-			     CSS like style we can use whitespaces here. -->
-			<childRef ref="book.paragraph"/>
-		</field>
-	</struct>
-	<struct name="chapter">
-	<!-- implicitly:
-	<struct name="chapter" isRoot="false" cardinality="{*}"
-	                 transparent="false" isa="" attributesDescriptor="">
-	-->
-		<field>
-		<!-- implicitly:
-		<field name="" isSubtree="false" optional="false">
-		-->
-			<childRef ref="book.section"/>
-			<childRef ref="book.paragraph"/>
-		</field>
-	</struct>
-	<struct name="section">
-	<!-- implicitly:
-	<struct name="section" isRoot="false" cardinality="{*}"
-	                 transparent="false" isa="" attributesDescriptor="">
-	-->
-		<field>
-		<!-- implicitly:
-		<field name="" isSubtree="false" optional="false">
-		-->
-			<childRef ref="book.subsection"/>
-			<childRef ref="book.paragraph"/>
-		</field>
-	</struct>
-	<struct name="subsection">
-	<!-- implicitly:
-	<struct name="subsection" isRoot="false" cardinality="{*}"
-	                 transparent="false" isa="" attributesDescriptor="">
-	-->
-		<field>
-		<!-- implicitly:
-		<field name="" isSubtree="false" optional="false">
-		-->
-			<childRef ref="book.paragraph"/>
-		</field>
-	</struct>
-	<struct name="paragraph" transparent="true" role="paragraph">
-	<!-- implicitly:
-	<struct name="subsection" isRoot="false" cardinality="{*}"
-	                 transparent="true" isa="" attributesDescriptor="">
-	-->
-		<field>
-		<!-- implicitly:
-		<field name="" type="TREE" optional="false">
-		-->
-			<childRef ref="book.text"/>
-		</field>
-	</struct>
-	<struct name="text" transparent="true" role="text">
-	<!-- implicitly:
-	<struct name="text" isRoot="false" cardinality="{*}"
-	                 transparent="true" isa="" attributesDescriptor="">
-	-->
-		<!-- we might want to specify std.string here -->
-		<primitive type="string"/>
-	</struct>
-</domain>
diff --git a/testdata/xmlparser/color.osxml b/testdata/xmlparser/color.osxml
new file mode 100644
index 0000000..17adea4
--- /dev/null
+++ b/testdata/xmlparser/color.osxml
@@ -0,0 +1,18 @@
+<?xml version="1.0" standalone="yes"?>
+<typesystem name="color">
+	<struct name="color">
+		<field name="r" type="int"/>
+		<field name="g" type="int"/>
+		<field name="b" type="int"/>
+	</struct>
+
+	<constant name="aquamarine1" type="color" value="[127,255,212]"/>
+	<constant name="aquamarine2" type="color" value="[118,238,198]"/>
+	<constant name="aquamarine3" type="color" value="[102,205,170]"/>
+	<constant name="aquamarine" type="color" value="[127,255,212]"/>
+	<constant name="azure1" type="color" value="[240,255,255]"/>
+	<constant name="azure2" type="color" value="[224,238,238]"/>
+	<constant name="azure3" type="color" value="[193,205,205]"/>
+	<constant name="azure4" type="color" value="[131,139,139]"/>
+	<constant name="azure" type="color" value="[240,255,255]"/>
+</typesystem>
diff --git a/testdata/xmlparser/color.oxm b/testdata/xmlparser/color.oxm
deleted file mode 100644
index 17adea4..0000000
--- a/testdata/xmlparser/color.oxm
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<typesystem name="color">
-	<struct name="color">
-		<field name="r" type="int"/>
-		<field name="g" type="int"/>
-		<field name="b" type="int"/>
-	</struct>
-
-	<constant name="aquamarine1" type="color" value="[127,255,212]"/>
-	<constant name="aquamarine2" type="color" value="[118,238,198]"/>
-	<constant name="aquamarine3" type="color" value="[102,205,170]"/>
-	<constant name="aquamarine" type="color" value="[127,255,212]"/>
-	<constant name="azure1" type="color" value="[240,255,255]"/>
-	<constant name="azure2" type="color" value="[224,238,238]"/>
-	<constant name="azure3" type="color" value="[193,205,205]"/>
-	<constant name="azure4" type="color" value="[131,139,139]"/>
-	<constant name="azure" type="color" value="[240,255,255]"/>
-</typesystem>
diff --git a/testdata/xmlparser/comments_domain.osxml b/testdata/xmlparser/comments_domain.osxml
new file mode 100644
index 0000000..6add2b3
--- /dev/null
+++ b/testdata/xmlparser/comments_domain.osxml
@@ -0,0 +1,40 @@
+<?xml version="1.0" standalone="yes"?>
+<domain name="comments">
+	<import rel="domain" src="./book_domain.oxm"/>
+
+	<!-- an annotation comment -->
+	<annotation name="comment">
+		<field name="replies" isSubtree="true">
+			<childRef ref="reply"/>
+		</field>
+		<field name="content">
+			<childRef ref="book.paragraph"/>
+		</field>
+	</annotation>
+
+	<!-- an point-like structure comment. -->
+	<struct name="comment">
+		<!-- Is there a chance to prevent users from having to redefine these
+		     two fields in comment and reply? Could we use a fieldRef here?
+		     Or would that be circular? -->
+		<field name="replies" isSubtree="true">
+			<childRef ref="reply"/>
+		</field>
+		<field name="content">
+			<childRef ref="book.paragraph"/>
+		</field>
+		<parentRef ref="book.paragraph">
+			<fieldRef ref="$default"/>
+		</parentRef>
+	</struct>
+	<!-- note that replies are organized in a tree fashion: One can also reply
+	     to a reply -->
+	<struct name="reply">
+		<field name="replies" isSubtree="true">
+			<childRef ref="reply"/>
+		</field>
+		<field name="content">
+			<childRef ref="book.paragraph"/>
+		</field>
+	</struct>
+</domain>
diff --git a/testdata/xmlparser/comments_domain.oxm b/testdata/xmlparser/comments_domain.oxm
deleted file mode 100644
index 6add2b3..0000000
--- a/testdata/xmlparser/comments_domain.oxm
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<domain name="comments">
-	<import rel="domain" src="./book_domain.oxm"/>
-
-	<!-- an annotation comment -->
-	<annotation name="comment">
-		<field name="replies" isSubtree="true">
-			<childRef ref="reply"/>
-		</field>
-		<field name="content">
-			<childRef ref="book.paragraph"/>
-		</field>
-	</annotation>
-
-	<!-- an point-like structure comment. -->
-	<struct name="comment">
-		<!-- Is there a chance to prevent users from having to redefine these
-		     two fields in comment and reply? Could we use a fieldRef here?
-		     Or would that be circular? -->
-		<field name="replies" isSubtree="true">
-			<childRef ref="reply"/>
-		</field>
-		<field name="content">
-			<childRef ref="book.paragraph"/>
-		</field>
-		<parentRef ref="book.paragraph">
-			<fieldRef ref="$default"/>
-		</parentRef>
-	</struct>
-	<!-- note that replies are organized in a tree fashion: One can also reply
-	     to a reply -->
-	<struct name="reply">
-		<field name="replies" isSubtree="true">
-			<childRef ref="reply"/>
-		</field>
-		<field name="content">
-			<childRef ref="book.paragraph"/>
-		</field>
-	</struct>
-</domain>
diff --git a/testdata/xmlparser/email.osxml b/testdata/xmlparser/email.osxml
new file mode 100644
index 0000000..325f89a
--- /dev/null
+++ b/testdata/xmlparser/email.osxml
@@ -0,0 +1,8 @@
+<?xml version="1.0" standalone="yes"?>
+<typesystem name="email">
+	<struct name="email">
+		<field name="local" type="string"/>
+		<field name="domainName" type="string"/>
+		<field name="domainSuffix" type="string"/>
+	</struct>
+</typesystem>
diff --git a/testdata/xmlparser/email.oxm b/testdata/xmlparser/email.oxm
deleted file mode 100644
index 325f89a..0000000
--- a/testdata/xmlparser/email.oxm
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<typesystem name="email">
-	<struct name="email">
-		<field name="local" type="string"/>
-		<field name="domainName" type="string"/>
-		<field name="domainSuffix" type="string"/>
-	</struct>
-</typesystem>
diff --git a/testdata/xmlparser/generic.osxml b/testdata/xmlparser/generic.osxml
new file mode 100644
index 0000000..45803c8
--- /dev/null
+++ b/testdata/xmlparser/generic.osxml
@@ -0,0 +1,37 @@
+<?xml version="1.0" standalone="yes"?>
+<typesystem name="border">
+	<import>./color.oxm</import>
+
+	<enum name="border-style">
+		<entry>none</entry>
+		<entry>dotted</entry>
+		<entry>dashed</entry>
+		<entry>solid</entry>
+		<entry>double</entry>
+		<entry>groove</entry>
+		<entry>ridge</entry>
+		<entry>inset</entry>
+		<entry>outset</entry>
+	</enum>
+
+	<constant name="zero" value="0" type="int" />
+	<constant name="black" value="[zero, zero, zero]" type="color" />
+
+	<struct name="border">
+		<field name="style" type="border-style"/>
+		<field name="color" type="color" default="black" />
+	</struct>
+
+	<constant name="beautifulBorder" type="border" value="[color=aquamarine,style=solid]" />
+	<constant name="moreBeautifulBorder" type="border" value="[dotted, azure]" />
+</typesystem>
+<!--<domain name="color">
+	<struct name="bla" cardinality="{1,2}" isa="blub"/>
+	<struct name="blub" cardinality="{1-3,5,>7}">
+		<fields>
+			<field></field>
+			<primitive type="bla"/>
+		</fields>
+	</struct>
+</domain>-->
+
diff --git a/testdata/xmlparser/generic.oxm b/testdata/xmlparser/generic.oxm
deleted file mode 100644
index 45803c8..0000000
--- a/testdata/xmlparser/generic.oxm
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<typesystem name="border">
-	<import>./color.oxm</import>
-
-	<enum name="border-style">
-		<entry>none</entry>
-		<entry>dotted</entry>
-		<entry>dashed</entry>
-		<entry>solid</entry>
-		<entry>double</entry>
-		<entry>groove</entry>
-		<entry>ridge</entry>
-		<entry>inset</entry>
-		<entry>outset</entry>
-	</enum>
-
-	<constant name="zero" value="0" type="int" />
-	<constant name="black" value="[zero, zero, zero]" type="color" />
-
-	<struct name="border">
-		<field name="style" type="border-style"/>
-		<field name="color" type="color" default="black" />
-	</struct>
-
-	<constant name="beautifulBorder" type="border" value="[color=aquamarine,style=solid]" />
-	<constant name="moreBeautifulBorder" type="border" value="[dotted, azure]" />
-</typesystem>
-<!--<domain name="color">
-	<struct name="bla" cardinality="{1,2}" isa="blub"/>
-	<struct name="blub" cardinality="{1-3,5,>7}">
-		<fields>
-			<field></field>
-			<primitive type="bla"/>
-		</fields>
-	</struct>
-</domain>-->
-
diff --git a/testdata/xmlparser/headings_domain.osxml b/testdata/xmlparser/headings_domain.osxml
new file mode 100644
index 0000000..d421747
--- /dev/null
+++ b/testdata/xmlparser/headings_domain.osxml
@@ -0,0 +1,33 @@
+<?xml version="1.0" standalone="yes"?>
+<domain name="headings">
+
+	<import rel="domain" src="./book_domain.oxm"/>
+
+	<struct name="heading" cardinality="1" transparent="true">
+		<!-- The parent mechanism is a curious thing. Remind yourself
+		     that parent-child-relationship in this sense are mediated
+		     by fields. So we must either reference a field that is
+		     already there or declare a new one on the fly. -->
+		<parentRef ref="book.book">
+			<field name="heading" isSubtree="true" optional="true"/>
+		</parentRef>
+		<parentRef ref="book.chapter">
+			<field name="heading" isSubtree="true" optional="true"/>
+		</parentRef>
+		<parentRef ref="book.section">
+			<field name="heading" isSubtree="true" optional="true"/>
+		</parentRef>
+		<parentRef ref="book.subsection">
+			<field name="heading" isSubtree="true" optional="true"/>
+		</parentRef>
+		<parentRef ref="book.paragraph">
+			<field name="heading" isSubtree="true" optional="true"/>
+		</parentRef>
+		<!-- regarding its fields we have a problem here. We do not want to
+		     declare a new field, because in fact we want to allow every
+		     bit of content that a paragraph would allow - also considering
+		     possible extensions of paragraph by other domains.
+		     So we need to reference the default field of paragraph. -->
+		<fieldRef ref="book.paragraph.$default"/>
+	</struct>
+</domain>
diff --git a/testdata/xmlparser/headings_domain.oxm b/testdata/xmlparser/headings_domain.oxm
deleted file mode 100644
index d421747..0000000
--- a/testdata/xmlparser/headings_domain.oxm
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<domain name="headings">
-
-	<import rel="domain" src="./book_domain.oxm"/>
-
-	<struct name="heading" cardinality="1" transparent="true">
-		<!-- The parent mechanism is a curious thing. Remind yourself
-		     that parent-child-relationship in this sense are mediated
-		     by fields. So we must either reference a field that is
-		     already there or declare a new one on the fly. -->
-		<parentRef ref="book.book">
-			<field name="heading" isSubtree="true" optional="true"/>
-		</parentRef>
-		<parentRef ref="book.chapter">
-			<field name="heading" isSubtree="true" optional="true"/>
-		</parentRef>
-		<parentRef ref="book.section">
-			<field name="heading" isSubtree="true" optional="true"/>
-		</parentRef>
-		<parentRef ref="book.subsection">
-			<field name="heading" isSubtree="true" optional="true"/>
-		</parentRef>
-		<parentRef ref="book.paragraph">
-			<field name="heading" isSubtree="true" optional="true"/>
-		</parentRef>
-		<!-- regarding its fields we have a problem here. We do not want to
-		     declare a new field, because in fact we want to allow every
-		     bit of content that a paragraph would allow - also considering
-		     possible extensions of paragraph by other domains.
-		     So we need to reference the default field of paragraph. -->
-		<fieldRef ref="book.paragraph.$default"/>
-	</struct>
-</domain>
diff --git a/testdata/xmlparser/lists_domain.osxml b/testdata/xmlparser/lists_domain.osxml
new file mode 100644
index 0000000..4360a6d
--- /dev/null
+++ b/testdata/xmlparser/lists_domain.osxml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<domain name="lists">
+	<import rel="domain" src="book.oxm"/>
+
+	<struct name="ul" isa="book.paragraph">
+		<!-- Here we solve the problem of parents using the isa
+			 mechanism, because a list may occur whereever a paragraph
+			 may occur. However we do want to override the default field. -->
+		<field>
+			<childRef name="item"/>
+		</field>
+	</struct>
+	<struct name="ol" isa="book.paragraph">
+		<!-- Here we solve the problem of parents using the isa
+		     mechanism, because a list may occur whereever a paragraph
+		     may occur. However we do want to override the default field. -->
+		<field>
+			<childRef name="item"/>
+		</field>
+	</struct>
+	<struct name="item">
+		<field>
+			<childRef name="book.paragaph"/>
+		</field>
+	</struct>
+</domain>
diff --git a/testdata/xmlparser/lists_domain.oxm b/testdata/xmlparser/lists_domain.oxm
deleted file mode 100644
index 4360a6d..0000000
--- a/testdata/xmlparser/lists_domain.oxm
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<domain name="lists">
-	<import rel="domain" src="book.oxm"/>
-
-	<struct name="ul" isa="book.paragraph">
-		<!-- Here we solve the problem of parents using the isa
-			 mechanism, because a list may occur whereever a paragraph
-			 may occur. However we do want to override the default field. -->
-		<field>
-			<childRef name="item"/>
-		</field>
-	</struct>
-	<struct name="ol" isa="book.paragraph">
-		<!-- Here we solve the problem of parents using the isa
-		     mechanism, because a list may occur whereever a paragraph
-		     may occur. However we do want to override the default field. -->
-		<field>
-			<childRef name="item"/>
-		</field>
-	</struct>
-	<struct name="item">
-		<field>
-			<childRef name="book.paragaph"/>
-		</field>
-	</struct>
-</domain>
diff --git a/testdata/xmlparser/meta_domain.osxml b/testdata/xmlparser/meta_domain.osxml
new file mode 100644
index 0000000..ffb5413
--- /dev/null
+++ b/testdata/xmlparser/meta_domain.osxml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<domain name="meta">
+
+	<import rel="typesystem" src="./affiliation.oxm"/>
+	<import rel="typesystem" src="./email.oxm"/>
+	<import rel="typesystem" src="./version.oxm"/>
+	<import rel="domain" src="./book_domain.oxm"/>
+
+	<struct name="meta" cardinality="{1}" transparent="true">
+		<field name="authors">
+			<childRef ref="author"/>
+			<childRef ref="version"/>
+		</field>
+		<parentRef ref="book">
+			<field name="meta" isSubtree="true" optional="true"/>
+		</parentRef>
+		<parentRef ref="chapter">
+			<field name="meta" isSubtree="true" optional="true"/>
+		</parentRef>
+		<!-- One could also include "article" and other things here -->
+	</struct>
+	<!-- no explicit cardinality, because we might have multiple authors -->
+	<struct name="author">
+		<primitive isSubtree="true" name="firstName" type="string"/>
+		<primitive isSubtree="true" name="lastName" type="string"/>
+		<primitive isSubtree="true" name="email" type="email" optional="true"/>
+		<primitive isSubtree="true" name="affiliation" type="affiliation" optional="true"/>
+	</struct>
+	<!-- but we need at least one primary author -->
+	<struct name="primaryAuthor" cardinality="{>0}" isa="author"/>
+	<!-- version intermediate struct -->
+	<struct name="version" cardinality="{0-1}">
+		<primitive type="version"/>
+	</struct>
+</domain>
diff --git a/testdata/xmlparser/meta_domain.oxm b/testdata/xmlparser/meta_domain.oxm
deleted file mode 100644
index ffb5413..0000000
--- a/testdata/xmlparser/meta_domain.oxm
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<domain name="meta">
-
-	<import rel="typesystem" src="./affiliation.oxm"/>
-	<import rel="typesystem" src="./email.oxm"/>
-	<import rel="typesystem" src="./version.oxm"/>
-	<import rel="domain" src="./book_domain.oxm"/>
-
-	<struct name="meta" cardinality="{1}" transparent="true">
-		<field name="authors">
-			<childRef ref="author"/>
-			<childRef ref="version"/>
-		</field>
-		<parentRef ref="book">
-			<field name="meta" isSubtree="true" optional="true"/>
-		</parentRef>
-		<parentRef ref="chapter">
-			<field name="meta" isSubtree="true" optional="true"/>
-		</parentRef>
-		<!-- One could also include "article" and other things here -->
-	</struct>
-	<!-- no explicit cardinality, because we might have multiple authors -->
-	<struct name="author">
-		<primitive isSubtree="true" name="firstName" type="string"/>
-		<primitive isSubtree="true" name="lastName" type="string"/>
-		<primitive isSubtree="true" name="email" type="email" optional="true"/>
-		<primitive isSubtree="true" name="affiliation" type="affiliation" optional="true"/>
-	</struct>
-	<!-- but we need at least one primary author -->
-	<struct name="primaryAuthor" cardinality="{>0}" isa="author"/>
-	<!-- version intermediate struct -->
-	<struct name="version" cardinality="{0-1}">
-		<primitive type="version"/>
-	</struct>
-</domain>
diff --git a/testdata/xmlparser/mismatchedTag.osxml b/testdata/xmlparser/mismatchedTag.osxml
new file mode 100644
index 0000000..5dc9388
--- /dev/null
+++ b/testdata/xmlparser/mismatchedTag.osxml
@@ -0,0 +1,2 @@
+<document></document2>
+
diff --git a/testdata/xmlparser/mismatchedTag.oxm b/testdata/xmlparser/mismatchedTag.oxm
deleted file mode 100644
index 5dc9388..0000000
--- a/testdata/xmlparser/mismatchedTag.oxm
+++ /dev/null
@@ -1,2 +0,0 @@
-<document></document2>
-
diff --git a/testdata/xmlparser/test.osxml b/testdata/xmlparser/test.osxml
new file mode 100644
index 0000000..911bbed
--- /dev/null
+++ b/testdata/xmlparser/test.osxml
@@ -0,0 +1,15 @@
+<?xml version="1.0" standalone="yes"?>
+<domain name="test">
+
+	<import rel="domain" src="./book_domain.oxm"/>
+	<import rel="typesystem" src="./color.oxm"/>
+
+	<struct name="fancycolor">
+	
+		<primitive type="color"/>
+	
+		<parentRef ref="book.book">
+			<fieldRef ref="$default"/>
+		</parentRef>
+	</struct>
+</domain>
diff --git a/testdata/xmlparser/test.oxm b/testdata/xmlparser/test.oxm
deleted file mode 100644
index 911bbed..0000000
--- a/testdata/xmlparser/test.oxm
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<domain name="test">
-
-	<import rel="domain" src="./book_domain.oxm"/>
-	<import rel="typesystem" src="./color.oxm"/>
-
-	<struct name="fancycolor">
-	
-		<primitive type="color"/>
-	
-		<parentRef ref="book.book">
-			<fieldRef ref="$default"/>
-		</parentRef>
-	</struct>
-</domain>
diff --git a/testdata/xmlparser/version.osxml b/testdata/xmlparser/version.osxml
new file mode 100644
index 0000000..0d52736
--- /dev/null
+++ b/testdata/xmlparser/version.osxml
@@ -0,0 +1,8 @@
+<?xml version="1.0" standalone="yes"?>
+<typesystem name="version">
+	<struct name="version">
+		<field name="major" type="int"/>
+		<field name="minor" type="int"/>
+		<field name="patch" type="int"/>
+	</struct>
+</typesystem>
diff --git a/testdata/xmlparser/version.oxm b/testdata/xmlparser/version.oxm
deleted file mode 100644
index 0d52736..0000000
--- a/testdata/xmlparser/version.oxm
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<typesystem name="version">
-	<struct name="version">
-		<field name="major" type="int"/>
-		<field name="minor" type="int"/>
-		<field name="patch" type="int"/>
-	</struct>
-</typesystem>
-- 
cgit v1.2.3