From a7019614896fdd3e29b9a28f6a8cfd2c1b365983 Mon Sep 17 00:00:00 2001
From: Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de>
Date: Sun, 1 Mar 2015 20:47:25 +0100
Subject: Renamed domain to ontology.

---
 testdata/osxmlparser/book_domain.osxml       | 98 ----------------------------
 testdata/osxmlparser/book_ontology.osxml     | 98 ++++++++++++++++++++++++++++
 testdata/osxmlparser/comments_domain.osxml   | 40 ------------
 testdata/osxmlparser/comments_ontology.osxml | 40 ++++++++++++
 testdata/osxmlparser/complex_book.osxml      | 12 ++--
 testdata/osxmlparser/headings_domain.osxml   | 33 ----------
 testdata/osxmlparser/headings_ontology.osxml | 33 ++++++++++
 testdata/osxmlparser/simple_book.osxml       |  4 +-
 8 files changed, 179 insertions(+), 179 deletions(-)
 delete mode 100644 testdata/osxmlparser/book_domain.osxml
 create mode 100644 testdata/osxmlparser/book_ontology.osxml
 delete mode 100644 testdata/osxmlparser/comments_domain.osxml
 create mode 100644 testdata/osxmlparser/comments_ontology.osxml
 delete mode 100644 testdata/osxmlparser/headings_domain.osxml
 create mode 100644 testdata/osxmlparser/headings_ontology.osxml

(limited to 'testdata/osxmlparser')

diff --git a/testdata/osxmlparser/book_domain.osxml b/testdata/osxmlparser/book_domain.osxml
deleted file mode 100644
index 5a8cc67..0000000
--- a/testdata/osxmlparser/book_domain.osxml
+++ /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">
-	<!-- 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">
-	<!-- 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/osxmlparser/book_ontology.osxml b/testdata/osxmlparser/book_ontology.osxml
new file mode 100644
index 0000000..0b393e6
--- /dev/null
+++ b/testdata/osxmlparser/book_ontology.osxml
@@ -0,0 +1,98 @@
+<?xml version="1.0" standalone="yes"?>
+<!-- The ontology node is the root node of a single ontology definition -->
+<ontology 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 ontology. Note that this grammar may be
+	     influenced by other ontologies 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">
+	<!-- 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">
+	<!-- implicitly:
+	<struct name="text" isRoot="false" cardinality="{*}"
+	                 transparent="true" isa="" attributesDescriptor="">
+	-->
+		<!-- we might want to specify std.string here -->
+		<primitive type="string"/>
+	</struct>
+</ontology>
diff --git a/testdata/osxmlparser/comments_domain.osxml b/testdata/osxmlparser/comments_domain.osxml
deleted file mode 100644
index dc7742e..0000000
--- a/testdata/osxmlparser/comments_domain.osxml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<domain name="comments">
-	<import rel="domain" src="./book_domain.osxml"/>
-
-	<!-- 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/osxmlparser/comments_ontology.osxml b/testdata/osxmlparser/comments_ontology.osxml
new file mode 100644
index 0000000..f2423be
--- /dev/null
+++ b/testdata/osxmlparser/comments_ontology.osxml
@@ -0,0 +1,40 @@
+<?xml version="1.0" standalone="yes"?>
+<ontology name="comments">
+	<import rel="ontology" src="./book_ontology.osxml"/>
+
+	<!-- 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>
+</ontology>
diff --git a/testdata/osxmlparser/complex_book.osxml b/testdata/osxmlparser/complex_book.osxml
index 8fff93d..222b146 100644
--- a/testdata/osxmlparser/complex_book.osxml
+++ b/testdata/osxmlparser/complex_book.osxml
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <document>
 
-	<import rel="domain" src="book"/>
-	<import rel="domain" src="headings"/>
-	<import rel="domain" src="meta"/>
-	<import rel="domain" src="bibliography"/>
-	<!--<import rel="domain" src="emphasis.oxm"/>
-	<import rel="domain" src="comments.oxm"/>
+	<import rel="ontology" src="book"/>
+	<import rel="ontology" src="headings"/>
+	<import rel="ontology" src="meta"/>
+	<import rel="ontology" src="bibliography"/>
+	<!--<import rel="ontology" src="emphasis.oxm"/>
+	<import rel="ontology" src="comments.oxm"/>
 	<alias tag="paragraph" aka="p"/>
 	<alias tag="emphasized" aka="em"/>-->
 	
diff --git a/testdata/osxmlparser/headings_domain.osxml b/testdata/osxmlparser/headings_domain.osxml
deleted file mode 100644
index 07d3db2..0000000
--- a/testdata/osxmlparser/headings_domain.osxml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<domain name="headings">
-
-	<import rel="domain" src="./book_domain.osxml"/>
-
-	<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/osxmlparser/headings_ontology.osxml b/testdata/osxmlparser/headings_ontology.osxml
new file mode 100644
index 0000000..413eaa9
--- /dev/null
+++ b/testdata/osxmlparser/headings_ontology.osxml
@@ -0,0 +1,33 @@
+<?xml version="1.0" standalone="yes"?>
+<ontology name="headings">
+
+	<import rel="ontology" src="./book_ontology.osxml"/>
+
+	<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 ontologies.
+		     So we need to reference the default field of paragraph. -->
+		<fieldRef ref="book.paragraph.$default"/>
+	</struct>
+</ontology>
diff --git a/testdata/osxmlparser/simple_book.osxml b/testdata/osxmlparser/simple_book.osxml
index 310a413..ec1e45a 100644
--- a/testdata/osxmlparser/simple_book.osxml
+++ b/testdata/osxmlparser/simple_book.osxml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <document>
-	<import rel="domain" src="book_domain.osxml"/>
+	<import rel="ontology" src="book_ontology.osxml"/>
 	<book>
 		This might be some introductory text or a dedication.
-		<!-- Note that a better version of the book domain might specify
+		<!-- Note that a better version of the book ontology might specify
 			 headings here. -->
 		<chapter name="myFirstChapter">
 			Here we might have an introduction to the chapter.
-- 
cgit v1.2.3