You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2016/05/14 14:03:25 UTC
[26/42] jena git commit: Merge commit 'refs/pull/143/head' of
github.com:apache/jena
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/ontology/owl/list-syntax/test-proptypes.rdf
----------------------------------------------------------------------
diff --cc jena-core/testing/ontology/owl/list-syntax/test-proptypes.rdf
index 81c009b,81c009b..102ec46
--- a/jena-core/testing/ontology/owl/list-syntax/test-proptypes.rdf
+++ b/jena-core/testing/ontology/owl/list-syntax/test-proptypes.rdf
@@@ -1,32 -1,32 +1,32 @@@
--<?xml version='1.0' encoding='ISO-8859-1'?>
--
--<!DOCTYPE rdf:RDF [
-- <!ENTITY xsd 'http://www.w3.org/2001/XMLSchema#'>
--]>
--
--<rdf:RDF
-- xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-- xmlns:dc ="http://purl.org/dc/elements/1.1/"
-- xmlns:owl ="http://www.w3.org/2002/07/owl#"
-- xmlns ="http://jena.hpl.hp.com/testing/ontology#"
-- xml:base ="http://jena.hpl.hp.com/testing/ontology"
-->
--
--<owl:Ontology rdf:about="">
-- <owl:versionInfo>CVS $Id: test.rdf,v 1.1 2003/04/02 20:33:33 ian_dickinson Exp $</owl:versionInfo>
--</owl:Ontology>
--
--<owl:FunctionalProperty rdf:ID="fp">
--</owl:FunctionalProperty>
--
--<owl:TransitiveProperty rdf:ID="tp">
--</owl:TransitiveProperty>
--
--<owl:SymmetricProperty rdf:ID="sp">
--</owl:SymmetricProperty>
--
--<owl:InverseFunctionalProperty rdf:ID="ifp">
--</owl:InverseFunctionalProperty>
--
--</rdf:RDF>
++<?xml version='1.0' encoding='ISO-8859-1'?>
++
++<!DOCTYPE rdf:RDF [
++ <!ENTITY xsd 'http://www.w3.org/2001/XMLSchema#'>
++]>
++
++<rdf:RDF
++ xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
++ xmlns:dc ="http://purl.org/dc/elements/1.1/"
++ xmlns:owl ="http://www.w3.org/2002/07/owl#"
++ xmlns ="http://jena.hpl.hp.com/testing/ontology#"
++ xml:base ="http://jena.hpl.hp.com/testing/ontology"
++>
++
++<owl:Ontology rdf:about="">
++ <owl:versionInfo>CVS $Id: test.rdf,v 1.1 2003/04/02 20:33:33 ian_dickinson Exp $</owl:versionInfo>
++</owl:Ontology>
++
++<owl:FunctionalProperty rdf:ID="fp">
++</owl:FunctionalProperty>
++
++<owl:TransitiveProperty rdf:ID="tp">
++</owl:TransitiveProperty>
++
++<owl:SymmetricProperty rdf:ID="sp">
++</owl:SymmetricProperty>
++
++<owl:InverseFunctionalProperty rdf:ID="ifp">
++</owl:InverseFunctionalProperty>
++
++</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/ontology/relativenames.rdf
----------------------------------------------------------------------
diff --cc jena-core/testing/ontology/relativenames.rdf
index c37038d,c37038d..dfe86de
--- a/jena-core/testing/ontology/relativenames.rdf
+++ b/jena-core/testing/ontology/relativenames.rdf
@@@ -1,22 -1,22 +1,22 @@@
--<?xml version='1.0' encoding='ISO-8859-1'?>
--
--<!DOCTYPE rdf:RDF [
-- <!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
-- <!ENTITY rdfs 'http://www.w3.org/2000/01/rdf-schema#'>
--]>
--
--<!-- Note: no xml:base -->
--<!-- we pretend document is being served from http://jena.hpl.hp.com/testing/ontology/relativenames -->
--
--<rdf:RDF
-- xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-- xmlns:dc ="http://purl.org/dc/elements/1.1/"
-- xmlns:owl ="http://www.w3.org/2002/07/owl#"
-- xmlns ="http://jena.hpl.hp.com/testing/ontology/relativenames#"
-->
--
--<owl:Class rdf:ID="A">
--</owl:Class>
--
--</rdf:RDF>
++<?xml version='1.0' encoding='ISO-8859-1'?>
++
++<!DOCTYPE rdf:RDF [
++ <!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
++ <!ENTITY rdfs 'http://www.w3.org/2000/01/rdf-schema#'>
++]>
++
++<!-- Note: no xml:base -->
++<!-- we pretend document is being served from http://jena.hpl.hp.com/testing/ontology/relativenames -->
++
++<rdf:RDF
++ xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
++ xmlns:dc ="http://purl.org/dc/elements/1.1/"
++ xmlns:owl ="http://www.w3.org/2002/07/owl#"
++ xmlns ="http://jena.hpl.hp.com/testing/ontology/relativenames#"
++>
++
++<owl:Class rdf:ID="A">
++</owl:Class>
++
++</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/ontology/testImport1/a.owl
----------------------------------------------------------------------
diff --cc jena-core/testing/ontology/testImport1/a.owl
index 39a75d7,39a75d7..ff192b8
--- a/jena-core/testing/ontology/testImport1/a.owl
+++ b/jena-core/testing/ontology/testImport1/a.owl
@@@ -1,14 -1,14 +1,14 @@@
--<rdf:RDF
-- xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-- xmlns:owl ="http://www.w3.org/2002/07/owl#"
-- xmlns ="http://jena.hpl.hp.com/2003/03/testont#"
-- xml:base ="http://jena.hpl.hp.com/2003/03/testont"
-->
--
--<owl:Ontology rdf:about="">
--</owl:Ontology>
--
--<Marker rdf:ID="a0" />
--
--</rdf:RDF>
++<rdf:RDF
++ xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
++ xmlns:owl ="http://www.w3.org/2002/07/owl#"
++ xmlns ="http://jena.hpl.hp.com/2003/03/testont#"
++ xml:base ="http://jena.hpl.hp.com/2003/03/testont"
++>
++
++<owl:Ontology rdf:about="">
++</owl:Ontology>
++
++<Marker rdf:ID="a0" />
++
++</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/ontology/testImport1/readme
----------------------------------------------------------------------
diff --cc jena-core/testing/ontology/testImport1/readme
index cdfaa78,cdfaa78..897c9a9
--- a/jena-core/testing/ontology/testImport1/readme
+++ b/jena-core/testing/ontology/testImport1/readme
@@@ -1,1 -1,1 +1,1 @@@
--zero stages of import
++zero stages of import
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/ontology/testImport2/a.owl
----------------------------------------------------------------------
diff --cc jena-core/testing/ontology/testImport2/a.owl
index bd8f090,bd8f090..0e6fc25
--- a/jena-core/testing/ontology/testImport2/a.owl
+++ b/jena-core/testing/ontology/testImport2/a.owl
@@@ -1,15 -1,15 +1,15 @@@
--<rdf:RDF
-- xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-- xmlns:owl ="http://www.w3.org/2002/07/owl#"
-- xmlns ="http://jena.hpl.hp.com/2003/03/testont#"
-- xml:base ="http://jena.hpl.hp.com/2003/03/testont"
-->
--
--<owl:Ontology rdf:about="">
-- <owl:imports rdf:resource="file:testing/ontology/testImport2/b.owl" />
--</owl:Ontology>
--
--<Marker rdf:ID="a0" />
--
--</rdf:RDF>
++<rdf:RDF
++ xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
++ xmlns:owl ="http://www.w3.org/2002/07/owl#"
++ xmlns ="http://jena.hpl.hp.com/2003/03/testont#"
++ xml:base ="http://jena.hpl.hp.com/2003/03/testont"
++>
++
++<owl:Ontology rdf:about="">
++ <owl:imports rdf:resource="file:testing/ontology/testImport2/b.owl" />
++</owl:Ontology>
++
++<Marker rdf:ID="a0" />
++
++</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/ontology/testImport2/b.owl
----------------------------------------------------------------------
diff --cc jena-core/testing/ontology/testImport2/b.owl
index db320a2,db320a2..f6696ab
--- a/jena-core/testing/ontology/testImport2/b.owl
+++ b/jena-core/testing/ontology/testImport2/b.owl
@@@ -1,14 -1,14 +1,14 @@@
--<rdf:RDF
-- xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-- xmlns:owl ="http://www.w3.org/2002/07/owl#"
-- xmlns ="http://jena.hpl.hp.com/2003/03/testont#"
-- xml:base ="http://jena.hpl.hp.com/2003/03/testont"
-->
--
--<owl:Ontology rdf:about="">
--</owl:Ontology>
--
--<Marker rdf:ID="b0" />
--
--</rdf:RDF>
++<rdf:RDF
++ xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
++ xmlns:owl ="http://www.w3.org/2002/07/owl#"
++ xmlns ="http://jena.hpl.hp.com/2003/03/testont#"
++ xml:base ="http://jena.hpl.hp.com/2003/03/testont"
++>
++
++<owl:Ontology rdf:about="">
++</owl:Ontology>
++
++<Marker rdf:ID="b0" />
++
++</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/ontology/testImport2/readme
----------------------------------------------------------------------
diff --cc jena-core/testing/ontology/testImport2/readme
index dd8fd17,dd8fd17..86c0690
--- a/jena-core/testing/ontology/testImport2/readme
+++ b/jena-core/testing/ontology/testImport2/readme
@@@ -1,1 -1,1 +1,1 @@@
--one stage of imports
++one stage of imports
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/ontology/testImport3/a.owl
----------------------------------------------------------------------
diff --cc jena-core/testing/ontology/testImport3/a.owl
index be945bf,be945bf..80a5d7a
--- a/jena-core/testing/ontology/testImport3/a.owl
+++ b/jena-core/testing/ontology/testImport3/a.owl
@@@ -1,14 -1,14 +1,14 @@@
--<rdf:RDF
-- xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-- xmlns:owl ="http://www.w3.org/2002/07/owl#"
-- xmlns:mark="http://jena.hpl.hp.com/2003/03/testont#"
-->
--
--<owl:Ontology rdf:about="">
-- <owl:imports rdf:resource="file:testing/ontology/testImport3/b.owl" />
--</owl:Ontology>
--
--<mark:Marker rdf:ID="a0" />
--
--</rdf:RDF>
++<rdf:RDF
++ xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
++ xmlns:owl ="http://www.w3.org/2002/07/owl#"
++ xmlns:mark="http://jena.hpl.hp.com/2003/03/testont#"
++>
++
++<owl:Ontology rdf:about="">
++ <owl:imports rdf:resource="file:testing/ontology/testImport3/b.owl" />
++</owl:Ontology>
++
++<mark:Marker rdf:ID="a0" />
++
++</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/ontology/testImport3/b.owl
----------------------------------------------------------------------
diff --cc jena-core/testing/ontology/testImport3/b.owl
index d9dc27f,d9dc27f..f72b216
--- a/jena-core/testing/ontology/testImport3/b.owl
+++ b/jena-core/testing/ontology/testImport3/b.owl
@@@ -1,14 -1,14 +1,14 @@@
--<rdf:RDF
-- xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-- xmlns:owl ="http://www.w3.org/2002/07/owl#"
-- xmlns:mark="http://jena.hpl.hp.com/2003/03/testont#"
-->
--
--<owl:Ontology rdf:about="">
-- <owl:imports rdf:resource="file:testing/ontology/testImport3/c.owl" />
--</owl:Ontology>
--
--<mark:Marker rdf:ID="b0" />
--
--</rdf:RDF>
++<rdf:RDF
++ xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
++ xmlns:owl ="http://www.w3.org/2002/07/owl#"
++ xmlns:mark="http://jena.hpl.hp.com/2003/03/testont#"
++>
++
++<owl:Ontology rdf:about="">
++ <owl:imports rdf:resource="file:testing/ontology/testImport3/c.owl" />
++</owl:Ontology>
++
++<mark:Marker rdf:ID="b0" />
++
++</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/ontology/testImport3/c.owl
----------------------------------------------------------------------
diff --cc jena-core/testing/ontology/testImport3/c.owl
index f528bfe,f528bfe..fb48fe7
--- a/jena-core/testing/ontology/testImport3/c.owl
+++ b/jena-core/testing/ontology/testImport3/c.owl
@@@ -1,13 -1,13 +1,13 @@@
--<rdf:RDF
-- xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-- xmlns:owl ="http://www.w3.org/2002/07/owl#"
-- xmlns:mark="http://jena.hpl.hp.com/2003/03/testont#"
-->
--
--<owl:Ontology rdf:about="">
--</owl:Ontology>
--
--<mark:Marker rdf:ID="c0" />
--
--</rdf:RDF>
++<rdf:RDF
++ xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
++ xmlns:owl ="http://www.w3.org/2002/07/owl#"
++ xmlns:mark="http://jena.hpl.hp.com/2003/03/testont#"
++>
++
++<owl:Ontology rdf:about="">
++</owl:Ontology>
++
++<mark:Marker rdf:ID="c0" />
++
++</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/ontology/testImport3/readme
----------------------------------------------------------------------
diff --cc jena-core/testing/ontology/testImport3/readme
index 0f7085f,0f7085f..afd524b
--- a/jena-core/testing/ontology/testImport3/readme
+++ b/jena-core/testing/ontology/testImport3/readme
@@@ -1,1 -1,1 +1,1 @@@
--two stages of imports
++two stages of imports
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/ontology/testImport4/a.owl
----------------------------------------------------------------------
diff --cc jena-core/testing/ontology/testImport4/a.owl
index b528c26,b528c26..0251bfd
--- a/jena-core/testing/ontology/testImport4/a.owl
+++ b/jena-core/testing/ontology/testImport4/a.owl
@@@ -1,15 -1,15 +1,15 @@@
--<rdf:RDF
-- xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-- xmlns:owl ="http://www.w3.org/2002/07/owl#"
-- xmlns ="http://jena.hpl.hp.com/2003/03/testont#"
-- xml:base ="http://jena.hpl.hp.com/2003/03/testont"
-->
--
--<owl:Ontology rdf:about="">
-- <owl:imports rdf:resource="file:testing/ontology/testImport4/b.owl" />
--</owl:Ontology>
--
--<Marker rdf:ID="a0" />
--
--</rdf:RDF>
++<rdf:RDF
++ xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
++ xmlns:owl ="http://www.w3.org/2002/07/owl#"
++ xmlns ="http://jena.hpl.hp.com/2003/03/testont#"
++ xml:base ="http://jena.hpl.hp.com/2003/03/testont"
++>
++
++<owl:Ontology rdf:about="">
++ <owl:imports rdf:resource="file:testing/ontology/testImport4/b.owl" />
++</owl:Ontology>
++
++<Marker rdf:ID="a0" />
++
++</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/ontology/testImport4/b.owl
----------------------------------------------------------------------
diff --cc jena-core/testing/ontology/testImport4/b.owl
index d21ea84,d21ea84..0a28a81
--- a/jena-core/testing/ontology/testImport4/b.owl
+++ b/jena-core/testing/ontology/testImport4/b.owl
@@@ -1,16 -1,16 +1,16 @@@
--<rdf:RDF
-- xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-- xmlns:owl ="http://www.w3.org/2002/07/owl#"
-- xmlns ="http://jena.hpl.hp.com/2003/03/testont#"
-- xml:base ="http://jena.hpl.hp.com/2003/03/testont"
-->
--
--<owl:Ontology rdf:about="">
-- <!-- circularity -->
-- <owl:imports rdf:resource="file:testing/ontology/testImport4/a.owl" />
--</owl:Ontology>
--
--<Marker rdf:ID="b0" />
--
--</rdf:RDF>
++<rdf:RDF
++ xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
++ xmlns:owl ="http://www.w3.org/2002/07/owl#"
++ xmlns ="http://jena.hpl.hp.com/2003/03/testont#"
++ xml:base ="http://jena.hpl.hp.com/2003/03/testont"
++>
++
++<owl:Ontology rdf:about="">
++ <!-- circularity -->
++ <owl:imports rdf:resource="file:testing/ontology/testImport4/a.owl" />
++</owl:Ontology>
++
++<Marker rdf:ID="b0" />
++
++</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/ontology/testImport4/readme
----------------------------------------------------------------------
diff --cc jena-core/testing/ontology/testImport4/readme
index b73e4dc,b73e4dc..9849482
--- a/jena-core/testing/ontology/testImport4/readme
+++ b/jena-core/testing/ontology/testImport4/readme
@@@ -1,1 -1,1 +1,1 @@@
--circular imports
++circular imports
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/ontology/testImport5/a.owl
----------------------------------------------------------------------
diff --cc jena-core/testing/ontology/testImport5/a.owl
index 007f8c2,007f8c2..fcf0956
--- a/jena-core/testing/ontology/testImport5/a.owl
+++ b/jena-core/testing/ontology/testImport5/a.owl
@@@ -1,15 -1,15 +1,15 @@@
--<rdf:RDF
-- xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-- xmlns:owl ="http://www.w3.org/2002/07/owl#"
-- xmlns ="http://jena.hpl.hp.com/2003/03/testont#"
-- xml:base ="http://jena.hpl.hp.com/2003/03/testont"
-->
--
--<owl:Ontology rdf:about="">
-- <owl:imports rdf:resource="http://example.org/foo/bar/b.owl" />
--</owl:Ontology>
--
--<Marker rdf:ID="a0" />
--
--</rdf:RDF>
++<rdf:RDF
++ xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
++ xmlns:owl ="http://www.w3.org/2002/07/owl#"
++ xmlns ="http://jena.hpl.hp.com/2003/03/testont#"
++ xml:base ="http://jena.hpl.hp.com/2003/03/testont"
++>
++
++<owl:Ontology rdf:about="">
++ <owl:imports rdf:resource="http://example.org/foo/bar/b.owl" />
++</owl:Ontology>
++
++<Marker rdf:ID="a0" />
++
++</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/ontology/testImport5/b.owl
----------------------------------------------------------------------
diff --cc jena-core/testing/ontology/testImport5/b.owl
index db320a2,db320a2..f6696ab
--- a/jena-core/testing/ontology/testImport5/b.owl
+++ b/jena-core/testing/ontology/testImport5/b.owl
@@@ -1,14 -1,14 +1,14 @@@
--<rdf:RDF
-- xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-- xmlns:owl ="http://www.w3.org/2002/07/owl#"
-- xmlns ="http://jena.hpl.hp.com/2003/03/testont#"
-- xml:base ="http://jena.hpl.hp.com/2003/03/testont"
-->
--
--<owl:Ontology rdf:about="">
--</owl:Ontology>
--
--<Marker rdf:ID="b0" />
--
--</rdf:RDF>
++<rdf:RDF
++ xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
++ xmlns:owl ="http://www.w3.org/2002/07/owl#"
++ xmlns ="http://jena.hpl.hp.com/2003/03/testont#"
++ xml:base ="http://jena.hpl.hp.com/2003/03/testont"
++>
++
++<owl:Ontology rdf:about="">
++</owl:Ontology>
++
++<Marker rdf:ID="b0" />
++
++</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/ontology/testImport5/readme
----------------------------------------------------------------------
diff --cc jena-core/testing/ontology/testImport5/readme
index 9cbbe50,9cbbe50..b5fb4b5
--- a/jena-core/testing/ontology/testImport5/readme
+++ b/jena-core/testing/ontology/testImport5/readme
@@@ -1,2 -1,2 +1,2 @@@
--use of local alternative specified in config
--
++use of local alternative specified in config
++
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/ontology/testImport6/a.owl
----------------------------------------------------------------------
diff --cc jena-core/testing/ontology/testImport6/a.owl
index 53d8b4d,53d8b4d..57d573d
--- a/jena-core/testing/ontology/testImport6/a.owl
+++ b/jena-core/testing/ontology/testImport6/a.owl
@@@ -1,16 -1,16 +1,16 @@@
--<rdf:RDF
-- xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-- xmlns:owl ="http://www.w3.org/2002/07/owl#"
-- xmlns ="http://jena.hpl.hp.com/2003/03/testont"
-- xmlns:mark ="http://jena.hpl.hp.com/2003/03/testont#"
-->
--
--<owl:Ontology rdf:about="">
-- <owl:imports rdf:resource="file:testing/ontology/testImport6/b.owl" />
-- <owl:imports rdf:resource="file:testing/ontology/testImport6/d.owl" />
--</owl:Ontology>
--
--<mark:Marker rdf:ID="a0" />
--
--</rdf:RDF>
++<rdf:RDF
++ xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
++ xmlns:owl ="http://www.w3.org/2002/07/owl#"
++ xmlns ="http://jena.hpl.hp.com/2003/03/testont"
++ xmlns:mark ="http://jena.hpl.hp.com/2003/03/testont#"
++>
++
++<owl:Ontology rdf:about="">
++ <owl:imports rdf:resource="file:testing/ontology/testImport6/b.owl" />
++ <owl:imports rdf:resource="file:testing/ontology/testImport6/d.owl" />
++</owl:Ontology>
++
++<mark:Marker rdf:ID="a0" />
++
++</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/ontology/testImport6/b.owl
----------------------------------------------------------------------
diff --cc jena-core/testing/ontology/testImport6/b.owl
index f2064a6,f2064a6..a762119
--- a/jena-core/testing/ontology/testImport6/b.owl
+++ b/jena-core/testing/ontology/testImport6/b.owl
@@@ -1,15 -1,15 +1,15 @@@
--<rdf:RDF
-- xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-- xmlns:owl ="http://www.w3.org/2002/07/owl#"
-- xmlns ="http://jena.hpl.hp.com/2003/03/testont"
-- xmlns:mark ="http://jena.hpl.hp.com/2003/03/testont#"
-->
--
--<owl:Ontology rdf:about="">
-- <owl:imports rdf:resource="file:testing/ontology/testImport6/c.owl" />
--</owl:Ontology>
--
--<mark:Marker rdf:ID="b0" />
--
--</rdf:RDF>
++<rdf:RDF
++ xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
++ xmlns:owl ="http://www.w3.org/2002/07/owl#"
++ xmlns ="http://jena.hpl.hp.com/2003/03/testont"
++ xmlns:mark ="http://jena.hpl.hp.com/2003/03/testont#"
++>
++
++<owl:Ontology rdf:about="">
++ <owl:imports rdf:resource="file:testing/ontology/testImport6/c.owl" />
++</owl:Ontology>
++
++<mark:Marker rdf:ID="b0" />
++
++</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/ontology/testImport6/c.owl
----------------------------------------------------------------------
diff --cc jena-core/testing/ontology/testImport6/c.owl
index 25b0f4f,25b0f4f..880f02c
--- a/jena-core/testing/ontology/testImport6/c.owl
+++ b/jena-core/testing/ontology/testImport6/c.owl
@@@ -1,14 -1,14 +1,14 @@@
--<rdf:RDF
-- xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-- xmlns:owl ="http://www.w3.org/2002/07/owl#"
-- xmlns ="http://jena.hpl.hp.com/2003/03/testont"
-- xmlns:mark ="http://jena.hpl.hp.com/2003/03/testont#"
-->
--
--<owl:Ontology rdf:about="">
--</owl:Ontology>
--
--<mark:Marker rdf:ID="c0" />
--
--</rdf:RDF>
++<rdf:RDF
++ xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
++ xmlns:owl ="http://www.w3.org/2002/07/owl#"
++ xmlns ="http://jena.hpl.hp.com/2003/03/testont"
++ xmlns:mark ="http://jena.hpl.hp.com/2003/03/testont#"
++>
++
++<owl:Ontology rdf:about="">
++</owl:Ontology>
++
++<mark:Marker rdf:ID="c0" />
++
++</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/ontology/testImport6/d.owl
----------------------------------------------------------------------
diff --cc jena-core/testing/ontology/testImport6/d.owl
index caa52f0,caa52f0..c3d44bf
--- a/jena-core/testing/ontology/testImport6/d.owl
+++ b/jena-core/testing/ontology/testImport6/d.owl
@@@ -1,15 -1,15 +1,15 @@@
--<rdf:RDF
-- xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-- xmlns:owl ="http://www.w3.org/2002/07/owl#"
-- xmlns ="http://jena.hpl.hp.com/2003/03/testont"
-- xmlns:mark ="http://jena.hpl.hp.com/2003/03/testont#"
-->
--
--<owl:Ontology rdf:about="">
-- <owl:imports rdf:resource="file:testing/ontology/testImport6/c.owl" />
--</owl:Ontology>
--
--<mark:Marker rdf:ID="d0" />
--
--</rdf:RDF>
++<rdf:RDF
++ xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
++ xmlns:owl ="http://www.w3.org/2002/07/owl#"
++ xmlns ="http://jena.hpl.hp.com/2003/03/testont"
++ xmlns:mark ="http://jena.hpl.hp.com/2003/03/testont#"
++>
++
++<owl:Ontology rdf:about="">
++ <owl:imports rdf:resource="file:testing/ontology/testImport6/c.owl" />
++</owl:Ontology>
++
++<mark:Marker rdf:ID="d0" />
++
++</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/ontology/testImport6/readme
----------------------------------------------------------------------
diff --cc jena-core/testing/ontology/testImport6/readme
index 5676f74,5676f74..f1feeb1
--- a/jena-core/testing/ontology/testImport6/readme
+++ b/jena-core/testing/ontology/testImport6/readme
@@@ -1,3 -1,3 +1,3 @@@
--imports graph a -> b -> c
-- a -> d -> c
--
++imports graph a -> b -> c
++ a -> d -> c
++
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/ontology/testImport7/a.owl
----------------------------------------------------------------------
diff --cc jena-core/testing/ontology/testImport7/a.owl
index ff8458d,ff8458d..92ddd70
--- a/jena-core/testing/ontology/testImport7/a.owl
+++ b/jena-core/testing/ontology/testImport7/a.owl
@@@ -1,11 -1,11 +1,11 @@@
--<rdf:RDF
-- xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-- xmlns:owl ="http://www.w3.org/2002/07/owl#"
-- xmlns ="http://jena.hpl.hp.com/2003/03/testont"
-- xmlns:mark ="http://jena.hpl.hp.com/2003/03/testont#"
-->
--
++<rdf:RDF
++ xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
++ xmlns:owl ="http://www.w3.org/2002/07/owl#"
++ xmlns ="http://jena.hpl.hp.com/2003/03/testont"
++ xmlns:mark ="http://jena.hpl.hp.com/2003/03/testont#"
++>
++
<owl:Class rdf:about="#A">
</owl:Class>
@@@ -17,5 -17,5 +17,5 @@@
<rdfs:subClassOf rdf:resource="#B" />
</owl:Class>
--
--</rdf:RDF>
++
++</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/ontology/testImport8/a.owl
----------------------------------------------------------------------
diff --cc jena-core/testing/ontology/testImport8/a.owl
index 231ea3f,231ea3f..35a7f66
--- a/jena-core/testing/ontology/testImport8/a.owl
+++ b/jena-core/testing/ontology/testImport8/a.owl
@@@ -1,25 -1,25 +1,25 @@@
--<rdf:RDF
-- xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-- xmlns:owl ="http://www.w3.org/2002/07/owl#"
-- xmlns ="http://incubator.apache.org/jena/2011/10/testont/a#"
-- xml:base ="http://incubator.apache.org/jena/2011/10/testont/a"
-->
--
--<owl:Ontology rdf:about="">
-- <owl:imports rdf:resource="file:testing/ontology/testImport8/b.owl" />
--</owl:Ontology>
--
--<owl:Class rdf:ID="A">
-- <owl:intersectionOf rdf:parseType="Collection">
-- <rdf:Description rdf:ID="x0" />
-- <rdf:Description rdf:ID="x1" />
-- </owl:intersectionOf>
--</owl:Class>
--
--<owl:Property rdf:ID="p">
-- <rdfs:domain rdf:resource="#x0" />
-- <rdfs:domain rdf:resource="#x1" />
--</owl:Property>
--
--</rdf:RDF>
++<rdf:RDF
++ xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
++ xmlns:owl ="http://www.w3.org/2002/07/owl#"
++ xmlns ="http://incubator.apache.org/jena/2011/10/testont/a#"
++ xml:base ="http://incubator.apache.org/jena/2011/10/testont/a"
++>
++
++<owl:Ontology rdf:about="">
++ <owl:imports rdf:resource="file:testing/ontology/testImport8/b.owl" />
++</owl:Ontology>
++
++<owl:Class rdf:ID="A">
++ <owl:intersectionOf rdf:parseType="Collection">
++ <rdf:Description rdf:ID="x0" />
++ <rdf:Description rdf:ID="x1" />
++ </owl:intersectionOf>
++</owl:Class>
++
++<owl:Property rdf:ID="p">
++ <rdfs:domain rdf:resource="#x0" />
++ <rdfs:domain rdf:resource="#x1" />
++</owl:Property>
++
++</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/ontology/testImport8/b.owl
----------------------------------------------------------------------
diff --cc jena-core/testing/ontology/testImport8/b.owl
index 547b19f,547b19f..dad8a8f
--- a/jena-core/testing/ontology/testImport8/b.owl
+++ b/jena-core/testing/ontology/testImport8/b.owl
@@@ -1,19 -1,19 +1,19 @@@
--<rdf:RDF
-- xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-- xmlns:owl ="http://www.w3.org/2002/07/owl#"
-- xmlns ="http://incubator.apache.org/jena/2011/10/testont/b#"
-- xml:base ="http://incubator.apache.org/jena/2011/10/testont/b"
-->
--
--<owl:Ontology rdf:about="">
--</owl:Ontology>
--
--<owl:Class rdf:ID="B">
-- <owl:intersectionOf rdf:parseType="Collection">
-- <rdf:Description rdf:ID="y0" />
-- <rdf:Description rdf:ID="y1" />
-- </owl:intersectionOf>
--</owl:Class>
--
--</rdf:RDF>
++<rdf:RDF
++ xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
++ xmlns:owl ="http://www.w3.org/2002/07/owl#"
++ xmlns ="http://incubator.apache.org/jena/2011/10/testont/b#"
++ xml:base ="http://incubator.apache.org/jena/2011/10/testont/b"
++>
++
++<owl:Ontology rdf:about="">
++</owl:Ontology>
++
++<owl:Class rdf:ID="B">
++ <owl:intersectionOf rdf:parseType="Collection">
++ <rdf:Description rdf:ID="y0" />
++ <rdf:Description rdf:ID="y1" />
++ </owl:intersectionOf>
++</owl:Class>
++
++</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/reasoners/bugs/sbug.owl
----------------------------------------------------------------------
diff --cc jena-core/testing/reasoners/bugs/sbug.owl
index f37ae99,f37ae99..61001a8
--- a/jena-core/testing/reasoners/bugs/sbug.owl
+++ b/jena-core/testing/reasoners/bugs/sbug.owl
@@@ -1,40 -1,40 +1,40 @@@
--<?xml version="1.0"?>
--<!DOCTYPE owl [
-- <!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#" >
-- <!ENTITY rdfs "http://www.w3.org/2000/01/rdf-schema#" >
-- <!ENTITY xsd "http://www.w3.org/2001/XMLSchema#" >
-- <!ENTITY owl "http://www.w3.org/2002/07/owl#" >
-- <!ENTITY base "http://jena.hpl.hp.com/test" >
-- ]>
--
--<rdf:RDF
-- xmlns:owl ="&owl;"
-- xmlns:rdf ="&rdf;"
-- xmlns:rdfs="&rdfs;"
-- xmlns:dc ="http://purl.org/dc/elements/1.1/"
-- xmlns ="&base;#"
-- xml:base ="&base;"
-- >
--
--
--<owl:Class rdf:ID="Topic">
-- <rdfs:subClassOf rdf:resource="&owl;Class"/>
-- <rdfs:subClassOf>
-- <owl:Restriction>
-- <owl:onProperty rdf:resource="#CreatedBy"/>
-- <owl:cardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:cardinality>
-- </owl:Restriction>
-- </rdfs:subClassOf>
--</owl:Class>
--
--<owl:ObjectProperty rdf:ID="CreatedBy">
--<rdfs:domain rdf:resource="#Topic"/>
--<rdfs:range rdf:resource="#InformationPrincipal"/>
--</owl:ObjectProperty>
--
--<owl:DatatypeProperty rdf:ID="hasCreationDate">
--<rdfs:domain rdf:resource="#InformationFragment"/>
--<rdfs:range rdf:resource="&xsd;dateTime"/>
--</owl:DatatypeProperty>
--
--</rdf:RDF>
++<?xml version="1.0"?>
++<!DOCTYPE owl [
++ <!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#" >
++ <!ENTITY rdfs "http://www.w3.org/2000/01/rdf-schema#" >
++ <!ENTITY xsd "http://www.w3.org/2001/XMLSchema#" >
++ <!ENTITY owl "http://www.w3.org/2002/07/owl#" >
++ <!ENTITY base "http://jena.hpl.hp.com/test" >
++ ]>
++
++<rdf:RDF
++ xmlns:owl ="&owl;"
++ xmlns:rdf ="&rdf;"
++ xmlns:rdfs="&rdfs;"
++ xmlns:dc ="http://purl.org/dc/elements/1.1/"
++ xmlns ="&base;#"
++ xml:base ="&base;"
++ >
++
++
++<owl:Class rdf:ID="Topic">
++ <rdfs:subClassOf rdf:resource="&owl;Class"/>
++ <rdfs:subClassOf>
++ <owl:Restriction>
++ <owl:onProperty rdf:resource="#CreatedBy"/>
++ <owl:cardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:cardinality>
++ </owl:Restriction>
++ </rdfs:subClassOf>
++</owl:Class>
++
++<owl:ObjectProperty rdf:ID="CreatedBy">
++<rdfs:domain rdf:resource="#Topic"/>
++<rdfs:range rdf:resource="#InformationPrincipal"/>
++</owl:ObjectProperty>
++
++<owl:DatatypeProperty rdf:ID="hasCreationDate">
++<rdfs:domain rdf:resource="#InformationFragment"/>
++<rdfs:range rdf:resource="&xsd;dateTime"/>
++</owl:DatatypeProperty>
++
++</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/reasoners/bugs/sbug.rdf
----------------------------------------------------------------------
diff --cc jena-core/testing/reasoners/bugs/sbug.rdf
index 62ce491,62ce491..d5d0b10
--- a/jena-core/testing/reasoners/bugs/sbug.rdf
+++ b/jena-core/testing/reasoners/bugs/sbug.rdf
@@@ -1,25 -1,25 +1,25 @@@
--<?xml version="1.0"?>
--<!DOCTYPE owl [
-- <!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#" >
-- <!ENTITY rdfs "http://www.w3.org/2000/01/rdf-schema#" >
-- <!ENTITY base "http://jena.hpl.hp.com/test" >
-- <!ENTITY clavin "http://jena.hpl.hp.com/test" >
-- <!ENTITY abc "http://jena.hpl.hp.com/test" >
-- ]>
--
--<rdf:RDF
-- xmlns ="&base;#"
-- xml:base ="&base;"
-- xmlns:rdf ="&rdf;"
-- xmlns:rdfs="&rdfs;"
-- xmlns:clavin="&base;#"
-->
--
--<rdf:Description rdf:about="jason6">
--<rdf:type rdf:resource="&clavin;Topic"/>
--<clavin:CreatedBy>jason</clavin:CreatedBy>
--<clavin:CreatedBy>jason2</clavin:CreatedBy>
--<clavin:hasCreationDate>2000-03-04T20:00:00Z</clavin:hasCreationDate>
--</rdf:Description>
--
++<?xml version="1.0"?>
++<!DOCTYPE owl [
++ <!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#" >
++ <!ENTITY rdfs "http://www.w3.org/2000/01/rdf-schema#" >
++ <!ENTITY base "http://jena.hpl.hp.com/test" >
++ <!ENTITY clavin "http://jena.hpl.hp.com/test" >
++ <!ENTITY abc "http://jena.hpl.hp.com/test" >
++ ]>
++
++<rdf:RDF
++ xmlns ="&base;#"
++ xml:base ="&base;"
++ xmlns:rdf ="&rdf;"
++ xmlns:rdfs="&rdfs;"
++ xmlns:clavin="&base;#"
++>
++
++<rdf:Description rdf:about="jason6">
++<rdf:type rdf:resource="&clavin;Topic"/>
++<clavin:CreatedBy>jason</clavin:CreatedBy>
++<clavin:CreatedBy>jason2</clavin:CreatedBy>
++<clavin:hasCreationDate>2000-03-04T20:00:00Z</clavin:hasCreationDate>
++</rdf:Description>
++
</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/reasoners/bugs/userDatatypes.owl
----------------------------------------------------------------------
diff --cc jena-core/testing/reasoners/bugs/userDatatypes.owl
index 0de3da9,0de3da9..b7d735c
--- a/jena-core/testing/reasoners/bugs/userDatatypes.owl
+++ b/jena-core/testing/reasoners/bugs/userDatatypes.owl
@@@ -1,49 -1,49 +1,49 @@@
--<rdf:RDF
-- xmlns:eg="http://jena.hpl.hp.com/eg#"
-- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-- xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
-- xmlns:dt="http://www.daml.org/2001/03/daml+oil-ex-dt#"
-- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-- xmlns:owl="http://www.w3.org/2002/07/owl#">
--
-- <rdfs:Datatype rdf:about="http://www.daml.org/2001/03/daml+oil-ex-dt#over12"/>
--
-- <owl:Class rdf:about="http://jena.hpl.hp.com/eg#Test">
-- <owl:equivalentClass>
-- <owl:Restriction>
-- <owl:someValuesFrom rdf:resource="http://www.w3.org/2001/XMLSchema#decimal"/>
-- <owl:onProperty>
-- <owl:DatatypeProperty rdf:about="http://jena.hpl.hp.com/eg#hasValue"/>
-- </owl:onProperty>
-- </owl:Restriction>
-- </owl:equivalentClass>
-- </owl:Class>
--
-- <owl:Class rdf:about="http://jena.hpl.hp.com/eg#Test2">
-- <owl:equivalentClass>
-- <owl:Restriction>
-- <owl:onProperty rdf:resource="http://jena.hpl.hp.com/eg#hasValue"/>
-- <owl:someValuesFrom rdf:resource="http://www.daml.org/2001/03/daml+oil-ex-dt#over12"/>
-- </owl:Restriction>
-- </owl:equivalentClass>
-- </owl:Class>
--
-- <rdf:Description rdf:about="http://jena.hpl.hp.com/eg#me2">
-- <eg:hasValue rdf:datatype="http://www.daml.org/2001/03/daml+oil-ex-dt#over12"
-- >42</eg:hasValue>
-- </rdf:Description>
--
--<!--
-- <rdf:Description rdf:about="http://jena.hpl.hp.com/eg#me2">
-- <eg:hasValue rdf:datatype="http://www.w3.org/2001/XMLSchema#decimal"
-- >42</eg:hasValue>
-- </rdf:Description>
---->
--
-- <rdf:Description rdf:about="http://jena.hpl.hp.com/eg#me">
-- <eg:hasValue rdf:datatype="http://www.w3.org/2001/XMLSchema#decimal"
-- >42</eg:hasValue>
-- </rdf:Description>
--
--</rdf:RDF>
--
++<rdf:RDF
++ xmlns:eg="http://jena.hpl.hp.com/eg#"
++ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++ xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
++ xmlns:dt="http://www.daml.org/2001/03/daml+oil-ex-dt#"
++ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
++ xmlns:owl="http://www.w3.org/2002/07/owl#">
++
++ <rdfs:Datatype rdf:about="http://www.daml.org/2001/03/daml+oil-ex-dt#over12"/>
++
++ <owl:Class rdf:about="http://jena.hpl.hp.com/eg#Test">
++ <owl:equivalentClass>
++ <owl:Restriction>
++ <owl:someValuesFrom rdf:resource="http://www.w3.org/2001/XMLSchema#decimal"/>
++ <owl:onProperty>
++ <owl:DatatypeProperty rdf:about="http://jena.hpl.hp.com/eg#hasValue"/>
++ </owl:onProperty>
++ </owl:Restriction>
++ </owl:equivalentClass>
++ </owl:Class>
++
++ <owl:Class rdf:about="http://jena.hpl.hp.com/eg#Test2">
++ <owl:equivalentClass>
++ <owl:Restriction>
++ <owl:onProperty rdf:resource="http://jena.hpl.hp.com/eg#hasValue"/>
++ <owl:someValuesFrom rdf:resource="http://www.daml.org/2001/03/daml+oil-ex-dt#over12"/>
++ </owl:Restriction>
++ </owl:equivalentClass>
++ </owl:Class>
++
++ <rdf:Description rdf:about="http://jena.hpl.hp.com/eg#me2">
++ <eg:hasValue rdf:datatype="http://www.daml.org/2001/03/daml+oil-ex-dt#over12"
++ >42</eg:hasValue>
++ </rdf:Description>
++
++<!--
++ <rdf:Description rdf:about="http://jena.hpl.hp.com/eg#me2">
++ <eg:hasValue rdf:datatype="http://www.w3.org/2001/XMLSchema#decimal"
++ >42</eg:hasValue>
++ </rdf:Description>
++-->
++
++ <rdf:Description rdf:about="http://jena.hpl.hp.com/eg#me">
++ <eg:hasValue rdf:datatype="http://www.w3.org/2001/XMLSchema#decimal"
++ >42</eg:hasValue>
++ </rdf:Description>
++
++</rdf:RDF>
++
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/reasoners/include.rules
----------------------------------------------------------------------
diff --cc jena-core/testing/reasoners/include.rules
index 5cfe69c,5cfe69c..af90a5a
--- a/jena-core/testing/reasoners/include.rules
+++ b/jena-core/testing/reasoners/include.rules
@@@ -1,5 -1,5 +1,5 @@@
--// Define an axiomatic rule to include in the rule parser test
--
--@prefix p: <http://jena.hpl.hp.com/newprefix3#>
--
---> (p:a p:a p:a).
++// Define an axiomatic rule to include in the rule parser test
++
++@prefix p: <http://jena.hpl.hp.com/newprefix3#>
++
++-> (p:a p:a p:a).
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/reasoners/owl/inconsistent7.rdf
----------------------------------------------------------------------
diff --cc jena-core/testing/reasoners/owl/inconsistent7.rdf
index 15706b5,15706b5..40ab708
--- a/jena-core/testing/reasoners/owl/inconsistent7.rdf
+++ b/jena-core/testing/reasoners/owl/inconsistent7.rdf
@@@ -1,29 -1,29 +1,29 @@@
--<?xml version='1.0' encoding='ISO-8859-1'?>
--
--<!DOCTYPE rdf:RDF [
-- <!ENTITY xsd 'http://www.w3.org/2001/XMLSchema#'>
--]>
--
--<!--
-- Two distinct literal values for a functional property, via a sameAs
-- -->
--
--<rdf:RDF
-- xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-- xmlns:dc ="http://purl.org/dc/elements/1.1/"
-- xmlns:owl ="http://www.w3.org/2002/07/owl#"
-- xmlns ="http://jena.hpl.hp.com/testing/reasoners/owl#"
-- xml:base ="http://jena.hpl.hp.com/testing/reasoners/owl"
-->
--
-- <A rdf:ID="ia">
-- <dfp rdf:datatype="&xsd;int">3</dfp>
-- </A>
--
-- <A rdf:ID="ib">
-- <dfp rdf:datatype="&xsd;int">-1</dfp>
-- <owl:sameAs rdf:resource="#ia" />
-- </A>
--
--</rdf:RDF>
++<?xml version='1.0' encoding='ISO-8859-1'?>
++
++<!DOCTYPE rdf:RDF [
++ <!ENTITY xsd 'http://www.w3.org/2001/XMLSchema#'>
++]>
++
++<!--
++ Two distinct literal values for a functional property, via a sameAs
++ -->
++
++<rdf:RDF
++ xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
++ xmlns:dc ="http://purl.org/dc/elements/1.1/"
++ xmlns:owl ="http://www.w3.org/2002/07/owl#"
++ xmlns ="http://jena.hpl.hp.com/testing/reasoners/owl#"
++ xml:base ="http://jena.hpl.hp.com/testing/reasoners/owl"
++>
++
++ <A rdf:ID="ia">
++ <dfp rdf:datatype="&xsd;int">3</dfp>
++ </A>
++
++ <A rdf:ID="ib">
++ <dfp rdf:datatype="&xsd;int">-1</dfp>
++ <owl:sameAs rdf:resource="#ia" />
++ </A>
++
++</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/reasoners/owl/nondetbug.rdf
----------------------------------------------------------------------
diff --cc jena-core/testing/reasoners/owl/nondetbug.rdf
index 33ce19f,33ce19f..a4a677d
--- a/jena-core/testing/reasoners/owl/nondetbug.rdf
+++ b/jena-core/testing/reasoners/owl/nondetbug.rdf
@@@ -1,32 -1,32 +1,32 @@@
--<?xml version='1.0' encoding='ISO-8859-1'?>
--
--<!DOCTYPE rdf:RDF [
-- <!ENTITY xsd 'http://www.w3.org/2001/XMLSchema#'>
--]>
--
--<rdf:RDF
-- xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-- xmlns:dc ="http://purl.org/dc/elements/1.1/"
-- xmlns:owl ="http://www.w3.org/2002/07/owl#"
-- xmlns ="http://jena.hpl.hp.com/testing/reasoners/owl#"
-- xml:base ="http://jena.hpl.hp.com/testing/reasoners/owl"
-->
-- <owl:Class rdf:ID="A">
--
-- <owl:disjointWith>
-- <rdf:Description rdf:about="#B"/>
-- </owl:disjointWith>
--
-- </owl:Class>
--
-- <owl:Class rdf:ID="B" >
-- </owl:Class>
--
-- <A rdf:ID="ia">
-- </A>
--
-- <B rdf:about="#ia" />
--
--
--</rdf:RDF>
++<?xml version='1.0' encoding='ISO-8859-1'?>
++
++<!DOCTYPE rdf:RDF [
++ <!ENTITY xsd 'http://www.w3.org/2001/XMLSchema#'>
++]>
++
++<rdf:RDF
++ xmlns:rdf ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
++ xmlns:dc ="http://purl.org/dc/elements/1.1/"
++ xmlns:owl ="http://www.w3.org/2002/07/owl#"
++ xmlns ="http://jena.hpl.hp.com/testing/reasoners/owl#"
++ xml:base ="http://jena.hpl.hp.com/testing/reasoners/owl"
++>
++ <owl:Class rdf:ID="A">
++
++ <owl:disjointWith>
++ <rdf:Description rdf:about="#B"/>
++ </owl:disjointWith>
++
++ </owl:Class>
++
++ <owl:Class rdf:ID="B" >
++ </owl:Class>
++
++ <A rdf:ID="ia">
++ </A>
++
++ <B rdf:about="#ia" />
++
++
++</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/reasoners/owl/nondetbug.rules
----------------------------------------------------------------------
diff --cc jena-core/testing/reasoners/owl/nondetbug.rules
index 8fabf5a,8fabf5a..fd38aee
--- a/jena-core/testing/reasoners/owl/nondetbug.rules
+++ b/jena-core/testing/reasoners/owl/nondetbug.rules
@@@ -1,20 -1,20 +1,20 @@@
--#------------------------------------------------------------------
--# Tracking down non-deterministic bug.
--#
--# $Id: owl-fb.rules,v 1.45 2004/03/02 13:38:53 der Exp $
--#------------------------------------------------------------------
--
---> table(rdf:type).
--
--[rdfs9-alt: (?a rdf:type ?y) <- (?a rdf:type ?x) (?x rdfs:subClassOf ?y) ]
--
--[distinct1: (?X owl:differentFrom ?Y) <-
-- (?C owl:disjointWith ?D), (?X rdf:type ?C), (?Y rdf:type ?D) ]
--
--[validationIndiv0: (?X rb:violation 'dummy1')
-- <- (?X owl:differentFrom ?Y), (?X owl:sameAs ?Y) ]
--
--[validationIndiv: (?I rb:violation 'found')
-- <- (?I rdf:type http://jena.hpl.hp.com/testing/reasoners/owl#A),
-- (?I rdf:type http://jena.hpl.hp.com/testing/reasoners/owl#B)]
++#------------------------------------------------------------------
++# Tracking down non-deterministic bug.
++#
++# $Id: owl-fb.rules,v 1.45 2004/03/02 13:38:53 der Exp $
++#------------------------------------------------------------------
++
++-> table(rdf:type).
++
++[rdfs9-alt: (?a rdf:type ?y) <- (?a rdf:type ?x) (?x rdfs:subClassOf ?y) ]
++
++[distinct1: (?X owl:differentFrom ?Y) <-
++ (?C owl:disjointWith ?D), (?X rdf:type ?C), (?Y rdf:type ?D) ]
++
++[validationIndiv0: (?X rb:violation 'dummy1')
++ <- (?X owl:differentFrom ?Y), (?X owl:sameAs ?Y) ]
++
++[validationIndiv: (?I rb:violation 'found')
++ <- (?I rdf:type http://jena.hpl.hp.com/testing/reasoners/owl#A),
++ (?I rdf:type http://jena.hpl.hp.com/testing/reasoners/owl#B)]
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/reasoners/rdfs/data1.rdf
----------------------------------------------------------------------
diff --cc jena-core/testing/reasoners/rdfs/data1.rdf
index f0fe82a,f0fe82a..a43bf1b
--- a/jena-core/testing/reasoners/rdfs/data1.rdf
+++ b/jena-core/testing/reasoners/rdfs/data1.rdf
@@@ -1,18 -1,18 +1,18 @@@
--<?xml version="1.0"?>
--
--<!DOCTYPE rdf:RDF [
-- <!ENTITY eg 'http://www.hpl.hp.com/semweb/2003/eg#'>
-- <!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
--]>
--
--<rdf:RDF xmlns:rdf="&rdf;" xmlns="⪚">
--
-- <rdf:Description rdf:about="⪚a">
-- <r rdf:resource="⪚b"/>
-- </rdf:Description>
--
-- <rdf:Description rdf:about="⪚c">
-- <r rdf:resource="⪚d"/>
-- </rdf:Description>
--
--</rdf:RDF>
++<?xml version="1.0"?>
++
++<!DOCTYPE rdf:RDF [
++ <!ENTITY eg 'http://www.hpl.hp.com/semweb/2003/eg#'>
++ <!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
++]>
++
++<rdf:RDF xmlns:rdf="&rdf;" xmlns="⪚">
++
++ <rdf:Description rdf:about="⪚a">
++ <r rdf:resource="⪚b"/>
++ </rdf:Description>
++
++ <rdf:Description rdf:about="⪚c">
++ <r rdf:resource="⪚d"/>
++ </rdf:Description>
++
++</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/reasoners/rdfs/data2.rdf
----------------------------------------------------------------------
diff --cc jena-core/testing/reasoners/rdfs/data2.rdf
index fe84c10,fe84c10..aba9be2
--- a/jena-core/testing/reasoners/rdfs/data2.rdf
+++ b/jena-core/testing/reasoners/rdfs/data2.rdf
@@@ -1,19 -1,19 +1,19 @@@
--<?xml version="1.0"?>
--
--<!DOCTYPE rdf:RDF [
-- <!ENTITY eg 'http://www.hpl.hp.com/semweb/2003/eg#'>
-- <!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
--]>
--
--<rdf:RDF xmlns:rdf="&rdf;" xmlns="⪚">
--
-- <rdf:Description rdf:about="⪚a">
-- <p rdf:resource="⪚b"/>
-- <fubar>Hello world</fubar>
-- </rdf:Description>
--
-- <rdf:Description rdf:about="⪚c">
-- <p rdf:resource="⪚d"/>
-- </rdf:Description>
--
--</rdf:RDF>
++<?xml version="1.0"?>
++
++<!DOCTYPE rdf:RDF [
++ <!ENTITY eg 'http://www.hpl.hp.com/semweb/2003/eg#'>
++ <!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
++]>
++
++<rdf:RDF xmlns:rdf="&rdf;" xmlns="⪚">
++
++ <rdf:Description rdf:about="⪚a">
++ <p rdf:resource="⪚b"/>
++ <fubar>Hello world</fubar>
++ </rdf:Description>
++
++ <rdf:Description rdf:about="⪚c">
++ <p rdf:resource="⪚d"/>
++ </rdf:Description>
++
++</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/reasoners/rdfs/data3.rdf
----------------------------------------------------------------------
diff --cc jena-core/testing/reasoners/rdfs/data3.rdf
index 356ad78,356ad78..4f114f1
--- a/jena-core/testing/reasoners/rdfs/data3.rdf
+++ b/jena-core/testing/reasoners/rdfs/data3.rdf
@@@ -1,27 -1,27 +1,27 @@@
--<?xml version="1.0"?>
--
--<!DOCTYPE rdf:RDF [
-- <!ENTITY eg 'http://www.hpl.hp.com/semweb/2003/eg#'>
-- <!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
--]>
--
--<rdf:RDF xmlns:rdf="&rdf;" xmlns="⪚">
--
-- <rdf:Description rdf:about="⪚a">
-- <p rdf:resource="⪚b"/>
-- <fubar>Hello world</fubar>
-- </rdf:Description>
--
--
-- <rdf:Description rdf:about="⪚course">
-- <students>
-- <rdf:Bag>
-- <rdf:li rdf:resource="eg;Amy"/>
-- <rdf:li rdf:resource="eg;Tim"/>
-- <rdf:li rdf:resource="eg;John"/>
-- </rdf:Bag>
-- </students>
-- </rdf:Description>
--
--
--</rdf:RDF>
++<?xml version="1.0"?>
++
++<!DOCTYPE rdf:RDF [
++ <!ENTITY eg 'http://www.hpl.hp.com/semweb/2003/eg#'>
++ <!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
++]>
++
++<rdf:RDF xmlns:rdf="&rdf;" xmlns="⪚">
++
++ <rdf:Description rdf:about="⪚a">
++ <p rdf:resource="⪚b"/>
++ <fubar>Hello world</fubar>
++ </rdf:Description>
++
++
++ <rdf:Description rdf:about="⪚course">
++ <students>
++ <rdf:Bag>
++ <rdf:li rdf:resource="eg;Amy"/>
++ <rdf:li rdf:resource="eg;Tim"/>
++ <rdf:li rdf:resource="eg;John"/>
++ </rdf:Bag>
++ </students>
++ </rdf:Description>
++
++
++</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/reasoners/rdfs/dttest1.nt
----------------------------------------------------------------------
diff --cc jena-core/testing/reasoners/rdfs/dttest1.nt
index 8922b1a,8922b1a..693c571
--- a/jena-core/testing/reasoners/rdfs/dttest1.nt
+++ b/jena-core/testing/reasoners/rdfs/dttest1.nt
@@@ -1,2 -1,2 +1,2 @@@
--<http://www.hpl.hp.com/semweb/2003/eg#foo> <http://www.hpl.hp.com/semweb/2003/eg#bar> "25" .
--<http://www.hpl.hp.com/semweb/2003/eg#bar> <http://www.w3.org/2000/01/rdf-schema#range> <http://www.w3.org/2001/XMLSchema#integer> .
++<http://www.hpl.hp.com/semweb/2003/eg#foo> <http://www.hpl.hp.com/semweb/2003/eg#bar> "25" .
++<http://www.hpl.hp.com/semweb/2003/eg#bar> <http://www.w3.org/2000/01/rdf-schema#range> <http://www.w3.org/2001/XMLSchema#integer> .
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/reasoners/rdfs/dttest2.nt
----------------------------------------------------------------------
diff --cc jena-core/testing/reasoners/rdfs/dttest2.nt
index ff3c232,ff3c232..91fe3eb
--- a/jena-core/testing/reasoners/rdfs/dttest2.nt
+++ b/jena-core/testing/reasoners/rdfs/dttest2.nt
@@@ -1,2 -1,2 +1,2 @@@
--<http://www.hpl.hp.com/semweb/2003/eg#foo> <http://www.hpl.hp.com/semweb/2003/eg#bar> "25.5"^^<http://www.w3.org/2001/XMLSchema#decimal> .
--<http://www.hpl.hp.com/semweb/2003/eg#bar> <http://www.w3.org/2000/01/rdf-schema#range> <http://www.w3.org/2001/XMLSchema#integer> .
++<http://www.hpl.hp.com/semweb/2003/eg#foo> <http://www.hpl.hp.com/semweb/2003/eg#bar> "25.5"^^<http://www.w3.org/2001/XMLSchema#decimal> .
++<http://www.hpl.hp.com/semweb/2003/eg#bar> <http://www.w3.org/2000/01/rdf-schema#range> <http://www.w3.org/2001/XMLSchema#integer> .
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/reasoners/rdfs/dttest3.nt
----------------------------------------------------------------------
diff --cc jena-core/testing/reasoners/rdfs/dttest3.nt
index f822506,f822506..ce1331a
--- a/jena-core/testing/reasoners/rdfs/dttest3.nt
+++ b/jena-core/testing/reasoners/rdfs/dttest3.nt
@@@ -1,2 -1,2 +1,2 @@@
--<http://www.hpl.hp.com/semweb/2003/eg#foo> <http://www.hpl.hp.com/semweb/2003/eg#bar> "25"^^<http://www.w3.org/2001/XMLSchema#decimal> .
--<http://www.hpl.hp.com/semweb/2003/eg#bar> <http://www.w3.org/2000/01/rdf-schema#range> <http://www.w3.org/2001/XMLSchema#integer> .
++<http://www.hpl.hp.com/semweb/2003/eg#foo> <http://www.hpl.hp.com/semweb/2003/eg#bar> "25"^^<http://www.w3.org/2001/XMLSchema#decimal> .
++<http://www.hpl.hp.com/semweb/2003/eg#bar> <http://www.w3.org/2000/01/rdf-schema#range> <http://www.w3.org/2001/XMLSchema#integer> .
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/reasoners/rdfs/manifest-nodirect.rdf
----------------------------------------------------------------------
diff --cc jena-core/testing/reasoners/rdfs/manifest-nodirect.rdf
index 9de273c,9de273c..29d2d17
--- a/jena-core/testing/reasoners/rdfs/manifest-nodirect.rdf
+++ b/jena-core/testing/reasoners/rdfs/manifest-nodirect.rdf
@@@ -1,175 -1,175 +1,175 @@@
--<?xml version="1.0"?>
--
--<!DOCTYPE rdf:RDF [
-- <!ENTITY test 'http://www.hpl.hp.com/semweb/2003/query_tester#'>
-- <!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
--]>
--
--<rdf:RDF xmlns:rdf="&rdf;" xmlns="&test;">
--
-- <Test rdf:about="test1">
-- <description>RDFS reasoner: range test, wildcard</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data1.rdf</data>
-- <query>rdfs/query-res.nt</query>
-- <result>rdfs/result1.rdf</result>
-- </Test>
--
-- <Test rdf:about="test2">
-- <description>RDFS reasoner: range test, ground</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data1.rdf</data>
-- <query>rdfs/query2.nt</query>
-- <result>rdfs/result2.rdf</result>
-- </Test>
--
-- <Test rdf:about="test3">
-- <description>RDFS reasoner: simple subProp case, wildcard</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query3.nt</query>
-- <result>rdfs/result3.rdf</result>
-- </Test>
--
-- <Test rdf:about="test4">
-- <description>RDFS reasoner: simple subProp case, ground subject</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query4.nt</query>
-- <result>rdfs/result4.rdf</result>
-- </Test>
--
-- <Test rdf:about="test5">
-- <description>RDFS reasoner: simple subProp case, ground object</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query5.nt</query>
-- <result>rdfs/result4.rdf</result>
-- </Test>
--
-- <Test rdf:about="test6">
-- <description>RDFS reasoner: range test, ground, with subProp</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query2.nt</query>
-- <result>rdfs/result2.rdf</result>
-- </Test>
--
-- <Test rdf:about="test7">
-- <description>RDFS reasoner: domain test, ground, with subProp</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query7.nt</query>
-- <result>rdfs/result7.rdf</result>
-- </Test>
--
-- <Test rdf:about="test8">
-- <description>RDFS reasoner: domain test, wildcard, with subProp</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query8.nt</query>
-- <result>rdfs/result8.rdf</result>
-- </Test>
--
-- <Test rdf:about="test9">
-- <description>RDFS reasoner: range test, ground, with subProp and subClass</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query9.nt</query>
-- <result>rdfs/result9.rdf</result>
-- </Test>
--
-- <Test rdf:about="test10">
-- <description>RDFS reasoner: range test, wildcard, with subProp and subClass</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query10.nt</query>
-- <result>rdfs/result10.rdf</result>
-- </Test>
--
-- <Test rdf:about="test11">
-- <description>RDFS reasoner: wildcard type, with subProp and subClass</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query11.nt</query>
-- <result>rdfs/result11.rdf</result>
-- </Test>
--
-- <Test rdf:about="test12">
-- <description>RDFS reasoner: list all Resources</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query12.nt</query>
-- <result>rdfs/result12.rdf</result>
-- </Test>
--
-- <Test rdf:about="test13">
-- <description>RDFS reasoner: list all Properties</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query13.nt</query>
-- <result>rdfs/result13.rdf</result>
-- </Test>
--
-- <Test rdf:about="test14">
-- <description>RDFS reasoner: ground case of type Resource test</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query14.nt</query>
-- <result>rdfs/result14.rdf</result>
-- </Test>
--
-- <Test rdf:about="test15">
-- <description>RDFS reasoner: ground case of type Property test</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query15.nt</query>
-- <result>rdfs/result15.rdf</result>
-- </Test>
--
--
-- <Test rdf:about="test16">
-- <description>RDFS reasoner: enumerate all Classes</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query16.nt</query>
-- <result>rdfs/result16.rdf</result>
-- </Test>
--
--<!-- skip for now - rule reasoner doesn't support membership properties
-- <Test rdf:about="test17">
-- <description>RDFS reasoner: container property rules</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data3.rdf</data>
-- <query>rdfs/query17.nt</query>
-- <result>rdfs/result17.rdf</result>
-- </Test>
---->
--
-- <Test rdf:about="test18">
-- <description>RDFS reasoner: wildcard predicate, ground subject in query</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query18.nt</query>
-- <result>rdfs/result18.rdf</result>
-- </Test>
--
--<!-- skip for now - code works, test is wrong result19-nodirect needs to get a whole lot bigger
-- <Test rdf:about="test19">
-- <description>RDFS reasoner: list everything</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query19.nt</query>
-- <result>rdfs/result19-nodirect.rdf</result>
-- </Test>
---->
--
-- <Test rdf:about="test20">
-- <description>RDFS reasoner: wildcard predicate, ground Class subject</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query20.nt</query>
-- <result>rdfs/result20-nodirect.rdf</result>
-- </Test>
--
--</rdf:RDF>
++<?xml version="1.0"?>
++
++<!DOCTYPE rdf:RDF [
++ <!ENTITY test 'http://www.hpl.hp.com/semweb/2003/query_tester#'>
++ <!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
++]>
++
++<rdf:RDF xmlns:rdf="&rdf;" xmlns="&test;">
++
++ <Test rdf:about="test1">
++ <description>RDFS reasoner: range test, wildcard</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data1.rdf</data>
++ <query>rdfs/query-res.nt</query>
++ <result>rdfs/result1.rdf</result>
++ </Test>
++
++ <Test rdf:about="test2">
++ <description>RDFS reasoner: range test, ground</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data1.rdf</data>
++ <query>rdfs/query2.nt</query>
++ <result>rdfs/result2.rdf</result>
++ </Test>
++
++ <Test rdf:about="test3">
++ <description>RDFS reasoner: simple subProp case, wildcard</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query3.nt</query>
++ <result>rdfs/result3.rdf</result>
++ </Test>
++
++ <Test rdf:about="test4">
++ <description>RDFS reasoner: simple subProp case, ground subject</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query4.nt</query>
++ <result>rdfs/result4.rdf</result>
++ </Test>
++
++ <Test rdf:about="test5">
++ <description>RDFS reasoner: simple subProp case, ground object</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query5.nt</query>
++ <result>rdfs/result4.rdf</result>
++ </Test>
++
++ <Test rdf:about="test6">
++ <description>RDFS reasoner: range test, ground, with subProp</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query2.nt</query>
++ <result>rdfs/result2.rdf</result>
++ </Test>
++
++ <Test rdf:about="test7">
++ <description>RDFS reasoner: domain test, ground, with subProp</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query7.nt</query>
++ <result>rdfs/result7.rdf</result>
++ </Test>
++
++ <Test rdf:about="test8">
++ <description>RDFS reasoner: domain test, wildcard, with subProp</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query8.nt</query>
++ <result>rdfs/result8.rdf</result>
++ </Test>
++
++ <Test rdf:about="test9">
++ <description>RDFS reasoner: range test, ground, with subProp and subClass</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query9.nt</query>
++ <result>rdfs/result9.rdf</result>
++ </Test>
++
++ <Test rdf:about="test10">
++ <description>RDFS reasoner: range test, wildcard, with subProp and subClass</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query10.nt</query>
++ <result>rdfs/result10.rdf</result>
++ </Test>
++
++ <Test rdf:about="test11">
++ <description>RDFS reasoner: wildcard type, with subProp and subClass</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query11.nt</query>
++ <result>rdfs/result11.rdf</result>
++ </Test>
++
++ <Test rdf:about="test12">
++ <description>RDFS reasoner: list all Resources</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query12.nt</query>
++ <result>rdfs/result12.rdf</result>
++ </Test>
++
++ <Test rdf:about="test13">
++ <description>RDFS reasoner: list all Properties</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query13.nt</query>
++ <result>rdfs/result13.rdf</result>
++ </Test>
++
++ <Test rdf:about="test14">
++ <description>RDFS reasoner: ground case of type Resource test</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query14.nt</query>
++ <result>rdfs/result14.rdf</result>
++ </Test>
++
++ <Test rdf:about="test15">
++ <description>RDFS reasoner: ground case of type Property test</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query15.nt</query>
++ <result>rdfs/result15.rdf</result>
++ </Test>
++
++
++ <Test rdf:about="test16">
++ <description>RDFS reasoner: enumerate all Classes</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query16.nt</query>
++ <result>rdfs/result16.rdf</result>
++ </Test>
++
++<!-- skip for now - rule reasoner doesn't support membership properties
++ <Test rdf:about="test17">
++ <description>RDFS reasoner: container property rules</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data3.rdf</data>
++ <query>rdfs/query17.nt</query>
++ <result>rdfs/result17.rdf</result>
++ </Test>
++-->
++
++ <Test rdf:about="test18">
++ <description>RDFS reasoner: wildcard predicate, ground subject in query</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query18.nt</query>
++ <result>rdfs/result18.rdf</result>
++ </Test>
++
++<!-- skip for now - code works, test is wrong result19-nodirect needs to get a whole lot bigger
++ <Test rdf:about="test19">
++ <description>RDFS reasoner: list everything</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query19.nt</query>
++ <result>rdfs/result19-nodirect.rdf</result>
++ </Test>
++-->
++
++ <Test rdf:about="test20">
++ <description>RDFS reasoner: wildcard predicate, ground Class subject</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query20.nt</query>
++ <result>rdfs/result20-nodirect.rdf</result>
++ </Test>
++
++</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/reasoners/rdfs/manifest.rdf
----------------------------------------------------------------------
diff --cc jena-core/testing/reasoners/rdfs/manifest.rdf
index 78930ea,78930ea..a957af6
--- a/jena-core/testing/reasoners/rdfs/manifest.rdf
+++ b/jena-core/testing/reasoners/rdfs/manifest.rdf
@@@ -1,189 -1,189 +1,189 @@@
--<?xml version="1.0"?>
--
--<!DOCTYPE rdf:RDF [
-- <!ENTITY test 'http://www.hpl.hp.com/semweb/2003/query_tester#'>
-- <!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
--]>
--
--<rdf:RDF xmlns:rdf="&rdf;" xmlns="&test;">
--
-- <Test rdf:about="test1">
-- <description>RDFS reasoner: range test, wildcard</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data1.rdf</data>
-- <query>rdfs/query-res.nt</query>
-- <result>rdfs/result1.rdf</result>
-- </Test>
--
-- <Test rdf:about="test2">
-- <description>RDFS reasoner: range test, ground</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data1.rdf</data>
-- <query>rdfs/query2.nt</query>
-- <result>rdfs/result2.rdf</result>
-- </Test>
--
-- <Test rdf:about="test3">
-- <description>RDFS reasoner: simple subProp case, wildcard</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query3.nt</query>
-- <result>rdfs/result3.rdf</result>
-- </Test>
--
-- <Test rdf:about="test4">
-- <description>RDFS reasoner: simple subProp case, ground subject</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query4.nt</query>
-- <result>rdfs/result4.rdf</result>
-- </Test>
--
-- <Test rdf:about="test5">
-- <description>RDFS reasoner: simple subProp case, ground object</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query5.nt</query>
-- <result>rdfs/result4.rdf</result>
-- </Test>
--
-- <Test rdf:about="test6">
-- <description>RDFS reasoner: range test, ground, with subProp</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query2.nt</query>
-- <result>rdfs/result2.rdf</result>
-- </Test>
--
-- <Test rdf:about="test7">
-- <description>RDFS reasoner: domain test, ground, with subProp</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query7.nt</query>
-- <result>rdfs/result7.rdf</result>
-- </Test>
--
-- <Test rdf:about="test8">
-- <description>RDFS reasoner: domain test, wildcard, with subProp</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query8.nt</query>
-- <result>rdfs/result8.rdf</result>
-- </Test>
--
-- <Test rdf:about="test9">
-- <description>RDFS reasoner: range test, ground, with subProp and subClass</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query9.nt</query>
-- <result>rdfs/result9.rdf</result>
-- </Test>
--
-- <Test rdf:about="test10">
-- <description>RDFS reasoner: range test, wildcard, with subProp and subClass</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query10.nt</query>
-- <result>rdfs/result10.rdf</result>
-- </Test>
--
-- <Test rdf:about="test11">
-- <description>RDFS reasoner: wildcard type, with subProp and subClass</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query11.nt</query>
-- <result>rdfs/result11.rdf</result>
-- </Test>
--
-- <Test rdf:about="test12">
-- <description>RDFS reasoner: list all Resources</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query12.nt</query>
-- <result>rdfs/result12.rdf</result>
-- </Test>
--
-- <Test rdf:about="test13">
-- <description>RDFS reasoner: list all Properties</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query13.nt</query>
-- <result>rdfs/result13.rdf</result>
-- </Test>
--
-- <Test rdf:about="test14">
-- <description>RDFS reasoner: ground case of type Resource test</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query14.nt</query>
-- <result>rdfs/result14.rdf</result>
-- </Test>
--
-- <Test rdf:about="test15">
-- <description>RDFS reasoner: ground case of type Property test</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query15.nt</query>
-- <result>rdfs/result15.rdf</result>
-- </Test>
--
--
-- <Test rdf:about="test16">
-- <description>RDFS reasoner: enumerate all Classes</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query16.nt</query>
-- <result>rdfs/result16.rdf</result>
-- </Test>
--
-- <Test rdf:about="test17">
-- <description>RDFS reasoner: container property rules</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data3.rdf</data>
-- <query>rdfs/query17.nt</query>
-- <result>rdfs/result17.rdf</result>
-- </Test>
--
-- <Test rdf:about="test18">
-- <description>RDFS reasoner: wildcard predicate, ground subject in query</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query18.nt</query>
-- <result>rdfs/result18.rdf</result>
-- </Test>
--
--<!-- skip for now - test result set is wrong
-- <Test rdf:about="test19">
-- <description>RDFS reasoner: list everything</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query19.nt</query>
-- <result>rdfs/result19-nodirect.rdf</result>
-- </Test>
---->
--
-- <Test rdf:about="test20">
-- <description>RDFS reasoner: wildcard predicate, ground Class subject</description>
-- <tbox>rdfs/tbox1.rdf</tbox>
-- <data>rdfs/data2.rdf</data>
-- <query>rdfs/query20.nt</query>
-- <result>rdfs/result20-nodirect.rdf</result>
-- </Test>
--
-- <Test rdf:about="test21">
-- <description>RDFS reasoner - owl full axioms for domain on empty model</description>
-- <tbox>rdfs/empty.rdf</tbox>
-- <data>rdfs/empty.rdf</data>
-- <query>rdfs/query21.nt</query>
-- <result>rdfs/result21.rdf</result>
-- </Test>
--
-- <Test rdf:about="test22">
-- <description>RDFS reasoner - owl full axioms for range on empty model</description>
-- <tbox>rdfs/empty.rdf</tbox>
-- <data>rdfs/empty.rdf</data>
-- <query>rdfs/query22.nt</query>
-- <result>rdfs/result22.rdf</result>
-- </Test>
--
--</rdf:RDF>
++<?xml version="1.0"?>
++
++<!DOCTYPE rdf:RDF [
++ <!ENTITY test 'http://www.hpl.hp.com/semweb/2003/query_tester#'>
++ <!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
++]>
++
++<rdf:RDF xmlns:rdf="&rdf;" xmlns="&test;">
++
++ <Test rdf:about="test1">
++ <description>RDFS reasoner: range test, wildcard</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data1.rdf</data>
++ <query>rdfs/query-res.nt</query>
++ <result>rdfs/result1.rdf</result>
++ </Test>
++
++ <Test rdf:about="test2">
++ <description>RDFS reasoner: range test, ground</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data1.rdf</data>
++ <query>rdfs/query2.nt</query>
++ <result>rdfs/result2.rdf</result>
++ </Test>
++
++ <Test rdf:about="test3">
++ <description>RDFS reasoner: simple subProp case, wildcard</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query3.nt</query>
++ <result>rdfs/result3.rdf</result>
++ </Test>
++
++ <Test rdf:about="test4">
++ <description>RDFS reasoner: simple subProp case, ground subject</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query4.nt</query>
++ <result>rdfs/result4.rdf</result>
++ </Test>
++
++ <Test rdf:about="test5">
++ <description>RDFS reasoner: simple subProp case, ground object</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query5.nt</query>
++ <result>rdfs/result4.rdf</result>
++ </Test>
++
++ <Test rdf:about="test6">
++ <description>RDFS reasoner: range test, ground, with subProp</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query2.nt</query>
++ <result>rdfs/result2.rdf</result>
++ </Test>
++
++ <Test rdf:about="test7">
++ <description>RDFS reasoner: domain test, ground, with subProp</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query7.nt</query>
++ <result>rdfs/result7.rdf</result>
++ </Test>
++
++ <Test rdf:about="test8">
++ <description>RDFS reasoner: domain test, wildcard, with subProp</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query8.nt</query>
++ <result>rdfs/result8.rdf</result>
++ </Test>
++
++ <Test rdf:about="test9">
++ <description>RDFS reasoner: range test, ground, with subProp and subClass</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query9.nt</query>
++ <result>rdfs/result9.rdf</result>
++ </Test>
++
++ <Test rdf:about="test10">
++ <description>RDFS reasoner: range test, wildcard, with subProp and subClass</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query10.nt</query>
++ <result>rdfs/result10.rdf</result>
++ </Test>
++
++ <Test rdf:about="test11">
++ <description>RDFS reasoner: wildcard type, with subProp and subClass</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query11.nt</query>
++ <result>rdfs/result11.rdf</result>
++ </Test>
++
++ <Test rdf:about="test12">
++ <description>RDFS reasoner: list all Resources</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query12.nt</query>
++ <result>rdfs/result12.rdf</result>
++ </Test>
++
++ <Test rdf:about="test13">
++ <description>RDFS reasoner: list all Properties</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query13.nt</query>
++ <result>rdfs/result13.rdf</result>
++ </Test>
++
++ <Test rdf:about="test14">
++ <description>RDFS reasoner: ground case of type Resource test</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query14.nt</query>
++ <result>rdfs/result14.rdf</result>
++ </Test>
++
++ <Test rdf:about="test15">
++ <description>RDFS reasoner: ground case of type Property test</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query15.nt</query>
++ <result>rdfs/result15.rdf</result>
++ </Test>
++
++
++ <Test rdf:about="test16">
++ <description>RDFS reasoner: enumerate all Classes</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query16.nt</query>
++ <result>rdfs/result16.rdf</result>
++ </Test>
++
++ <Test rdf:about="test17">
++ <description>RDFS reasoner: container property rules</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data3.rdf</data>
++ <query>rdfs/query17.nt</query>
++ <result>rdfs/result17.rdf</result>
++ </Test>
++
++ <Test rdf:about="test18">
++ <description>RDFS reasoner: wildcard predicate, ground subject in query</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query18.nt</query>
++ <result>rdfs/result18.rdf</result>
++ </Test>
++
++<!-- skip for now - test result set is wrong
++ <Test rdf:about="test19">
++ <description>RDFS reasoner: list everything</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query19.nt</query>
++ <result>rdfs/result19-nodirect.rdf</result>
++ </Test>
++-->
++
++ <Test rdf:about="test20">
++ <description>RDFS reasoner: wildcard predicate, ground Class subject</description>
++ <tbox>rdfs/tbox1.rdf</tbox>
++ <data>rdfs/data2.rdf</data>
++ <query>rdfs/query20.nt</query>
++ <result>rdfs/result20-nodirect.rdf</result>
++ </Test>
++
++ <Test rdf:about="test21">
++ <description>RDFS reasoner - owl full axioms for domain on empty model</description>
++ <tbox>rdfs/empty.rdf</tbox>
++ <data>rdfs/empty.rdf</data>
++ <query>rdfs/query21.nt</query>
++ <result>rdfs/result21.rdf</result>
++ </Test>
++
++ <Test rdf:about="test22">
++ <description>RDFS reasoner - owl full axioms for range on empty model</description>
++ <tbox>rdfs/empty.rdf</tbox>
++ <data>rdfs/empty.rdf</data>
++ <query>rdfs/query22.nt</query>
++ <result>rdfs/result22.rdf</result>
++ </Test>
++
++</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/reasoners/rdfs/query-res.nt
----------------------------------------------------------------------
diff --cc jena-core/testing/reasoners/rdfs/query-res.nt
index 6abdccd,6abdccd..36f3d04
--- a/jena-core/testing/reasoners/rdfs/query-res.nt
+++ b/jena-core/testing/reasoners/rdfs/query-res.nt
@@@ -1,4 -1,4 +1,4 @@@
--# Test query for rdfs reasoner
--# List (*,type,C1)
--####################################
--<var:x> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.hpl.hp.com/semweb/2003/eg#C1> .
++# Test query for rdfs reasoner
++# List (*,type,C1)
++####################################
++<var:x> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.hpl.hp.com/semweb/2003/eg#C1> .
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/reasoners/rdfs/query10.nt
----------------------------------------------------------------------
diff --cc jena-core/testing/reasoners/rdfs/query10.nt
index 2082f14,2082f14..10a6eb8
--- a/jena-core/testing/reasoners/rdfs/query10.nt
+++ b/jena-core/testing/reasoners/rdfs/query10.nt
@@@ -1,3 -1,3 +1,3 @@@
--# List (b,type,*)
--####################################
--<http://www.hpl.hp.com/semweb/2003/eg#b> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <var:x> .
++# List (b,type,*)
++####################################
++<http://www.hpl.hp.com/semweb/2003/eg#b> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <var:x> .
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/reasoners/rdfs/query11.nt
----------------------------------------------------------------------
diff --cc jena-core/testing/reasoners/rdfs/query11.nt
index 5d41a99,5d41a99..8e3f576
--- a/jena-core/testing/reasoners/rdfs/query11.nt
+++ b/jena-core/testing/reasoners/rdfs/query11.nt
@@@ -1,3 -1,3 +1,3 @@@
--# List (*,type,*)
--####################################
--<var:x> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <var:y> .
++# List (*,type,*)
++####################################
++<var:x> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <var:y> .
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/reasoners/rdfs/query12.nt
----------------------------------------------------------------------
diff --cc jena-core/testing/reasoners/rdfs/query12.nt
index 9857119,9857119..8000100
--- a/jena-core/testing/reasoners/rdfs/query12.nt
+++ b/jena-core/testing/reasoners/rdfs/query12.nt
@@@ -1,3 -1,3 +1,3 @@@
--# List (*,type,Resource)
--####################################
--<var:x> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#Resource> .
++# List (*,type,Resource)
++####################################
++<var:x> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#Resource> .
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/reasoners/rdfs/query13.nt
----------------------------------------------------------------------
diff --cc jena-core/testing/reasoners/rdfs/query13.nt
index 10fceb5,10fceb5..250d651
--- a/jena-core/testing/reasoners/rdfs/query13.nt
+++ b/jena-core/testing/reasoners/rdfs/query13.nt
@@@ -1,3 -1,3 +1,3 @@@
--# List (*,type,Property)
--####################################
--<var:x> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Property> .
++# List (*,type,Property)
++####################################
++<var:x> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Property> .
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/reasoners/rdfs/query14.nt
----------------------------------------------------------------------
diff --cc jena-core/testing/reasoners/rdfs/query14.nt
index 1bb3e6e,1bb3e6e..cedb011
--- a/jena-core/testing/reasoners/rdfs/query14.nt
+++ b/jena-core/testing/reasoners/rdfs/query14.nt
@@@ -1,3 -1,3 +1,3 @@@
--# List (a,type,Resource)
--####################################
--<http://www.hpl.hp.com/semweb/2003/eg#a> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#Resource> .
++# List (a,type,Resource)
++####################################
++<http://www.hpl.hp.com/semweb/2003/eg#a> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#Resource> .
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/reasoners/rdfs/query15.nt
----------------------------------------------------------------------
diff --cc jena-core/testing/reasoners/rdfs/query15.nt
index 01517f0,01517f0..6cb2618
--- a/jena-core/testing/reasoners/rdfs/query15.nt
+++ b/jena-core/testing/reasoners/rdfs/query15.nt
@@@ -1,3 -1,3 +1,3 @@@
--# List (p,type,Property)
--####################################
--<http://www.hpl.hp.com/semweb/2003/eg#p> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Property> .
++# List (p,type,Property)
++####################################
++<http://www.hpl.hp.com/semweb/2003/eg#p> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Property> .
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/reasoners/rdfs/query16.nt
----------------------------------------------------------------------
diff --cc jena-core/testing/reasoners/rdfs/query16.nt
index 69f907a,69f907a..95be21f
--- a/jena-core/testing/reasoners/rdfs/query16.nt
+++ b/jena-core/testing/reasoners/rdfs/query16.nt
@@@ -1,3 -1,3 +1,3 @@@
--# List (*,type,Class)
--####################################
--<var:x> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#Class> .
++# List (*,type,Class)
++####################################
++<var:x> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#Class> .
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/reasoners/rdfs/query17.nt
----------------------------------------------------------------------
diff --cc jena-core/testing/reasoners/rdfs/query17.nt
index f1f7cb8,f1f7cb8..f942844
--- a/jena-core/testing/reasoners/rdfs/query17.nt
+++ b/jena-core/testing/reasoners/rdfs/query17.nt
@@@ -1,5 -1,5 +1,5 @@@
--# List (*,type,ContainerMembershipProperty)
--# + (*,subPropertyOf member)
--####################################
--<var:x> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#ContainerMembershipProperty> .
--<var:y> <http://www.w3.org/2000/01/rdf-schema#subPropertyOf> <http://www.w3.org/2000/01/rdf-schema#member> .
++# List (*,type,ContainerMembershipProperty)
++# + (*,subPropertyOf member)
++####################################
++<var:x> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#ContainerMembershipProperty> .
++<var:y> <http://www.w3.org/2000/01/rdf-schema#subPropertyOf> <http://www.w3.org/2000/01/rdf-schema#member> .
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/reasoners/rdfs/query18.nt
----------------------------------------------------------------------
diff --cc jena-core/testing/reasoners/rdfs/query18.nt
index 9ce3c16,9ce3c16..831a8d4
--- a/jena-core/testing/reasoners/rdfs/query18.nt
+++ b/jena-core/testing/reasoners/rdfs/query18.nt
@@@ -1,4 -1,4 +1,4 @@@
--# List (a, * , *)
--####################################
--<http://www.hpl.hp.com/semweb/2003/eg#a> <var:x> <var:y> .
--
++# List (a, * , *)
++####################################
++<http://www.hpl.hp.com/semweb/2003/eg#a> <var:x> <var:y> .
++
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/reasoners/rdfs/query19.nt
----------------------------------------------------------------------
diff --cc jena-core/testing/reasoners/rdfs/query19.nt
index 070add5,070add5..52b1939
--- a/jena-core/testing/reasoners/rdfs/query19.nt
+++ b/jena-core/testing/reasoners/rdfs/query19.nt
@@@ -1,5 -1,5 +1,5 @@@
--# List (*,*,*)
--####################################
--<var:x> <var:y> <var:z> .
--
--
++# List (*,*,*)
++####################################
++<var:x> <var:y> <var:z> .
++
++
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/reasoners/rdfs/query2.nt
----------------------------------------------------------------------
diff --cc jena-core/testing/reasoners/rdfs/query2.nt
index b236eaa,b236eaa..07fe471
--- a/jena-core/testing/reasoners/rdfs/query2.nt
+++ b/jena-core/testing/reasoners/rdfs/query2.nt
@@@ -1,4 -1,4 +1,4 @@@
--# List (b,type,C1)
--####################################
--<http://www.hpl.hp.com/semweb/2003/eg#b> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.hpl.hp.com/semweb/2003/eg#C1> .
--
++# List (b,type,C1)
++####################################
++<http://www.hpl.hp.com/semweb/2003/eg#b> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.hpl.hp.com/semweb/2003/eg#C1> .
++
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/reasoners/rdfs/query20.nt
----------------------------------------------------------------------
diff --cc jena-core/testing/reasoners/rdfs/query20.nt
index 79692b6,79692b6..5798caf
--- a/jena-core/testing/reasoners/rdfs/query20.nt
+++ b/jena-core/testing/reasoners/rdfs/query20.nt
@@@ -1,4 -1,4 +1,4 @@@
--# List (C1, * , *)
--####################################
--<http://www.hpl.hp.com/semweb/2003/eg#C1> <var:x> <var:y> .
--
++# List (C1, * , *)
++####################################
++<http://www.hpl.hp.com/semweb/2003/eg#C1> <var:x> <var:y> .
++
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/reasoners/rdfs/query21.nt
----------------------------------------------------------------------
diff --cc jena-core/testing/reasoners/rdfs/query21.nt
index f476df1,f476df1..4d78a19
--- a/jena-core/testing/reasoners/rdfs/query21.nt
+++ b/jena-core/testing/reasoners/rdfs/query21.nt
@@@ -1,3 -1,3 +1,3 @@@
--# List (*, rdfs:domain, *)
--####################################
--<var:x> <http://www.w3.org/2000/01/rdf-schema#domain> <var:y> .
++# List (*, rdfs:domain, *)
++####################################
++<var:x> <http://www.w3.org/2000/01/rdf-schema#domain> <var:y> .
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/reasoners/rdfs/query22.nt
----------------------------------------------------------------------
diff --cc jena-core/testing/reasoners/rdfs/query22.nt
index 11d21e2,11d21e2..2df0ca5
--- a/jena-core/testing/reasoners/rdfs/query22.nt
+++ b/jena-core/testing/reasoners/rdfs/query22.nt
@@@ -1,3 -1,3 +1,3 @@@
--# List (*, rdfs:range, *)
--####################################
--<var:x> <http://www.w3.org/2000/01/rdf-schema#range> <var:y> .
++# List (*, rdfs:range, *)
++####################################
++<var:x> <http://www.w3.org/2000/01/rdf-schema#range> <var:y> .
http://git-wip-us.apache.org/repos/asf/jena/blob/4b5cd267/jena-core/testing/reasoners/rdfs/query3.nt
----------------------------------------------------------------------
diff --cc jena-core/testing/reasoners/rdfs/query3.nt
index 5133686,5133686..ec9be42
--- a/jena-core/testing/reasoners/rdfs/query3.nt
+++ b/jena-core/testing/reasoners/rdfs/query3.nt
@@@ -1,4 -1,4 +1,4 @@@
--# List (*, r, *)
--####################################
--<var:x> <http://www.hpl.hp.com/semweb/2003/eg#r> <var:y> .
--
++# List (*, r, *)
++####################################
++<var:x> <http://www.hpl.hp.com/semweb/2003/eg#r> <var:y> .
++