[Mulgara-svn] r1607 - in branches/consistency: . jxdata/iTQL jxdata/iTQL/rdfs-dl jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty jxdata/iTQL/rdfs-dl/rdfs-domain-and-range jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf jxdata/iTQL/rdfs-dl/rdfs-subClassOf-a-Property jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics jxdata/iTQL/rdfs-dl/rdfs-transitive-subSubProperty jxdata/iTQL/rdfs-dl/statement-entailment src/jar/query/java/org/mulgara/query src/jar/query/java/org/mulgara/query/filter src/jar/query/java/org/mulgara/query/filter/arithmetic src/jar/query/java/org/mulgara/query/filter/value src/jar/querylang/java/org/mulgara/itql src/jar/querylang/java/org/mulgara/sparql src/jar/querylang/java/org/mulgara/sparql/parser/cst src/jar/resolver-lucene src/jar/resolver-lucene/java/org/mulgara/resolver/lucene src/jar/tuples/java/org/mulgara/store/tuples
pag at mulgara.org
pag at mulgara.org
Thu Mar 12 22:52:20 UTC 2009
Author: pag
Date: 2009-03-12 15:52:17 -0700 (Thu, 12 Mar 2009)
New Revision: 1607
Added:
branches/consistency/jxdata/iTQL/rdfs-dl/
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/Manifest.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/loadResult1.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1C.n3
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1C.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1P.n3
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1P.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/queryResult1.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/ruleResult1.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/test.jxu
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/Manifest.n3
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/Manifest.nt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/Manifest.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/axioms.n3
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/conjunction-test
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult1.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult2.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult3.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult4.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult5.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/mulgara-readme.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/nonconclusions005.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/nonconclusions006.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/premises005.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/premises006.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult1.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult2.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult7.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult8.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResultCommon.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/readme.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/ruleResult1.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test.jxu
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test001.nt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test001.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test002.nt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test002.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test003.nt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test003.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test004.nt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test004.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/Manifest.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/loadResult1.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/queryResult3.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/queryResultCommon.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/ruleResult1.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/test.jxu
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/test001.nt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/test001.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/Manifest.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/loadResult1.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/queryResult3.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/queryResultCommon.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/ruleResult1.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/test.jxu
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/test001.nt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/test001.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subClassOf-a-Property/
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subClassOf-a-Property/Manifest.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subClassOf-a-Property/mulgara-readme.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subClassOf-a-Property/test001.nt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/Manifest.n3
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/Manifest.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/loadResult1.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/mulgara-readme.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/queryResult1.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/queryResult2.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/ruleResult1.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test.jxu
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test001.nt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test001.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test002.nt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test002.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-transitive-subSubProperty/
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-transitive-subSubProperty/mulgara-readme.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-transitive-subSubProperty/test001.nt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-transitive-subSubProperty/test001.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/
branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/Manifest.n3
branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/Manifest.nt
branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/Manifest.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/loadResult1.txt
branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/loadResult2.txt
branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/queryResult1.txt
branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/queryResult2.txt
branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/ruleResult1.txt
branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test.jxu
branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test001
branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test001a.nt
branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test001b.nt
branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test002a.nt
branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test002b.nt
branches/consistency/src/jar/query/java/org/mulgara/query/filter/CompoundStatementUnitTest.java
branches/consistency/src/jar/query/java/org/mulgara/query/filter/InequalityComparisonUnitTest.java
Removed:
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/Manifest.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/loadResult1.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1C.n3
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1C.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1P.n3
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1P.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/queryResult1.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/ruleResult1.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/test.jxu
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/Manifest.n3
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/Manifest.nt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/Manifest.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/axioms.n3
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/conjunction-test
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult1.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult2.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult3.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult4.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult5.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/mulgara-readme.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/nonconclusions005.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/nonconclusions006.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/premises005.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/premises006.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult1.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult2.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult7.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult8.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResultCommon.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/readme.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/ruleResult1.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test.jxu
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test001.nt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test001.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test002.nt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test002.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test003.nt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test003.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test004.nt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test004.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/Manifest.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/loadResult1.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/queryResult3.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/queryResultCommon.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/ruleResult1.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/test.jxu
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/test001.nt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/test001.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/Manifest.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/loadResult1.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/queryResult3.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/queryResultCommon.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/ruleResult1.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/test.jxu
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/test001.nt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/test001.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subClassOf-a-Property/
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subClassOf-a-Property/Manifest.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subClassOf-a-Property/mulgara-readme.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subClassOf-a-Property/test001.nt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/Manifest.n3
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/Manifest.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/loadResult1.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/mulgara-readme.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/queryResult1.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/queryResult2.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/ruleResult1.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test.jxu
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test001.nt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test001.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test002.nt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test002.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-transitive-subSubProperty/
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-transitive-subSubProperty/mulgara-readme.txt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-transitive-subSubProperty/test001.nt
branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-transitive-subSubProperty/test001.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/
branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/Manifest.n3
branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/Manifest.nt
branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/Manifest.rdf
branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/loadResult1.txt
branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/loadResult2.txt
branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/queryResult1.txt
branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/queryResult2.txt
branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/ruleResult1.txt
branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test.jxu
branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test001
branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test001a.nt
branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test001b.nt
branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test002a.nt
branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test002b.nt
Modified:
branches/consistency/common.properties
branches/consistency/src/jar/query/java/org/mulgara/query/Query.java
branches/consistency/src/jar/query/java/org/mulgara/query/filter/AbstractContextOwner.java
branches/consistency/src/jar/query/java/org/mulgara/query/filter/AbstractFilterValue.java
branches/consistency/src/jar/query/java/org/mulgara/query/filter/ContextOwner.java
branches/consistency/src/jar/query/java/org/mulgara/query/filter/EqualityComparisonUnitTest.java
branches/consistency/src/jar/query/java/org/mulgara/query/filter/Filter.java
branches/consistency/src/jar/query/java/org/mulgara/query/filter/NotEquals.java
branches/consistency/src/jar/query/java/org/mulgara/query/filter/RDFTerm.java
branches/consistency/src/jar/query/java/org/mulgara/query/filter/TestContext.java
branches/consistency/src/jar/query/java/org/mulgara/query/filter/TestContextOwner.java
branches/consistency/src/jar/query/java/org/mulgara/query/filter/arithmetic/AbstractNumericOperation.java
branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/AbstractComparable.java
branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/AbstractComparableLiteral.java
branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/BlankNodeValue.java
branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/BlankNodeValueUnitTest.java
branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/IRI.java
branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/NumericLiteral.java
branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/NumericLiteralUnitTest.java
branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/SimpleLiteral.java
branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/TypedLiteral.java
branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/Var.java
branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/VarUnitTest.java
branches/consistency/src/jar/querylang/java/org/mulgara/itql/TqlSession.java
branches/consistency/src/jar/querylang/java/org/mulgara/sparql/FilterMapper.java
branches/consistency/src/jar/querylang/java/org/mulgara/sparql/parser/cst/DecimalLiteral.java
branches/consistency/src/jar/resolver-lucene/build.xml
branches/consistency/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/FullTextStringIndexTuples.java
branches/consistency/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneResolverUnitTest.java
branches/consistency/src/jar/tuples/java/org/mulgara/store/tuples/FilteredTuples.java
branches/consistency/src/jar/tuples/java/org/mulgara/store/tuples/LeftJoin.java
Log:
merged in trunk to 1606
Modified: branches/consistency/common.properties
===================================================================
--- branches/consistency/common.properties 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/common.properties 2009-03-12 22:52:17 UTC (rev 1607)
@@ -51,7 +51,7 @@
arch.bits=-Dnoop
# VM argument for component test
-jvm.args=-Xmx640M
+jvm.args=-Xmx768M
# test server arguments; can be set with -Dtest.server.args=... on the command line
test.server.args=
Copied: branches/consistency/jxdata/iTQL/rdfs-dl (from rev 1606, trunk/jxdata/iTQL/rdfs-dl)
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty)
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/Manifest.rdf
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/Manifest.rdf 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/Manifest.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-
-<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:test="http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#"
->
-
-<test:NegativeEntailmentTest rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-container-membership-superProperty/Manifest.rdf#test001">
-
- <!-- <test:issue rdf:resource="" /> -->
- <test:status>APPROVED</test:status>
- <test:approval rdf:resource="http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2003Jan/0025.html" />
-
- <!-- <test:approval rdf:resource="http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2002Feb/0476.html" /> -->
- <test:description>
- While it is a superproperty,
- _:a <rdfs:contains (@@member?)> _:b .
- does NOT entail
- _:a <rdf:_n> _:b .
- for any _n.
- </test:description>
-
- <test:entailmentRules rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#" />
- <test:entailmentRules rdf:resource="http://www.w3.org/2000/01/rdf-schema#" />
-
- <test:premiseDocument>
- <test:RDF-XML-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-container-membership-superProperty/not1P.rdf" />
- </test:premiseDocument>
-
- <test:conclusionDocument>
- <test:RDF-XML-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-container-membership-superProperty/not1C.rdf" />
- </test:conclusionDocument>
-
-</test:NegativeEntailmentTest>
-
-
-
-</rdf:RDF>
-
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/Manifest.rdf (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/Manifest.rdf)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/Manifest.rdf (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/Manifest.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+
+<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:test="http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#"
+>
+
+<test:NegativeEntailmentTest rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-container-membership-superProperty/Manifest.rdf#test001">
+
+ <!-- <test:issue rdf:resource="" /> -->
+ <test:status>APPROVED</test:status>
+ <test:approval rdf:resource="http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2003Jan/0025.html" />
+
+ <!-- <test:approval rdf:resource="http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2002Feb/0476.html" /> -->
+ <test:description>
+ While it is a superproperty,
+ _:a <rdfs:contains (@@member?)> _:b .
+ does NOT entail
+ _:a <rdf:_n> _:b .
+ for any _n.
+ </test:description>
+
+ <test:entailmentRules rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#" />
+ <test:entailmentRules rdf:resource="http://www.w3.org/2000/01/rdf-schema#" />
+
+ <test:premiseDocument>
+ <test:RDF-XML-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-container-membership-superProperty/not1P.rdf" />
+ </test:premiseDocument>
+
+ <test:conclusionDocument>
+ <test:RDF-XML-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-container-membership-superProperty/not1C.rdf" />
+ </test:conclusionDocument>
+
+</test:NegativeEntailmentTest>
+
+
+
+</rdf:RDF>
+
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/loadResult1.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/loadResult1.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/loadResult1.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully loaded 1 statements from @baseuri@/jxdata/iTQL/rdfs/rdfs-container-membership-superProperty/not1P.rdf into @server@#test</message></query></answer>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/loadResult1.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/loadResult1.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/loadResult1.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/loadResult1.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully loaded 1 statements from @baseuri@/jxdata/iTQL/rdfs/rdfs-container-membership-superProperty/not1P.rdf into @server@#test</message></query></answer>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1C.n3
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1C.n3 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1C.n3 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,4 +0,0 @@
- at prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
- at prefix : <http://example/stuff#>.
-
-:something rdf:_1 :somethingElse.
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1C.n3 (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1C.n3)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1C.n3 (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1C.n3 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,4 @@
+ at prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
+ at prefix : <http://example/stuff#>.
+
+:something rdf:_1 :somethingElse.
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1C.rdf
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1C.rdf 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1C.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,13 +0,0 @@
-
-<!-- Processed by Id: cwm.py,v 1.92 2002/03/22 21:36:00 timbl Exp -->
-<!-- using base bogus:-->
-
-
-<rdf:RDF xmlns="http://example/stuff#"
- xmlns:log="http://www.w3.org/2000/10/swap/log#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-
- <rdf:Description rdf:about="http://example/stuff#something">
- <rdf:_1 rdf:resource="http://example/stuff#somethingElse"/>
- </rdf:Description>
-</rdf:RDF>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1C.rdf (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1C.rdf)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1C.rdf (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1C.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,13 @@
+
+<!-- Processed by Id: cwm.py,v 1.92 2002/03/22 21:36:00 timbl Exp -->
+<!-- using base bogus:-->
+
+
+<rdf:RDF xmlns="http://example/stuff#"
+ xmlns:log="http://www.w3.org/2000/10/swap/log#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+
+ <rdf:Description rdf:about="http://example/stuff#something">
+ <rdf:_1 rdf:resource="http://example/stuff#somethingElse"/>
+ </rdf:Description>
+</rdf:RDF>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1P.n3
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1P.n3 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1P.n3 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,4 +0,0 @@
- at prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
- at prefix : <http://example/stuff#>.
-
-:something rdfs:member :somethingElse.
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1P.n3 (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1P.n3)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1P.n3 (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1P.n3 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,4 @@
+ at prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
+ at prefix : <http://example/stuff#>.
+
+:something rdfs:member :somethingElse.
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1P.rdf
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1P.rdf 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1P.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,14 +0,0 @@
-
-<!-- Processed by Id: cwm.py,v 1.92 2002/03/22 21:36:00 timbl Exp -->
-<!-- using base bogus:-->
-
-
-<rdf:RDF xmlns="http://example/stuff#"
- xmlns:log="http://www.w3.org/2000/10/swap/log#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#">
-
- <rdf:Description rdf:about="http://example/stuff#something">
- <rdfs:member rdf:resource="http://example/stuff#somethingElse"/>
- </rdf:Description>
-</rdf:RDF>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1P.rdf (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1P.rdf)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1P.rdf (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/not1P.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,14 @@
+
+<!-- Processed by Id: cwm.py,v 1.92 2002/03/22 21:36:00 timbl Exp -->
+<!-- using base bogus:-->
+
+
+<rdf:RDF xmlns="http://example/stuff#"
+ xmlns:log="http://www.w3.org/2000/10/swap/log#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#">
+
+ <rdf:Description rdf:about="http://example/stuff#something">
+ <rdfs:member rdf:resource="http://example/stuff#somethingElse"/>
+ </rdf:Description>
+</rdf:RDF>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/queryResult1.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/queryResult1.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/queryResult1.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><variables><p/></variables><solution><p resource="http://www.w3.org/2000/01/rdf-schema#member"/></solution></query></answer>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/queryResult1.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/queryResult1.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/queryResult1.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/queryResult1.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><variables><p/></variables><solution><p resource="http://www.w3.org/2000/01/rdf-schema#member"/></solution></query></answer>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/ruleResult1.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/ruleResult1.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/ruleResult1.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully applied @baseuri@/rules/rdfs.dl to @server@#test</message></query></answer>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/ruleResult1.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/ruleResult1.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/ruleResult1.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/ruleResult1.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully applied @baseuri@/rules/rdfs.dl to @server@#test</message></query></answer>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/test.jxu
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/test.jxu 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/test.jxu 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,35 +0,0 @@
-<jxu>
- <set name="debug" value="false" />
-
- <set name="modelName" value="@server@#test" />
- <set name="loadCommand" value="load <@baseuri@/jxdata/iTQL/rdfs/rdfs-container-membership-superProperty/not1P.rdf> into <@server@#test> ;" />
- <eval stepClass="org.mulgara.store.jxunit.LoadDataJX" />
-
- <ifEqual converse="true" file="loadResult1.txt" name="loadResult">
- <save name="loadResult" file="badLoadResult1.xml"/>
- <fail>Output failed loading test data. Check badLoadResult1.xml for output.</fail>
- </ifEqual>
-
-
- <set name="query"
- value="apply <@baseuri@/rules/rdfs.dl> to <@server@#test> ;"/>
-
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <ifEqual converse="true" file="ruleResult1.txt" name="queryResult">
- <save name="queryResult" file="badRule1Result.xml"/>
- <fail>Output failed applying rules. Check badRule1Result.xml for output.</fail>
- </ifEqual>
-
-
- <set name="query"
- value="select $p
- from <@server@#test>
- where <http://example/stuff#something> $p <http://example/stuff#somethingElse> ;"/>
-
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <ifEqual converse="true" file="queryResult1.txt" name="queryResult">
- <save name="queryResult" file="badQuery1Result.xml"/>
- <fail>Output failed for first test. Check badQuery1Result.xml for output.</fail>
- </ifEqual>
-
-</jxu>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/test.jxu (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/test.jxu)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/test.jxu (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-container-membership-superProperty/test.jxu 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,35 @@
+<jxu>
+ <set name="debug" value="false" />
+
+ <set name="modelName" value="@server@#test" />
+ <set name="loadCommand" value="load <@baseuri@/jxdata/iTQL/rdfs/rdfs-container-membership-superProperty/not1P.rdf> into <@server@#test> ;" />
+ <eval stepClass="org.mulgara.store.jxunit.LoadDataJX" />
+
+ <ifEqual converse="true" file="loadResult1.txt" name="loadResult">
+ <save name="loadResult" file="badLoadResult1.xml"/>
+ <fail>Output failed loading test data. Check badLoadResult1.xml for output.</fail>
+ </ifEqual>
+
+
+ <set name="query"
+ value="apply <@baseuri@/rules/rdfs.dl> to <@server@#test> ;"/>
+
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+ <ifEqual converse="true" file="ruleResult1.txt" name="queryResult">
+ <save name="queryResult" file="badRule1Result.xml"/>
+ <fail>Output failed applying rules. Check badRule1Result.xml for output.</fail>
+ </ifEqual>
+
+
+ <set name="query"
+ value="select $p
+ from <@server@#test>
+ where <http://example/stuff#something> $p <http://example/stuff#somethingElse> ;"/>
+
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+ <ifEqual converse="true" file="queryResult1.txt" name="queryResult">
+ <save name="queryResult" file="badQuery1Result.xml"/>
+ <fail>Output failed for first test. Check badQuery1Result.xml for output.</fail>
+ </ifEqual>
+
+</jxu>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range)
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/Manifest.n3
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/Manifest.n3 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/Manifest.n3 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,86 +0,0 @@
-# $Id: Manifest.n3,v 1.1 2005/07/03 13:11:01 pgearon Exp $
-# PxButton | test | Euler Manifest.n3 Manifest.n3 |
-
-#Processed by Id: cwm.py,v 1.92 2002/03/22 21:36:00 timbl Exp
- # using base file:/www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/Manifest.rdf
-
-# Notation3 generation by
-# notation3.py,v 1.107 2002/03/22 21:36:00 timbl Exp
-
-# Base was: file:/www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/Manifest.rdf
- @prefix : <http://www.w3.org/2000/03/rdf-tracking/#> .
- @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
- @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
- @prefix test: <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#> .
-
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/conjunction-test> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#PositiveEntailmentTest>;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#conclusionDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004.nt>;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#description> """
-Should a property be allowed more than one rdfs:range property?
-What should the semantics of multiple domain and range properties be?
-
--> Multiple domain and range constraints are permissable
- and will have conjunctive semantics.
-
-test001
- describes a property with rdfs:domain the intersection of 2 domains
-test002
- describes a property with rdfs:range the intersection of 2 ranges
-test003
- sample statement
-test004
- entailed description using test001, test002, test003 and
- the rules for RDF and RDFS entailment
- (see http://www.w3.org/2000/10/rdf-tests/rdfcore/entailment/ )
- """;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#entailmentRules> rdf:,
- rdfs:;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#issue> :rdfs-domain-and-range;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#premiseDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001.nt>,
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002.nt>,
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003.nt>;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#status> "NOT_APPROVED" .
-
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#PositiveParserTest>;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#approval> <http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2001Oct/0405.html>;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#inputDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001.rdf>;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#issue> :rdfs-domain-and-range;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#outputDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001.nt>;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#status> "APPROVED" .
-
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001.nt> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NT-Document> .
-
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001.rdf> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#RDF-XML-Document> .
-
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#PositiveParserTest>;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#approval> <http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2001Oct/0405.html>;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#inputDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002.rdf>;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#issue> :rdfs-domain-and-range;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#outputDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002.nt>;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#status> "APPROVED" .
-
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002.nt> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NT-Document> .
-
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002.rdf> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#RDF-XML-Document> .
-
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#PositiveParserTest>;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#inputDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003.rdf>;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#issue> :rdfs-domain-and-range;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#outputDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003.nt>;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#status> "NOT_APPROVED" .
-
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003.nt> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NT-Document> .
-
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003.rdf> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#RDF-XML-Document> .
-
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#PositiveParserTest>;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#inputDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004.rdf>;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#issue> :rdfs-domain-and-range;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#outputDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004.nt>;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#status> "NOT_APPROVED" .
-
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004.nt> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NT-Document> .
-
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004.rdf> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#RDF-XML-Document> .
-
-#ENDS
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/Manifest.n3 (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/Manifest.n3)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/Manifest.n3 (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/Manifest.n3 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,86 @@
+# $Id: Manifest.n3,v 1.1 2005/07/03 13:11:01 pgearon Exp $
+# PxButton | test | Euler Manifest.n3 Manifest.n3 |
+
+#Processed by Id: cwm.py,v 1.92 2002/03/22 21:36:00 timbl Exp
+ # using base file:/www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/Manifest.rdf
+
+# Notation3 generation by
+# notation3.py,v 1.107 2002/03/22 21:36:00 timbl Exp
+
+# Base was: file:/www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/Manifest.rdf
+ @prefix : <http://www.w3.org/2000/03/rdf-tracking/#> .
+ @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+ @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+ @prefix test: <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#> .
+
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/conjunction-test> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#PositiveEntailmentTest>;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#conclusionDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004.nt>;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#description> """
+Should a property be allowed more than one rdfs:range property?
+What should the semantics of multiple domain and range properties be?
+
+-> Multiple domain and range constraints are permissable
+ and will have conjunctive semantics.
+
+test001
+ describes a property with rdfs:domain the intersection of 2 domains
+test002
+ describes a property with rdfs:range the intersection of 2 ranges
+test003
+ sample statement
+test004
+ entailed description using test001, test002, test003 and
+ the rules for RDF and RDFS entailment
+ (see http://www.w3.org/2000/10/rdf-tests/rdfcore/entailment/ )
+ """;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#entailmentRules> rdf:,
+ rdfs:;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#issue> :rdfs-domain-and-range;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#premiseDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001.nt>,
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002.nt>,
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003.nt>;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#status> "NOT_APPROVED" .
+
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#PositiveParserTest>;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#approval> <http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2001Oct/0405.html>;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#inputDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001.rdf>;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#issue> :rdfs-domain-and-range;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#outputDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001.nt>;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#status> "APPROVED" .
+
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001.nt> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NT-Document> .
+
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001.rdf> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#RDF-XML-Document> .
+
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#PositiveParserTest>;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#approval> <http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2001Oct/0405.html>;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#inputDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002.rdf>;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#issue> :rdfs-domain-and-range;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#outputDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002.nt>;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#status> "APPROVED" .
+
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002.nt> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NT-Document> .
+
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002.rdf> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#RDF-XML-Document> .
+
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#PositiveParserTest>;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#inputDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003.rdf>;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#issue> :rdfs-domain-and-range;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#outputDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003.nt>;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#status> "NOT_APPROVED" .
+
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003.nt> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NT-Document> .
+
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003.rdf> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#RDF-XML-Document> .
+
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#PositiveParserTest>;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#inputDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004.rdf>;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#issue> :rdfs-domain-and-range;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#outputDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004.nt>;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#status> "NOT_APPROVED" .
+
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004.nt> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NT-Document> .
+
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004.rdf> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#RDF-XML-Document> .
+
+#ENDS
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/Manifest.nt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/Manifest.nt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/Manifest.nt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,40 +0,0 @@
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001.nt> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NT-Document> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/conjunction-test> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#entailmentRules> <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002.nt> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NT-Document> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#issue> <http://www.w3.org/2000/03/rdf-tracking/#rdfs-domain-and-range> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#issue> <http://www.w3.org/2000/03/rdf-tracking/#rdfs-domain-and-range> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001.rdf> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#RDF-XML-Document> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#issue> <http://www.w3.org/2000/03/rdf-tracking/#rdfs-domain-and-range> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/conjunction-test> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#PositiveEntailmentTest> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#issue> <http://www.w3.org/2000/03/rdf-tracking/#rdfs-domain-and-range> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#inputDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004.rdf> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/conjunction-test> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#status> "NOT_APPROVED" .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/conjunction-test> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#description> "\nShould a property be allowed more than one rdfs:range property?\nWhat should the semantics of multiple domain and range properties be?\n\n-> Multiple domain and range constraints are permissable\n and will have conjunctive semantics.\n\ntest001\n describes a property with rdfs:domain the intersection of 2 domains\ntest002\n describes a property with rdfs:range the intersection of 2 ranges\ntest003\n sample statement\ntest004\n entailed description using test001, test002, test003 and\n the rules for RDF and RDFS entailment\n (see http://www.w3.org/2000/10/rdf-tests/rdfcore/entailment/ )\n " .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002.rdf> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#RDF-XML-Document> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#inputDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002.rdf> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003.nt> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NT-Document> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#outputDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002.nt> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#status> "APPROVED" .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#approval> <http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2001Oct/0405.html> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#status> "APPROVED" .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#approval> <http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2001Oct/0405.html> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#outputDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001.nt> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/conjunction-test> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#premiseDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003.nt> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#inputDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003.rdf> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/conjunction-test> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#premiseDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002.nt> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/conjunction-test> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#premiseDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001.nt> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003.rdf> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#RDF-XML-Document> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#outputDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004.nt> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004.rdf> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#RDF-XML-Document> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#status> "NOT_APPROVED" .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#status> "NOT_APPROVED" .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/conjunction-test> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#entailmentRules> <http://www.w3.org/2000/01/rdf-schema#> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#PositiveParserTest> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/conjunction-test> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#issue> <http://www.w3.org/2000/03/rdf-tracking/#rdfs-domain-and-range> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#PositiveParserTest> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#outputDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003.nt> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004.nt> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NT-Document> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#inputDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001.rdf> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/conjunction-test> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#conclusionDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004.nt> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#PositiveParserTest> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#PositiveParserTest> .
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/Manifest.nt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/Manifest.nt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/Manifest.nt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/Manifest.nt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,40 @@
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001.nt> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NT-Document> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/conjunction-test> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#entailmentRules> <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002.nt> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NT-Document> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#issue> <http://www.w3.org/2000/03/rdf-tracking/#rdfs-domain-and-range> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#issue> <http://www.w3.org/2000/03/rdf-tracking/#rdfs-domain-and-range> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001.rdf> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#RDF-XML-Document> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#issue> <http://www.w3.org/2000/03/rdf-tracking/#rdfs-domain-and-range> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/conjunction-test> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#PositiveEntailmentTest> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#issue> <http://www.w3.org/2000/03/rdf-tracking/#rdfs-domain-and-range> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#inputDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004.rdf> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/conjunction-test> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#status> "NOT_APPROVED" .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/conjunction-test> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#description> "\nShould a property be allowed more than one rdfs:range property?\nWhat should the semantics of multiple domain and range properties be?\n\n-> Multiple domain and range constraints are permissable\n and will have conjunctive semantics.\n\ntest001\n describes a property with rdfs:domain the intersection of 2 domains\ntest002\n describes a property with rdfs:range the intersection of 2 ranges\ntest003\n sample statement\ntest004\n entailed description using test001, test002, test003 and\n the rules for RDF and RDFS entailment\n (see http://www.w3.org/2000/10/rdf-tests/rdfcore/entailment/ )\n " .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002.rdf> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#RDF-XML-Document> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#inputDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002.rdf> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003.nt> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NT-Document> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#outputDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002.nt> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#status> "APPROVED" .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#approval> <http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2001Oct/0405.html> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#status> "APPROVED" .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#approval> <http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2001Oct/0405.html> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#outputDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001.nt> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/conjunction-test> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#premiseDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003.nt> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#inputDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003.rdf> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/conjunction-test> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#premiseDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002.nt> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/conjunction-test> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#premiseDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001.nt> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003.rdf> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#RDF-XML-Document> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#outputDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004.nt> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004.rdf> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#RDF-XML-Document> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#status> "NOT_APPROVED" .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#status> "NOT_APPROVED" .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/conjunction-test> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#entailmentRules> <http://www.w3.org/2000/01/rdf-schema#> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#PositiveParserTest> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/conjunction-test> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#issue> <http://www.w3.org/2000/03/rdf-tracking/#rdfs-domain-and-range> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#PositiveParserTest> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#outputDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003.nt> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004.nt> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NT-Document> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#inputDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001.rdf> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/conjunction-test> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#conclusionDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004.nt> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#PositiveParserTest> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#PositiveParserTest> .
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/Manifest.rdf
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/Manifest.rdf 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/Manifest.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,188 +0,0 @@
-<?xml version="1.0"?>
-
-<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:test="http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#"
->
-
-<test:PositiveParserTest rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/Manifest.rdf#test001">
-
- <test:issue rdf:resource="http://www.w3.org/2000/03/rdf-tracking/#rdfs-domain-and-range" />
- <test:status>APPROVED</test:status>
- <test:approval rdf:resource="http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2001Oct/0405.html" />
- <!-- <test:discussion rdf:resource="pointer to archived email or other discussion" /> -->
- <!-- <test:description>
- -if we have a description, fill it in here -
- </test:description> -->
-
- <test:inputDocument>
- <test:RDF-XML-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001.rdf" />
- </test:inputDocument>
-
- <test:outputDocument>
- <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001.nt" />
- </test:outputDocument>
-
-</test:PositiveParserTest>
-
-
-<test:PositiveParserTest rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/Manifest.rdf#test002">
-
- <test:issue rdf:resource="http://www.w3.org/2000/03/rdf-tracking/#rdfs-domain-and-range" />
- <test:status>APPROVED</test:status>
- <test:approval rdf:resource="http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2001Oct/0405.html" />
- <!-- <test:discussion rdf:resource="pointer to archived email or other discussion" /> -->
- <!-- <test:description>
- -if we have a description, fill it in here -
- </test:description> -->
-
- <test:inputDocument>
- <test:RDF-XML-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002.rdf" />
- </test:inputDocument>
-
- <test:outputDocument>
- <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002.nt" />
- </test:outputDocument>
-
-</test:PositiveParserTest>
-
-
-<test:PositiveParserTest rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/Manifest.rdf#test003">
-
- <test:issue rdf:resource="http://www.w3.org/2000/03/rdf-tracking/#rdfs-domain-and-range" />
- <test:status>NOT_APPROVED</test:status>
- <!-- <test:discussion rdf:resource="pointer to archived email or other discussion" /> -->
- <!-- <test:description>
- -if we have a description, fill it in here -
- </test:description> -->
-
- <test:inputDocument>
- <test:RDF-XML-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003.rdf" />
- </test:inputDocument>
-
- <test:outputDocument>
- <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003.nt" />
- </test:outputDocument>
-
-</test:PositiveParserTest>
-
-
-<test:PositiveParserTest rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/Manifest.rdf#test004">
-
- <test:issue rdf:resource="http://www.w3.org/2000/03/rdf-tracking/#rdfs-domain-and-range" />
- <test:status>NOT_APPROVED</test:status>
- <!-- <test:discussion rdf:resource="pointer to archived email or other discussion" /> -->
- <!-- <test:description>
- -if we have a description, fill it in here -
- </test:description> -->
-
- <test:inputDocument>
- <test:RDF-XML-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004.rdf" />
- </test:inputDocument>
-
- <test:outputDocument>
- <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004.nt" />
- </test:outputDocument>
-
-</test:PositiveParserTest>
-
-
-<test:PositiveEntailmentTest rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/Manifest.rdf#conjunction-test">
-
- <test:issue rdf:resource="http://www.w3.org/2000/03/rdf-tracking/#rdfs-domain-and-range" />
- <test:status>NOT_APPROVED</test:status>
- <test:description>
-Should a property be allowed more than one rdfs:range property?
-What should the semantics of multiple domain and range properties be?
-
--> Multiple domain and range constraints are permissable
- and will have conjunctive semantics.
-
-test001
- describes a property with rdfs:domain the intersection of 2 domains
-test002
- describes a property with rdfs:range the intersection of 2 ranges
-test003
- sample statement
-test004
- entailed description using test001, test002, test003 and
- the rules for RDF and RDFS entailment
- (see http://www.w3.org/2000/10/rdf-tests/rdfcore/entailment/ )
- </test:description>
-
- <test:entailmentRules rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#" />
- <test:entailmentRules rdf:resource="http://www.w3.org/2000/01/rdf-schema#" />
-
- <test:premiseDocument>
- <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001.nt" />
- </test:premiseDocument>
-
- <test:premiseDocument>
- <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002.nt" />
- </test:premiseDocument>
-
- <test:premiseDocument>
- <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003.nt" />
- </test:premiseDocument>
-
- <test:conclusionDocument>
- <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004.nt" />
- </test:conclusionDocument>
-
-</test:PositiveEntailmentTest>
-
-<test:NegativeEntailmentTest rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/Manifest.rdf#intensionality-range">
-
- <test:issue rdf:resource="http://www.w3.org/2000/03/rdf-tracking/#rdfs-domain-and-range" />
- <test:issue rdf:resource="http://www.w3.org/2001/sw/WebOnt/webont-issues.html#I5.24-IF-or-IFF-property-properties" />
- <test:status>APPROVED</test:status>
- <test:approval rdf:resource="http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2003Jan/0025.html" />
-
- <test:description>
-RDF Semantics defines rdfs:range to have an intensional reading.
-However, semantic extensions may give an extensional reading to range.
-The premise/conclusion pair is a non-entailment for RDFS reasoning,
-but may hold in semantic extensions.
- </test:description>
-
- <test:entailmentRules rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#" />
- <test:entailmentRules rdf:resource="http://www.w3.org/2000/01/rdf-schema#" />
- <test:premiseDocument>
- <test:RDF-XML-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/premises005.rdf" />
- </test:premiseDocument>
-
-
- <test:conclusionDocument>
- <test:RDF-XML-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/nonconclusions005.rdf" />
- </test:conclusionDocument>
-
-</test:NegativeEntailmentTest>
-<test:NegativeEntailmentTest rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/Manifest.rdf#intensionality-domain">
-
- <test:issue rdf:resource="http://www.w3.org/2000/03/rdf-tracking/#rdfs-domain-and-range" />
- <test:issue rdf:resource="http://www.w3.org/2001/sw/WebOnt/webont-issues.html#I5.24-IF-or-IFF-property-properties" />
- <test:status>APPROVED</test:status>
- <test:approval rdf:resource="http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2003Jan/0025.html" />
- <test:description>
-RDF Semantics defines rdfs:range to have an intensional reading of domain.
-However, semantic extensions may give an extensional reading to domain.
-The premise/conclusion pair is a non-entailment for RDFS reasoning,
-but may hold in semantic extensions.
- </test:description>
-
- <test:entailmentRules rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#" />
- <test:entailmentRules rdf:resource="http://www.w3.org/2000/01/rdf-schema#" />
- <test:premiseDocument>
- <test:RDF-XML-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/premises006.rdf" />
- </test:premiseDocument>
-
-
- <test:conclusionDocument>
- <test:RDF-XML-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/nonconclusions006.rdf" />
- </test:conclusionDocument>
-
-</test:NegativeEntailmentTest>
-
-</rdf:RDF>
-
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/Manifest.rdf (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/Manifest.rdf)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/Manifest.rdf (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/Manifest.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,188 @@
+<?xml version="1.0"?>
+
+<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:test="http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#"
+>
+
+<test:PositiveParserTest rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/Manifest.rdf#test001">
+
+ <test:issue rdf:resource="http://www.w3.org/2000/03/rdf-tracking/#rdfs-domain-and-range" />
+ <test:status>APPROVED</test:status>
+ <test:approval rdf:resource="http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2001Oct/0405.html" />
+ <!-- <test:discussion rdf:resource="pointer to archived email or other discussion" /> -->
+ <!-- <test:description>
+ -if we have a description, fill it in here -
+ </test:description> -->
+
+ <test:inputDocument>
+ <test:RDF-XML-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001.rdf" />
+ </test:inputDocument>
+
+ <test:outputDocument>
+ <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001.nt" />
+ </test:outputDocument>
+
+</test:PositiveParserTest>
+
+
+<test:PositiveParserTest rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/Manifest.rdf#test002">
+
+ <test:issue rdf:resource="http://www.w3.org/2000/03/rdf-tracking/#rdfs-domain-and-range" />
+ <test:status>APPROVED</test:status>
+ <test:approval rdf:resource="http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2001Oct/0405.html" />
+ <!-- <test:discussion rdf:resource="pointer to archived email or other discussion" /> -->
+ <!-- <test:description>
+ -if we have a description, fill it in here -
+ </test:description> -->
+
+ <test:inputDocument>
+ <test:RDF-XML-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002.rdf" />
+ </test:inputDocument>
+
+ <test:outputDocument>
+ <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002.nt" />
+ </test:outputDocument>
+
+</test:PositiveParserTest>
+
+
+<test:PositiveParserTest rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/Manifest.rdf#test003">
+
+ <test:issue rdf:resource="http://www.w3.org/2000/03/rdf-tracking/#rdfs-domain-and-range" />
+ <test:status>NOT_APPROVED</test:status>
+ <!-- <test:discussion rdf:resource="pointer to archived email or other discussion" /> -->
+ <!-- <test:description>
+ -if we have a description, fill it in here -
+ </test:description> -->
+
+ <test:inputDocument>
+ <test:RDF-XML-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003.rdf" />
+ </test:inputDocument>
+
+ <test:outputDocument>
+ <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003.nt" />
+ </test:outputDocument>
+
+</test:PositiveParserTest>
+
+
+<test:PositiveParserTest rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/Manifest.rdf#test004">
+
+ <test:issue rdf:resource="http://www.w3.org/2000/03/rdf-tracking/#rdfs-domain-and-range" />
+ <test:status>NOT_APPROVED</test:status>
+ <!-- <test:discussion rdf:resource="pointer to archived email or other discussion" /> -->
+ <!-- <test:description>
+ -if we have a description, fill it in here -
+ </test:description> -->
+
+ <test:inputDocument>
+ <test:RDF-XML-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004.rdf" />
+ </test:inputDocument>
+
+ <test:outputDocument>
+ <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004.nt" />
+ </test:outputDocument>
+
+</test:PositiveParserTest>
+
+
+<test:PositiveEntailmentTest rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/Manifest.rdf#conjunction-test">
+
+ <test:issue rdf:resource="http://www.w3.org/2000/03/rdf-tracking/#rdfs-domain-and-range" />
+ <test:status>NOT_APPROVED</test:status>
+ <test:description>
+Should a property be allowed more than one rdfs:range property?
+What should the semantics of multiple domain and range properties be?
+
+-> Multiple domain and range constraints are permissable
+ and will have conjunctive semantics.
+
+test001
+ describes a property with rdfs:domain the intersection of 2 domains
+test002
+ describes a property with rdfs:range the intersection of 2 ranges
+test003
+ sample statement
+test004
+ entailed description using test001, test002, test003 and
+ the rules for RDF and RDFS entailment
+ (see http://www.w3.org/2000/10/rdf-tests/rdfcore/entailment/ )
+ </test:description>
+
+ <test:entailmentRules rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#" />
+ <test:entailmentRules rdf:resource="http://www.w3.org/2000/01/rdf-schema#" />
+
+ <test:premiseDocument>
+ <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test001.nt" />
+ </test:premiseDocument>
+
+ <test:premiseDocument>
+ <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test002.nt" />
+ </test:premiseDocument>
+
+ <test:premiseDocument>
+ <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test003.nt" />
+ </test:premiseDocument>
+
+ <test:conclusionDocument>
+ <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/test004.nt" />
+ </test:conclusionDocument>
+
+</test:PositiveEntailmentTest>
+
+<test:NegativeEntailmentTest rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/Manifest.rdf#intensionality-range">
+
+ <test:issue rdf:resource="http://www.w3.org/2000/03/rdf-tracking/#rdfs-domain-and-range" />
+ <test:issue rdf:resource="http://www.w3.org/2001/sw/WebOnt/webont-issues.html#I5.24-IF-or-IFF-property-properties" />
+ <test:status>APPROVED</test:status>
+ <test:approval rdf:resource="http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2003Jan/0025.html" />
+
+ <test:description>
+RDF Semantics defines rdfs:range to have an intensional reading.
+However, semantic extensions may give an extensional reading to range.
+The premise/conclusion pair is a non-entailment for RDFS reasoning,
+but may hold in semantic extensions.
+ </test:description>
+
+ <test:entailmentRules rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#" />
+ <test:entailmentRules rdf:resource="http://www.w3.org/2000/01/rdf-schema#" />
+ <test:premiseDocument>
+ <test:RDF-XML-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/premises005.rdf" />
+ </test:premiseDocument>
+
+
+ <test:conclusionDocument>
+ <test:RDF-XML-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/nonconclusions005.rdf" />
+ </test:conclusionDocument>
+
+</test:NegativeEntailmentTest>
+<test:NegativeEntailmentTest rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/Manifest.rdf#intensionality-domain">
+
+ <test:issue rdf:resource="http://www.w3.org/2000/03/rdf-tracking/#rdfs-domain-and-range" />
+ <test:issue rdf:resource="http://www.w3.org/2001/sw/WebOnt/webont-issues.html#I5.24-IF-or-IFF-property-properties" />
+ <test:status>APPROVED</test:status>
+ <test:approval rdf:resource="http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2003Jan/0025.html" />
+ <test:description>
+RDF Semantics defines rdfs:range to have an intensional reading of domain.
+However, semantic extensions may give an extensional reading to domain.
+The premise/conclusion pair is a non-entailment for RDFS reasoning,
+but may hold in semantic extensions.
+ </test:description>
+
+ <test:entailmentRules rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#" />
+ <test:entailmentRules rdf:resource="http://www.w3.org/2000/01/rdf-schema#" />
+ <test:premiseDocument>
+ <test:RDF-XML-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/premises006.rdf" />
+ </test:premiseDocument>
+
+
+ <test:conclusionDocument>
+ <test:RDF-XML-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/nonconclusions006.rdf" />
+ </test:conclusionDocument>
+
+</test:NegativeEntailmentTest>
+
+</rdf:RDF>
+
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/axioms.n3
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/axioms.n3 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/axioms.n3 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,63 +0,0 @@
-# Copyright World Wide Web Consortium, (Massachusetts Institute of
-# Technology, Institut National de Recherche en Informatique et en
-# Automatique, Keio University).
-#
-# All Rights Reserved.
-#
-# Please see the full Copyright clause at
-# <http://www.w3.org/Consortium/Legal/copyright-software.html>
-#
-# $Id: axioms.n3,v 1.1 2005/07/03 13:11:01 pgearon Exp $
-##################################################################
-
- at prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
- at prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
- at prefix log: <http://www.w3.org/2000/10/swap/log#> .
- at prefix mt: <http://www.w3.org/TR/rdf-mt/#> .
- at prefix : <axioms#> .
-
-rdf:type rdf:type rdf:Property .
-rdfs:Resource rdf:type rdfs:Class .
-rdfs:Literal rdf:type rdfs:Class .
-rdfs:Class rdf:type rdfs:Class .
-rdf:Property rdf:type rdfs:Class .
-rdf:type rdf:type rdf:Property .
-rdf:type rdfs:domain rdfs:Resource .
-rdf:type rdfs:range rdfs:Class .
-rdfs:domain rdf:type rdf:Property .
-rdfs:domain rdfs:domain rdf:Property .
-rdfs:domain rdfs:range rdfs:Class .
-rdfs:range rdf:type rdf:Property .
-rdfs:range rdfs:domain rdf:Property .
-rdfs:range rdfs:range rdfs:Class .
-rdfs:subPropertyOf rdf:type rdf:Property .
-rdfs:subPropertyOf rdfs:domain rdf:Property .
-rdfs:subPropertyOf rdfs:range rdf:Property .
-rdfs:subClassOf rdf:type rdf:Property .
-rdfs:subClassOf rdfs:domain rdfs:Class .
-rdfs:subClassOf rdfs:range rdfs:Class .
-
-:RDF-RULE-1 rdfs:isDefinedBy mt:rdfsentail .
-:RDFS-RULE-2 rdfs:isDefinedBy mt:rdfsentail .
-:RDFS-RULE-3 rdfs:isDefinedBy mt:rdfsentail .
-:RDFS-RULE-4a rdfs:isDefinedBy mt:rdfsentail .
-:RDFS-RULE-4b rdfs:isDefinedBy mt:rdfsentail .
-:RDFS-RULE-5 rdfs:isDefinedBy mt:rdfsentail .
-:RDFS-RULE-6 rdfs:isDefinedBy mt:rdfsentail .
-:RDFS-RULE-7 rdfs:isDefinedBy mt:rdfsentail .
-:RDFS-RULE-8 rdfs:isDefinedBy mt:rdfsentail .
-:RDFS-RULE-9 rdfs:isDefinedBy mt:rdfsentail .
-
-this log:forAll :s, :p, :o, :a, :b, :c, :A, :B, :C .
-
-{ :RDF-RULE-1 rdfs:isDefinedBy mt:rdfsentail . :s :p :o } log:implies { :p rdf:type rdf:Property } .
-{ :RDFS-RULE-2 rdfs:isDefinedBy mt:rdfsentail . :s :p :o . :p rdfs:domain :C } log:implies { :s rdf:type :C } .
-{ :RDFS-RULE-3 rdfs:isDefinedBy mt:rdfsentail . :s :p :o . :p rdfs:range :C } log:implies { :o rdf:type :C } .
-{ :RDFS-RULE-4a rdfs:isDefinedBy mt:rdfsentail . :s :p :o } log:implies { :s a rdfs:Resource } .
-{ :RDFS-RULE-4b rdfs:isDefinedBy mt:rdfsentail . :s :p :o } log:implies { :o a rdfs:Resource } .
-{ :RDFS-RULE-5 rdfs:isDefinedBy mt:rdfsentail . :a rdfs:subPropertyOf :b. :b rdfs:subPropertyOf :c } log:implies { :a rdfs:subPropertyOf :c } .
-{ :RDFS-RULE-6 rdfs:isDefinedBy mt:rdfsentail . :p rdfs:subPropertyOf :b. :s :p :o } log:implies { :s :b :o } .
-{ :RDFS-RULE-7 rdfs:isDefinedBy mt:rdfsentail . :C a rdfs:Class } log:implies { :C rdfs:subClassOf rdfs:Resource } .
-{ :RDFS-RULE-8 rdfs:isDefinedBy mt:rdfsentail . :A rdfs:subClassOf :B. :B rdfs:subClassOf :C } log:implies { :A rdfs:subClassOf :C } .
-{ :RDFS-RULE-9 rdfs:isDefinedBy mt:rdfsentail . :A rdfs:subClassOf :B. :a a :A } log:implies { :a a :B } .
-
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/axioms.n3 (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/axioms.n3)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/axioms.n3 (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/axioms.n3 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,63 @@
+# Copyright World Wide Web Consortium, (Massachusetts Institute of
+# Technology, Institut National de Recherche en Informatique et en
+# Automatique, Keio University).
+#
+# All Rights Reserved.
+#
+# Please see the full Copyright clause at
+# <http://www.w3.org/Consortium/Legal/copyright-software.html>
+#
+# $Id: axioms.n3,v 1.1 2005/07/03 13:11:01 pgearon Exp $
+##################################################################
+
+ at prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+ at prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+ at prefix log: <http://www.w3.org/2000/10/swap/log#> .
+ at prefix mt: <http://www.w3.org/TR/rdf-mt/#> .
+ at prefix : <axioms#> .
+
+rdf:type rdf:type rdf:Property .
+rdfs:Resource rdf:type rdfs:Class .
+rdfs:Literal rdf:type rdfs:Class .
+rdfs:Class rdf:type rdfs:Class .
+rdf:Property rdf:type rdfs:Class .
+rdf:type rdf:type rdf:Property .
+rdf:type rdfs:domain rdfs:Resource .
+rdf:type rdfs:range rdfs:Class .
+rdfs:domain rdf:type rdf:Property .
+rdfs:domain rdfs:domain rdf:Property .
+rdfs:domain rdfs:range rdfs:Class .
+rdfs:range rdf:type rdf:Property .
+rdfs:range rdfs:domain rdf:Property .
+rdfs:range rdfs:range rdfs:Class .
+rdfs:subPropertyOf rdf:type rdf:Property .
+rdfs:subPropertyOf rdfs:domain rdf:Property .
+rdfs:subPropertyOf rdfs:range rdf:Property .
+rdfs:subClassOf rdf:type rdf:Property .
+rdfs:subClassOf rdfs:domain rdfs:Class .
+rdfs:subClassOf rdfs:range rdfs:Class .
+
+:RDF-RULE-1 rdfs:isDefinedBy mt:rdfsentail .
+:RDFS-RULE-2 rdfs:isDefinedBy mt:rdfsentail .
+:RDFS-RULE-3 rdfs:isDefinedBy mt:rdfsentail .
+:RDFS-RULE-4a rdfs:isDefinedBy mt:rdfsentail .
+:RDFS-RULE-4b rdfs:isDefinedBy mt:rdfsentail .
+:RDFS-RULE-5 rdfs:isDefinedBy mt:rdfsentail .
+:RDFS-RULE-6 rdfs:isDefinedBy mt:rdfsentail .
+:RDFS-RULE-7 rdfs:isDefinedBy mt:rdfsentail .
+:RDFS-RULE-8 rdfs:isDefinedBy mt:rdfsentail .
+:RDFS-RULE-9 rdfs:isDefinedBy mt:rdfsentail .
+
+this log:forAll :s, :p, :o, :a, :b, :c, :A, :B, :C .
+
+{ :RDF-RULE-1 rdfs:isDefinedBy mt:rdfsentail . :s :p :o } log:implies { :p rdf:type rdf:Property } .
+{ :RDFS-RULE-2 rdfs:isDefinedBy mt:rdfsentail . :s :p :o . :p rdfs:domain :C } log:implies { :s rdf:type :C } .
+{ :RDFS-RULE-3 rdfs:isDefinedBy mt:rdfsentail . :s :p :o . :p rdfs:range :C } log:implies { :o rdf:type :C } .
+{ :RDFS-RULE-4a rdfs:isDefinedBy mt:rdfsentail . :s :p :o } log:implies { :s a rdfs:Resource } .
+{ :RDFS-RULE-4b rdfs:isDefinedBy mt:rdfsentail . :s :p :o } log:implies { :o a rdfs:Resource } .
+{ :RDFS-RULE-5 rdfs:isDefinedBy mt:rdfsentail . :a rdfs:subPropertyOf :b. :b rdfs:subPropertyOf :c } log:implies { :a rdfs:subPropertyOf :c } .
+{ :RDFS-RULE-6 rdfs:isDefinedBy mt:rdfsentail . :p rdfs:subPropertyOf :b. :s :p :o } log:implies { :s :b :o } .
+{ :RDFS-RULE-7 rdfs:isDefinedBy mt:rdfsentail . :C a rdfs:Class } log:implies { :C rdfs:subClassOf rdfs:Resource } .
+{ :RDFS-RULE-8 rdfs:isDefinedBy mt:rdfsentail . :A rdfs:subClassOf :B. :B rdfs:subClassOf :C } log:implies { :A rdfs:subClassOf :C } .
+{ :RDFS-RULE-9 rdfs:isDefinedBy mt:rdfsentail . :A rdfs:subClassOf :B. :a a :A } log:implies { :a a :B } .
+
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/conjunction-test
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/conjunction-test 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/conjunction-test 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1 +0,0 @@
-Nearly blank
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/conjunction-test (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/conjunction-test)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/conjunction-test (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/conjunction-test 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1 @@
+Nearly blank
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult1.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult1.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult1.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully loaded 3 statements from @baseuri@/jxdata/iTQL/rdfs/rdfs-domain-and-range/test001.rdf into @server@#test</message></query></answer>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult1.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult1.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult1.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult1.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully loaded 3 statements from @baseuri@/jxdata/iTQL/rdfs/rdfs-domain-and-range/test001.rdf into @server@#test</message></query></answer>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult2.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult2.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult2.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully loaded 3 statements from @baseuri@/jxdata/iTQL/rdfs/rdfs-domain-and-range/test002.rdf into @server@#test</message></query></answer>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult2.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult2.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult2.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult2.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully loaded 3 statements from @baseuri@/jxdata/iTQL/rdfs/rdfs-domain-and-range/test002.rdf into @server@#test</message></query></answer>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult3.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult3.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult3.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully loaded 1 statements from @baseuri@/jxdata/iTQL/rdfs/rdfs-domain-and-range/test003.rdf into @server@#test</message></query></answer>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult3.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult3.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult3.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult3.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully loaded 1 statements from @baseuri@/jxdata/iTQL/rdfs/rdfs-domain-and-range/test003.rdf into @server@#test</message></query></answer>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult4.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult4.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult4.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully loaded 5 statements from @baseuri@/jxdata/iTQL/rdfs/rdfs-domain-and-range/premises005.rdf into @server@#test</message></query></answer>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult4.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult4.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult4.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult4.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully loaded 5 statements from @baseuri@/jxdata/iTQL/rdfs/rdfs-domain-and-range/premises005.rdf into @server@#test</message></query></answer>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult5.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult5.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult5.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully loaded 5 statements from @baseuri@/jxdata/iTQL/rdfs/rdfs-domain-and-range/premises006.rdf into @server@#test</message></query></answer>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult5.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult5.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult5.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/loadResult5.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully loaded 5 statements from @baseuri@/jxdata/iTQL/rdfs/rdfs-domain-and-range/premises006.rdf into @server@#test</message></query></answer>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/mulgara-readme.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/mulgara-readme.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/mulgara-readme.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,24 +0,0 @@
-Mulgara Tests
-
-The contents of this directory come from:
-http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/
-
-These tests do not include the parser tests, as they are handled elsewhere.
-
-The positive entailment tests are based on test001.rdf, test002.rdf and
-test003.rdf resulting in the data in test004.rdf. The n3 files are equivalent
-to the rdf files and would normally be used for parser testing.
-
-The negative entailment tests are based on premises005.rdf and
-premises006.rdf. Entailment on these graphs should not lead to statements
-found in nonconclusions005.rdf and nonconclusions006.rdf.
-
-Tests are performed by loading the initial data, performing RDFS entailment,
-and querying for expected results. While the expected results (or
-non-results) are found in the rdf files in this directory, the tests are
-based in iTQL, and the resulting data is explicitly searched for in the
-test script.
-
-The resulting data, the axioms, and the manifest files are all left in this
-directory for completeness and to help explain the machanics of the tests.
-
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/mulgara-readme.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/mulgara-readme.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/mulgara-readme.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/mulgara-readme.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,24 @@
+Mulgara Tests
+
+The contents of this directory come from:
+http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/
+
+These tests do not include the parser tests, as they are handled elsewhere.
+
+The positive entailment tests are based on test001.rdf, test002.rdf and
+test003.rdf resulting in the data in test004.rdf. The n3 files are equivalent
+to the rdf files and would normally be used for parser testing.
+
+The negative entailment tests are based on premises005.rdf and
+premises006.rdf. Entailment on these graphs should not lead to statements
+found in nonconclusions005.rdf and nonconclusions006.rdf.
+
+Tests are performed by loading the initial data, performing RDFS entailment,
+and querying for expected results. While the expected results (or
+non-results) are found in the rdf files in this directory, the tests are
+based in iTQL, and the resulting data is explicitly searched for in the
+test script.
+
+The resulting data, the axioms, and the manifest files are all left in this
+directory for completeness and to help explain the machanics of the tests.
+
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/nonconclusions005.rdf
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/nonconclusions005.rdf 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/nonconclusions005.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,28 +0,0 @@
-<!--
- Copyright World Wide Web Consortium, (Massachusetts Institute of
- Technology, Institut National de Recherche en Informatique et en
- Automatique, Keio University).
-
- All Rights Reserved.
-
- Please see the full Copyright clause at
- <http://www.w3.org/Consortium/Legal/copyright-software.html>
-
- $Id: nonconclusions005.rdf,v 1.1 2005/07/03 13:11:02 pgearon Exp $
--->
-<!--
-See Manifest.rdf for description.
--->
-<!-- Author: Jeremy J. Carroll -->
-<rdf:RDF
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
- xml:base="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/nonconclusions005.rdf" >
-
- <rdfs:Property rdf:about="premises005.rdf#prop">
- <rdfs:range>
- <rdfs:Class rdf:about="premises005.rdf#B"/>
- </rdfs:range>
- </rdfs:Property>
-
-</rdf:RDF>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/nonconclusions005.rdf (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/nonconclusions005.rdf)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/nonconclusions005.rdf (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/nonconclusions005.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,28 @@
+<!--
+ Copyright World Wide Web Consortium, (Massachusetts Institute of
+ Technology, Institut National de Recherche en Informatique et en
+ Automatique, Keio University).
+
+ All Rights Reserved.
+
+ Please see the full Copyright clause at
+ <http://www.w3.org/Consortium/Legal/copyright-software.html>
+
+ $Id: nonconclusions005.rdf,v 1.1 2005/07/03 13:11:02 pgearon Exp $
+-->
+<!--
+See Manifest.rdf for description.
+-->
+<!-- Author: Jeremy J. Carroll -->
+<rdf:RDF
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+ xml:base="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/nonconclusions005.rdf" >
+
+ <rdfs:Property rdf:about="premises005.rdf#prop">
+ <rdfs:range>
+ <rdfs:Class rdf:about="premises005.rdf#B"/>
+ </rdfs:range>
+ </rdfs:Property>
+
+</rdf:RDF>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/nonconclusions006.rdf
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/nonconclusions006.rdf 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/nonconclusions006.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,28 +0,0 @@
-<!--
- Copyright World Wide Web Consortium, (Massachusetts Institute of
- Technology, Institut National de Recherche en Informatique et en
- Automatique, Keio University).
-
- All Rights Reserved.
-
- Please see the full Copyright clause at
- <http://www.w3.org/Consortium/Legal/copyright-software.html>
-
- $Id: nonconclusions006.rdf,v 1.1 2005/07/03 13:11:02 pgearon Exp $
--->
-<!--
-See Manifest.rdf for description.
--->
-<!-- Author: Jeremy J. Carroll -->
-<rdf:RDF
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
- xml:base="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/nonconclusions006.rdf" >
-
- <rdfs:Property rdf:about="premises006.rdf#prop">
- <rdfs:domain>
- <rdfs:Class rdf:about="premises006.rdf#B"/>
- </rdfs:domain>
- </rdfs:Property>
-
-</rdf:RDF>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/nonconclusions006.rdf (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/nonconclusions006.rdf)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/nonconclusions006.rdf (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/nonconclusions006.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,28 @@
+<!--
+ Copyright World Wide Web Consortium, (Massachusetts Institute of
+ Technology, Institut National de Recherche en Informatique et en
+ Automatique, Keio University).
+
+ All Rights Reserved.
+
+ Please see the full Copyright clause at
+ <http://www.w3.org/Consortium/Legal/copyright-software.html>
+
+ $Id: nonconclusions006.rdf,v 1.1 2005/07/03 13:11:02 pgearon Exp $
+-->
+<!--
+See Manifest.rdf for description.
+-->
+<!-- Author: Jeremy J. Carroll -->
+<rdf:RDF
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+ xml:base="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/nonconclusions006.rdf" >
+
+ <rdfs:Property rdf:about="premises006.rdf#prop">
+ <rdfs:domain>
+ <rdfs:Class rdf:about="premises006.rdf#B"/>
+ </rdfs:domain>
+ </rdfs:Property>
+
+</rdf:RDF>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/premises005.rdf
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/premises005.rdf 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/premises005.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,32 +0,0 @@
-<!--
- Copyright World Wide Web Consortium, (Massachusetts Institute of
- Technology, Institut National de Recherche en Informatique et en
- Automatique, Keio University).
-
- All Rights Reserved.
-
- Please see the full Copyright clause at
- <http://www.w3.org/Consortium/Legal/copyright-software.html>
-
- $Id: premises005.rdf,v 1.1 2005/07/03 13:11:02 pgearon Exp $
--->
-<!--
-See Manifest.rdf for description.
--->
-<!-- Author: Jeremy J. Carroll -->
-<rdf:RDF
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
- xml:base="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/premises005.rdf" >
-
- <rdfs:Property rdf:ID="prop">
- <rdfs:range>
- <rdfs:Class rdf:ID="A">
- <rdfs:subClassOf>
- <rdfs:Class rdf:ID="B"/>
- </rdfs:subClassOf>
- </rdfs:Class>
- </rdfs:range>
- </rdfs:Property>
-
-</rdf:RDF>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/premises005.rdf (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/premises005.rdf)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/premises005.rdf (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/premises005.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,32 @@
+<!--
+ Copyright World Wide Web Consortium, (Massachusetts Institute of
+ Technology, Institut National de Recherche en Informatique et en
+ Automatique, Keio University).
+
+ All Rights Reserved.
+
+ Please see the full Copyright clause at
+ <http://www.w3.org/Consortium/Legal/copyright-software.html>
+
+ $Id: premises005.rdf,v 1.1 2005/07/03 13:11:02 pgearon Exp $
+-->
+<!--
+See Manifest.rdf for description.
+-->
+<!-- Author: Jeremy J. Carroll -->
+<rdf:RDF
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+ xml:base="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/premises005.rdf" >
+
+ <rdfs:Property rdf:ID="prop">
+ <rdfs:range>
+ <rdfs:Class rdf:ID="A">
+ <rdfs:subClassOf>
+ <rdfs:Class rdf:ID="B"/>
+ </rdfs:subClassOf>
+ </rdfs:Class>
+ </rdfs:range>
+ </rdfs:Property>
+
+</rdf:RDF>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/premises006.rdf
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/premises006.rdf 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/premises006.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,32 +0,0 @@
-<!--
- Copyright World Wide Web Consortium, (Massachusetts Institute of
- Technology, Institut National de Recherche en Informatique et en
- Automatique, Keio University).
-
- All Rights Reserved.
-
- Please see the full Copyright clause at
- <http://www.w3.org/Consortium/Legal/copyright-software.html>
-
- $Id: premises006.rdf,v 1.1 2005/07/03 13:11:02 pgearon Exp $
--->
-<!--
-See Manifest.rdf for description.
--->
-<!-- Author: Jeremy J. Carroll -->
-<rdf:RDF
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
- xml:base="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/premises006.rdf" >
-
- <rdfs:Property rdf:ID="prop">
- <rdfs:domain>
- <rdfs:Class rdf:ID="A">
- <rdfs:subClassOf>
- <rdfs:Class rdf:ID="B"/>
- </rdfs:subClassOf>
- </rdfs:Class>
- </rdfs:domain>
- </rdfs:Property>
-
-</rdf:RDF>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/premises006.rdf (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/premises006.rdf)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/premises006.rdf (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/premises006.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,32 @@
+<!--
+ Copyright World Wide Web Consortium, (Massachusetts Institute of
+ Technology, Institut National de Recherche en Informatique et en
+ Automatique, Keio University).
+
+ All Rights Reserved.
+
+ Please see the full Copyright clause at
+ <http://www.w3.org/Consortium/Legal/copyright-software.html>
+
+ $Id: premises006.rdf,v 1.1 2005/07/03 13:11:02 pgearon Exp $
+-->
+<!--
+See Manifest.rdf for description.
+-->
+<!-- Author: Jeremy J. Carroll -->
+<rdf:RDF
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+ xml:base="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/premises006.rdf" >
+
+ <rdfs:Property rdf:ID="prop">
+ <rdfs:domain>
+ <rdfs:Class rdf:ID="A">
+ <rdfs:subClassOf>
+ <rdfs:Class rdf:ID="B"/>
+ </rdfs:subClassOf>
+ </rdfs:Class>
+ </rdfs:domain>
+ </rdfs:Property>
+
+</rdf:RDF>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult1.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult1.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult1.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><variables><o/></variables><solution><o resource="http://example.org/Domain1"/></solution><solution><o resource="http://example.org/Domain2"/></solution><solution><o resource="http://www.w3.org/2000/01/rdf-schema#Resource"/></solution></query></answer>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult1.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult1.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult1.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult1.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><variables><o/></variables><solution><o resource="http://example.org/Domain1"/></solution><solution><o resource="http://example.org/Domain2"/></solution><solution><o resource="http://www.w3.org/2000/01/rdf-schema#Resource"/></solution></query></answer>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult2.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult2.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult2.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><variables><o/></variables><solution><o resource="http://example.org/Range1"/></solution><solution><o resource="http://example.org/Range2"/></solution><solution><o resource="http://www.w3.org/2000/01/rdf-schema#Resource"/></solution></query></answer>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult2.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult2.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult2.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult2.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><variables><o/></variables><solution><o resource="http://example.org/Range1"/></solution><solution><o resource="http://example.org/Range2"/></solution><solution><o resource="http://www.w3.org/2000/01/rdf-schema#Resource"/></solution></query></answer>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult7.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult7.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult7.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><variables><o/></variables><solution><o resource="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/premises005.rdf#A"/></solution></query></answer>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult7.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult7.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult7.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult7.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><variables><o/></variables><solution><o resource="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/premises005.rdf#A"/></solution></query></answer>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult8.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult8.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult8.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><variables><o/></variables><solution><o resource="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/premises006.rdf#A"/></solution></query></answer>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult8.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult8.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult8.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResult8.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><variables><o/></variables><solution><o resource="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/premises006.rdf#A"/></solution></query></answer>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResultCommon.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResultCommon.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResultCommon.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><variables><o/></variables><solution><o resource="http://www.w3.org/2000/01/rdf-schema#Class"/></solution><solution><o resource="http://www.w3.org/2000/01/rdf-schema#Resource"/></solution></query></answer>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResultCommon.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResultCommon.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResultCommon.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/queryResultCommon.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><variables><o/></variables><solution><o resource="http://www.w3.org/2000/01/rdf-schema#Class"/></solution><solution><o resource="http://www.w3.org/2000/01/rdf-schema#Resource"/></solution></query></answer>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/readme.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/readme.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/readme.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,37 +0,0 @@
-Issue rdfs-domain-and-range:
----------------------------
-Should a property be allowed more than one rdfs:range property?
-What should the semantics of multiple domain and range properties be?
-
--> Multiple domain and range constraints are permissable
- and will have conjunctive semantics.
-
-test001
- describes a property with rdfs:domain the intersection of 2 domains
-test002
- describes a property with rdfs:range the intersection of 2 ranges
-test003
- sample statement
-test004
- entailed description using test001, test002, test003 and
- the rules for RDF and RDFS entailment
- (see http://www.w3.org/2000/10/rdf-tests/rdfcore/entailment/ )
-
-# Suppose we have
-# ex:baz1 ex:bar ex:baz2 . #test003
-# and
-# ex:bar rdfs:domain ex:Domain1 . #test001
-# and
-# ex:bar rdfs:domain ex:Domain2 . #test001
-#
-# then we can RDFS entail
-# ex:baz1 rdf:type ex:Domain1 . #test004
-# and
-# ex:baz1 rdf:type ex:Domain2 . #test004
-#
-# Now, it is that last 'and' that expresses
-# those 'conjunctive semantics' i.e.
-# ex:baz1 in in the intersection of ex:Domain1 and ex:Domain2
-#
-# The same story for rdfs:range
-#
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/readme.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/readme.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/readme.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/readme.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,37 @@
+Issue rdfs-domain-and-range:
+---------------------------
+Should a property be allowed more than one rdfs:range property?
+What should the semantics of multiple domain and range properties be?
+
+-> Multiple domain and range constraints are permissable
+ and will have conjunctive semantics.
+
+test001
+ describes a property with rdfs:domain the intersection of 2 domains
+test002
+ describes a property with rdfs:range the intersection of 2 ranges
+test003
+ sample statement
+test004
+ entailed description using test001, test002, test003 and
+ the rules for RDF and RDFS entailment
+ (see http://www.w3.org/2000/10/rdf-tests/rdfcore/entailment/ )
+
+# Suppose we have
+# ex:baz1 ex:bar ex:baz2 . #test003
+# and
+# ex:bar rdfs:domain ex:Domain1 . #test001
+# and
+# ex:bar rdfs:domain ex:Domain2 . #test001
+#
+# then we can RDFS entail
+# ex:baz1 rdf:type ex:Domain1 . #test004
+# and
+# ex:baz1 rdf:type ex:Domain2 . #test004
+#
+# Now, it is that last 'and' that expresses
+# those 'conjunctive semantics' i.e.
+# ex:baz1 in in the intersection of ex:Domain1 and ex:Domain2
+#
+# The same story for rdfs:range
+#
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/ruleResult1.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/ruleResult1.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/ruleResult1.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully applied @baseuri@/rules/rdfs.dl to @server@#test</message></query></answer>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/ruleResult1.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/ruleResult1.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/ruleResult1.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/ruleResult1.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully applied @baseuri@/rules/rdfs.dl to @server@#test</message></query></answer>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test.jxu
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test.jxu 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test.jxu 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,185 +0,0 @@
-<jxu>
- <set name="debug" value="false" />
-
- <!-- Load the first 4 test files: test001 + test002 + test003 = test004 -->
- <!-- Load test001 -->
- <set name="modelName" value="@server@#test" />
- <set name="loadCommand" value="load <@baseuri@/jxdata/iTQL/rdfs/rdfs-domain-and-range/test001.rdf> into <@server@#test> ;" />
- <eval stepClass="org.mulgara.store.jxunit.LoadDataJX" />
-
- <ifEqual converse="true" file="loadResult1.txt" name="loadResult">
- <save name="loadResult" file="badLoadResult1.xml"/>
- <fail>Output failed loading part 1 of the test data. Check badLoadResult1.xml for output.</fail>
- </ifEqual>
-
-
- <!-- Load test002. Do not clear the model. -->
- <set name="modelName" value="@server@#test" />
- <set name="clearModel" value="false" />
- <set name="loadCommand" value="load <@baseuri@/jxdata/iTQL/rdfs/rdfs-domain-and-range/test002.rdf> into <@server@#test> ;" />
- <eval stepClass="org.mulgara.store.jxunit.LoadDataJX" />
-
- <ifEqual converse="true" file="loadResult2.txt" name="loadResult">
- <save name="loadResult" file="badLoadResult2.xml"/>
- <fail>Output failed loading part 2 of the test data. Check badLoadResult2.xml for output.</fail>
- </ifEqual>
-
-
- <!-- Load test003. Do not clear the model. -->
- <set name="modelName" value="@server@#test" />
- <set name="clearModel" value="false" />
- <set name="loadCommand" value="load <@baseuri@/jxdata/iTQL/rdfs/rdfs-domain-and-range/test003.rdf> into <@server@#test> ;" />
- <eval stepClass="org.mulgara.store.jxunit.LoadDataJX" />
-
- <ifEqual converse="true" file="loadResult3.txt" name="loadResult">
- <save name="loadResult" file="badLoadResult3.xml"/>
- <fail>Output failed loading part 3 of the test data. Check badLoadResult3.xml for output.</fail>
- </ifEqual>
-
- <!-- Reset the model clear flag, for the tests after this point -->
- <set name="clearModel" value="true" />
-
-
- <!-- Apply the rules -->
- <set name="query"
- value="apply <@baseuri@/rules/rdfs.dl> to <@server@#test> ;"/>
-
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <ifEqual converse="true" file="ruleResult1.txt" name="queryResult">
- <save name="queryResult" file="badRule1Result.xml"/>
- <fail>Output failed applying rules. Check badRule1Result.xml for output.</fail>
- </ifEqual>
-
-
- <!-- Check the results of entailment -->
-
- <!-- Look for types on baz1 -->
- <set name="query"
- value="select $o
- from <@server@#test>
- where <http://example.org/baz1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> $o
- order by $o ;"/>
-
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <ifEqual converse="true" file="queryResult1.txt" name="queryResult">
- <save name="queryResult" file="badQuery1Result.xml"/>
- <fail>Output failed for part 1 of first test. Check badQuery1Result.xml for output.</fail>
- </ifEqual>
-
- <!-- Look for types on baz2 -->
- <set name="query"
- value="select $o
- from <@server@#test>
- where <http://example.org/baz2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> $o
- order by $o ;"/>
-
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <ifEqual converse="true" file="queryResult2.txt" name="queryResult">
- <save name="queryResult" file="badQuery2Result.xml"/>
- <fail>Output failed for part 2 of first test. Check badQuery2Result.xml for output.</fail>
- </ifEqual>
-
- <!-- Get the types on Domain1, Domain2, Range1 and Range2 -->
- <set name="query"
- value="select $o
- from <@server@#test>
- where <http://example.org/Domain1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> $o
- order by $o ;"/>
-
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <ifEqual converse="true" file="queryResultCommon.txt" name="queryResult">
- <save name="queryResult" file="badQuery3Result.xml"/>
- <fail>Output failed for part 3 of first test. Check badQuery3Result.xml for output.</fail>
- </ifEqual>
-
-
- <set name="query"
- value="select $o
- from <@server@#test>
- where <http://example.org/Domain2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> $o
- order by $o ;"/>
-
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <ifEqual converse="true" file="queryResultCommon.txt" name="queryResult">
- <save name="queryResult" file="badQuery4Result.xml"/>
- <fail>Output failed for part 4 of first test. Check badQuery4Result.xml for output.</fail>
- </ifEqual>
-
-
- <set name="query"
- value="select $o
- from <@server@#test>
- where <http://example.org/Range1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> $o
- order by $o ;"/>
-
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <ifEqual converse="true" file="queryResultCommon.txt" name="queryResult">
- <save name="queryResult" file="badQuery5Result.xml"/>
- <fail>Output failed for part 5 of first test. Check badQuery5Result.xml for output.</fail>
- </ifEqual>
-
-
- <set name="query"
- value="select $o
- from <@server@#test>
- where <http://example.org/Range2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> $o
- order by $o ;"/>
-
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <ifEqual converse="true" file="queryResultCommon.txt" name="queryResult">
- <save name="queryResult" file="badQuery6Result.xml"/>
- <fail>Output failed for part 6 of first test. Check badQuery6Result.xml for output.</fail>
- </ifEqual>
-
-
- <!-- Load the first non-entailment test model -->
- <!-- Load premises005.rdf -->
- <set name="modelName" value="@server@#test" />
- <set name="loadCommand" value="load <@baseuri@/jxdata/iTQL/rdfs/rdfs-domain-and-range/premises005.rdf> into <@server@#test> ;" />
- <eval stepClass="org.mulgara.store.jxunit.LoadDataJX" />
-
- <ifEqual converse="true" file="loadResult4.txt" name="loadResult">
- <save name="loadResult" file="badLoadResult4.xml"/>
- <fail>Output failed loading the second test's data. Check badLoadResult4.xml for output.</fail>
- </ifEqual>
-
-
- <set name="query"
- value="select $o
- from <@server@#test>
- where <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/premises005.rdf#prop> <http://www.w3.org/2000/01/rdf-schema#range> $o
- order by $o ;"/>
-
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <ifEqual converse="true" file="queryResult7.txt" name="queryResult">
- <save name="queryResult" file="badQuery7Result.xml"/>
- <fail>Output failed for second test. Check badQuery7Result.xml for output.</fail>
- </ifEqual>
-
-
- <!-- Load the third non-entailment test model -->
- <!-- Load premises006.rdf -->
- <set name="modelName" value="@server@#test" />
- <set name="loadCommand" value="load <@baseuri@/jxdata/iTQL/rdfs/rdfs-domain-and-range/premises006.rdf> into <@server@#test> ;" />
- <eval stepClass="org.mulgara.store.jxunit.LoadDataJX" />
-
- <ifEqual converse="true" file="loadResult5.txt" name="loadResult">
- <save name="loadResult" file="badLoadResult5.xml"/>
- <fail>Output failed loading the third test's data. Check badLoadResult5.xml for output.</fail>
- </ifEqual>
-
-
- <set name="query"
- value="select $o
- from <@server@#test>
- where <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/premises006.rdf#prop> <http://www.w3.org/2000/01/rdf-schema#domain> $o
- order by $o ;"/>
-
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <ifEqual converse="true" file="queryResult8.txt" name="queryResult">
- <save name="queryResult" file="badQuery8Result.xml"/>
- <fail>Output failed for third test. Check badQuery8Result.xml for output.</fail>
- </ifEqual>
-
-
-</jxu>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test.jxu (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test.jxu)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test.jxu (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test.jxu 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,185 @@
+<jxu>
+ <set name="debug" value="false" />
+
+ <!-- Load the first 4 test files: test001 + test002 + test003 = test004 -->
+ <!-- Load test001 -->
+ <set name="modelName" value="@server@#test" />
+ <set name="loadCommand" value="load <@baseuri@/jxdata/iTQL/rdfs/rdfs-domain-and-range/test001.rdf> into <@server@#test> ;" />
+ <eval stepClass="org.mulgara.store.jxunit.LoadDataJX" />
+
+ <ifEqual converse="true" file="loadResult1.txt" name="loadResult">
+ <save name="loadResult" file="badLoadResult1.xml"/>
+ <fail>Output failed loading part 1 of the test data. Check badLoadResult1.xml for output.</fail>
+ </ifEqual>
+
+
+ <!-- Load test002. Do not clear the model. -->
+ <set name="modelName" value="@server@#test" />
+ <set name="clearModel" value="false" />
+ <set name="loadCommand" value="load <@baseuri@/jxdata/iTQL/rdfs/rdfs-domain-and-range/test002.rdf> into <@server@#test> ;" />
+ <eval stepClass="org.mulgara.store.jxunit.LoadDataJX" />
+
+ <ifEqual converse="true" file="loadResult2.txt" name="loadResult">
+ <save name="loadResult" file="badLoadResult2.xml"/>
+ <fail>Output failed loading part 2 of the test data. Check badLoadResult2.xml for output.</fail>
+ </ifEqual>
+
+
+ <!-- Load test003. Do not clear the model. -->
+ <set name="modelName" value="@server@#test" />
+ <set name="clearModel" value="false" />
+ <set name="loadCommand" value="load <@baseuri@/jxdata/iTQL/rdfs/rdfs-domain-and-range/test003.rdf> into <@server@#test> ;" />
+ <eval stepClass="org.mulgara.store.jxunit.LoadDataJX" />
+
+ <ifEqual converse="true" file="loadResult3.txt" name="loadResult">
+ <save name="loadResult" file="badLoadResult3.xml"/>
+ <fail>Output failed loading part 3 of the test data. Check badLoadResult3.xml for output.</fail>
+ </ifEqual>
+
+ <!-- Reset the model clear flag, for the tests after this point -->
+ <set name="clearModel" value="true" />
+
+
+ <!-- Apply the rules -->
+ <set name="query"
+ value="apply <@baseuri@/rules/rdfs.dl> to <@server@#test> ;"/>
+
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+ <ifEqual converse="true" file="ruleResult1.txt" name="queryResult">
+ <save name="queryResult" file="badRule1Result.xml"/>
+ <fail>Output failed applying rules. Check badRule1Result.xml for output.</fail>
+ </ifEqual>
+
+
+ <!-- Check the results of entailment -->
+
+ <!-- Look for types on baz1 -->
+ <set name="query"
+ value="select $o
+ from <@server@#test>
+ where <http://example.org/baz1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> $o
+ order by $o ;"/>
+
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+ <ifEqual converse="true" file="queryResult1.txt" name="queryResult">
+ <save name="queryResult" file="badQuery1Result.xml"/>
+ <fail>Output failed for part 1 of first test. Check badQuery1Result.xml for output.</fail>
+ </ifEqual>
+
+ <!-- Look for types on baz2 -->
+ <set name="query"
+ value="select $o
+ from <@server@#test>
+ where <http://example.org/baz2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> $o
+ order by $o ;"/>
+
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+ <ifEqual converse="true" file="queryResult2.txt" name="queryResult">
+ <save name="queryResult" file="badQuery2Result.xml"/>
+ <fail>Output failed for part 2 of first test. Check badQuery2Result.xml for output.</fail>
+ </ifEqual>
+
+ <!-- Get the types on Domain1, Domain2, Range1 and Range2 -->
+ <set name="query"
+ value="select $o
+ from <@server@#test>
+ where <http://example.org/Domain1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> $o
+ order by $o ;"/>
+
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+ <ifEqual converse="true" file="queryResultCommon.txt" name="queryResult">
+ <save name="queryResult" file="badQuery3Result.xml"/>
+ <fail>Output failed for part 3 of first test. Check badQuery3Result.xml for output.</fail>
+ </ifEqual>
+
+
+ <set name="query"
+ value="select $o
+ from <@server@#test>
+ where <http://example.org/Domain2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> $o
+ order by $o ;"/>
+
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+ <ifEqual converse="true" file="queryResultCommon.txt" name="queryResult">
+ <save name="queryResult" file="badQuery4Result.xml"/>
+ <fail>Output failed for part 4 of first test. Check badQuery4Result.xml for output.</fail>
+ </ifEqual>
+
+
+ <set name="query"
+ value="select $o
+ from <@server@#test>
+ where <http://example.org/Range1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> $o
+ order by $o ;"/>
+
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+ <ifEqual converse="true" file="queryResultCommon.txt" name="queryResult">
+ <save name="queryResult" file="badQuery5Result.xml"/>
+ <fail>Output failed for part 5 of first test. Check badQuery5Result.xml for output.</fail>
+ </ifEqual>
+
+
+ <set name="query"
+ value="select $o
+ from <@server@#test>
+ where <http://example.org/Range2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> $o
+ order by $o ;"/>
+
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+ <ifEqual converse="true" file="queryResultCommon.txt" name="queryResult">
+ <save name="queryResult" file="badQuery6Result.xml"/>
+ <fail>Output failed for part 6 of first test. Check badQuery6Result.xml for output.</fail>
+ </ifEqual>
+
+
+ <!-- Load the first non-entailment test model -->
+ <!-- Load premises005.rdf -->
+ <set name="modelName" value="@server@#test" />
+ <set name="loadCommand" value="load <@baseuri@/jxdata/iTQL/rdfs/rdfs-domain-and-range/premises005.rdf> into <@server@#test> ;" />
+ <eval stepClass="org.mulgara.store.jxunit.LoadDataJX" />
+
+ <ifEqual converse="true" file="loadResult4.txt" name="loadResult">
+ <save name="loadResult" file="badLoadResult4.xml"/>
+ <fail>Output failed loading the second test's data. Check badLoadResult4.xml for output.</fail>
+ </ifEqual>
+
+
+ <set name="query"
+ value="select $o
+ from <@server@#test>
+ where <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/premises005.rdf#prop> <http://www.w3.org/2000/01/rdf-schema#range> $o
+ order by $o ;"/>
+
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+ <ifEqual converse="true" file="queryResult7.txt" name="queryResult">
+ <save name="queryResult" file="badQuery7Result.xml"/>
+ <fail>Output failed for second test. Check badQuery7Result.xml for output.</fail>
+ </ifEqual>
+
+
+ <!-- Load the third non-entailment test model -->
+ <!-- Load premises006.rdf -->
+ <set name="modelName" value="@server@#test" />
+ <set name="loadCommand" value="load <@baseuri@/jxdata/iTQL/rdfs/rdfs-domain-and-range/premises006.rdf> into <@server@#test> ;" />
+ <eval stepClass="org.mulgara.store.jxunit.LoadDataJX" />
+
+ <ifEqual converse="true" file="loadResult5.txt" name="loadResult">
+ <save name="loadResult" file="badLoadResult5.xml"/>
+ <fail>Output failed loading the third test's data. Check badLoadResult5.xml for output.</fail>
+ </ifEqual>
+
+
+ <set name="query"
+ value="select $o
+ from <@server@#test>
+ where <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-domain-and-range/premises006.rdf#prop> <http://www.w3.org/2000/01/rdf-schema#domain> $o
+ order by $o ;"/>
+
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+ <ifEqual converse="true" file="queryResult8.txt" name="queryResult">
+ <save name="queryResult" file="badQuery8Result.xml"/>
+ <fail>Output failed for third test. Check badQuery8Result.xml for output.</fail>
+ </ifEqual>
+
+
+</jxu>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test001.nt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test001.nt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test001.nt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,16 +0,0 @@
-# Copyright World Wide Web Consortium, (Massachusetts Institute of
-# Technology, Institut National de Recherche en Informatique et en
-# Automatique, Keio University).
-#
-# All Rights Reserved.
-#
-# Please see the full Copyright clause at
-# <http://www.w3.org/Consortium/Legal/copyright-software.html>
-#
-# $Id: test001.nt,v 1.1 2005/07/03 13:11:02 pgearon Exp $
-##################################################################
-
-<http://example.org/bar> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Property> .
-<http://example.org/bar> <http://www.w3.org/2000/01/rdf-schema#domain> <http://example.org/Domain1> .
-<http://example.org/bar> <http://www.w3.org/2000/01/rdf-schema#domain> <http://example.org/Domain2> .
-
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test001.nt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test001.nt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test001.nt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test001.nt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,16 @@
+# Copyright World Wide Web Consortium, (Massachusetts Institute of
+# Technology, Institut National de Recherche en Informatique et en
+# Automatique, Keio University).
+#
+# All Rights Reserved.
+#
+# Please see the full Copyright clause at
+# <http://www.w3.org/Consortium/Legal/copyright-software.html>
+#
+# $Id: test001.nt,v 1.1 2005/07/03 13:11:02 pgearon Exp $
+##################################################################
+
+<http://example.org/bar> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Property> .
+<http://example.org/bar> <http://www.w3.org/2000/01/rdf-schema#domain> <http://example.org/Domain1> .
+<http://example.org/bar> <http://www.w3.org/2000/01/rdf-schema#domain> <http://example.org/Domain2> .
+
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test001.rdf
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test001.rdf 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test001.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Copyright World Wide Web Consortium, (Massachusetts Institute of
- Technology, Institut National de Recherche en Informatique et en
- Automatique, Keio University).
-
- All Rights Reserved.
-
- Please see the full Copyright clause at
- <http://www.w3.org/Consortium/Legal/copyright-software.html>
-
- Description: a RDF Property may have more than one domain property
-
- Related issue:
-
- http://www.w3.org/2000/03/rdf-tracking/#rdfs-domain-and-range
-
- $Id: test001.rdf,v 1.1 2005/07/03 13:11:02 pgearon Exp $
--->
-
-<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#">
-
- <rdf:Property rdf:about="http://example.org/bar">
- <rdfs:domain rdf:resource="http://example.org/Domain1"/>
- <rdfs:domain rdf:resource="http://example.org/Domain2"/>
- </rdf:Property>
-
-</rdf:RDF>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test001.rdf (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test001.rdf)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test001.rdf (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test001.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+ Copyright World Wide Web Consortium, (Massachusetts Institute of
+ Technology, Institut National de Recherche en Informatique et en
+ Automatique, Keio University).
+
+ All Rights Reserved.
+
+ Please see the full Copyright clause at
+ <http://www.w3.org/Consortium/Legal/copyright-software.html>
+
+ Description: a RDF Property may have more than one domain property
+
+ Related issue:
+
+ http://www.w3.org/2000/03/rdf-tracking/#rdfs-domain-and-range
+
+ $Id: test001.rdf,v 1.1 2005/07/03 13:11:02 pgearon Exp $
+-->
+
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#">
+
+ <rdf:Property rdf:about="http://example.org/bar">
+ <rdfs:domain rdf:resource="http://example.org/Domain1"/>
+ <rdfs:domain rdf:resource="http://example.org/Domain2"/>
+ </rdf:Property>
+
+</rdf:RDF>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test002.nt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test002.nt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test002.nt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,16 +0,0 @@
-# Copyright World Wide Web Consortium, (Massachusetts Institute of
-# Technology, Institut National de Recherche en Informatique et en
-# Automatique, Keio University).
-#
-# All Rights Reserved.
-#
-# Please see the full Copyright clause at
-# <http://www.w3.org/Consortium/Legal/copyright-software.html>
-#
-# $Id: test002.nt,v 1.1 2005/07/03 13:11:02 pgearon Exp $
-##################################################################
-
-<http://example.org/bar> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Property> .
-<http://example.org/bar> <http://www.w3.org/2000/01/rdf-schema#range> <http://example.org/Range1> .
-<http://example.org/bar> <http://www.w3.org/2000/01/rdf-schema#range> <http://example.org/Range2> .
-
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test002.nt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test002.nt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test002.nt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test002.nt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,16 @@
+# Copyright World Wide Web Consortium, (Massachusetts Institute of
+# Technology, Institut National de Recherche en Informatique et en
+# Automatique, Keio University).
+#
+# All Rights Reserved.
+#
+# Please see the full Copyright clause at
+# <http://www.w3.org/Consortium/Legal/copyright-software.html>
+#
+# $Id: test002.nt,v 1.1 2005/07/03 13:11:02 pgearon Exp $
+##################################################################
+
+<http://example.org/bar> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Property> .
+<http://example.org/bar> <http://www.w3.org/2000/01/rdf-schema#range> <http://example.org/Range1> .
+<http://example.org/bar> <http://www.w3.org/2000/01/rdf-schema#range> <http://example.org/Range2> .
+
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test002.rdf
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test002.rdf 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test002.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Copyright World Wide Web Consortium, (Massachusetts Institute of
- Technology, Institut National de Recherche en Informatique et en
- Automatique, Keio University).
-
- All Rights Reserved.
-
- Please see the full Copyright clause at
- <http://www.w3.org/Consortium/Legal/copyright-software.html>
-
- Description: a RDF property may have more than one range property.
-
- Related issue:
-
- http://www.w3.org/2000/03/rdf-tracking/#rdfs-domain-and-range
-
- $Id: test002.rdf,v 1.1 2005/07/03 13:11:02 pgearon Exp $
--->
-
-<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#">
-
- <rdf:Property rdf:about="http://example.org/bar">
- <rdfs:range rdf:resource="http://example.org/Range1"/>
- <rdfs:range rdf:resource="http://example.org/Range2"/>
- </rdf:Property>
-
-</rdf:RDF>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test002.rdf (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test002.rdf)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test002.rdf (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test002.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+ Copyright World Wide Web Consortium, (Massachusetts Institute of
+ Technology, Institut National de Recherche en Informatique et en
+ Automatique, Keio University).
+
+ All Rights Reserved.
+
+ Please see the full Copyright clause at
+ <http://www.w3.org/Consortium/Legal/copyright-software.html>
+
+ Description: a RDF property may have more than one range property.
+
+ Related issue:
+
+ http://www.w3.org/2000/03/rdf-tracking/#rdfs-domain-and-range
+
+ $Id: test002.rdf,v 1.1 2005/07/03 13:11:02 pgearon Exp $
+-->
+
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#">
+
+ <rdf:Property rdf:about="http://example.org/bar">
+ <rdfs:range rdf:resource="http://example.org/Range1"/>
+ <rdfs:range rdf:resource="http://example.org/Range2"/>
+ </rdf:Property>
+
+</rdf:RDF>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test003.nt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test003.nt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test003.nt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,14 +0,0 @@
-# Copyright World Wide Web Consortium, (Massachusetts Institute of
-# Technology, Institut National de Recherche en Informatique et en
-# Automatique, Keio University).
-#
-# All Rights Reserved.
-#
-# Please see the full Copyright clause at
-# <http://www.w3.org/Consortium/Legal/copyright-software.html>
-#
-# $Id: test003.nt,v 1.1 2005/07/03 13:11:02 pgearon Exp $
-##################################################################
-
-<http://example.org/baz1> <http://example.org/bar> <http://example.org/baz2> .
-
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test003.nt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test003.nt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test003.nt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test003.nt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,14 @@
+# Copyright World Wide Web Consortium, (Massachusetts Institute of
+# Technology, Institut National de Recherche en Informatique et en
+# Automatique, Keio University).
+#
+# All Rights Reserved.
+#
+# Please see the full Copyright clause at
+# <http://www.w3.org/Consortium/Legal/copyright-software.html>
+#
+# $Id: test003.nt,v 1.1 2005/07/03 13:11:02 pgearon Exp $
+##################################################################
+
+<http://example.org/baz1> <http://example.org/bar> <http://example.org/baz2> .
+
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test003.rdf
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test003.rdf 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test003.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Copyright World Wide Web Consortium, (Massachusetts Institute of
- Technology, Institut National de Recherche en Informatique et en
- Automatique, Keio University).
-
- All Rights Reserved.
-
- Please see the full Copyright clause at
- <http://www.w3.org/Consortium/Legal/copyright-software.html>
-
- $Id: test003.rdf,v 1.1 2005/07/03 13:11:02 pgearon Exp $
--->
-
-<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:test="http://example.org/">
-
- <rdf:Description rdf:about="http://example.org/baz1">
- <test:bar rdf:resource="http://example.org/baz2"/>
- </rdf:Description>
-</rdf:RDF>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test003.rdf (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test003.rdf)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test003.rdf (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test003.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+ Copyright World Wide Web Consortium, (Massachusetts Institute of
+ Technology, Institut National de Recherche en Informatique et en
+ Automatique, Keio University).
+
+ All Rights Reserved.
+
+ Please see the full Copyright clause at
+ <http://www.w3.org/Consortium/Legal/copyright-software.html>
+
+ $Id: test003.rdf,v 1.1 2005/07/03 13:11:02 pgearon Exp $
+-->
+
+<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:test="http://example.org/">
+
+ <rdf:Description rdf:about="http://example.org/baz1">
+ <test:bar rdf:resource="http://example.org/baz2"/>
+ </rdf:Description>
+</rdf:RDF>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test004.nt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test004.nt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test004.nt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,21 +0,0 @@
-# Copyright World Wide Web Consortium, (Massachusetts Institute of
-# Technology, Institut National de Recherche en Informatique et en
-# Automatique, Keio University).
-#
-# All Rights Reserved.
-#
-# Please see the full Copyright clause at
-# <http://www.w3.org/Consortium/Legal/copyright-software.html>
-#
-# $Id: test004.nt,v 1.1 2005/07/03 13:11:02 pgearon Exp $
-##################################################################
-
-<http://example.org/baz1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Domain1> .
-<http://example.org/baz1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Domain2> .
-<http://example.org/baz2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Range1> .
-<http://example.org/baz2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Range2> .
-<http://example.org/Domain1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#Class> .
-<http://example.org/Domain2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#Class> .
-<http://example.org/Range1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#Class> .
-<http://example.org/Range2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#Class> .
-
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test004.nt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test004.nt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test004.nt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test004.nt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,21 @@
+# Copyright World Wide Web Consortium, (Massachusetts Institute of
+# Technology, Institut National de Recherche en Informatique et en
+# Automatique, Keio University).
+#
+# All Rights Reserved.
+#
+# Please see the full Copyright clause at
+# <http://www.w3.org/Consortium/Legal/copyright-software.html>
+#
+# $Id: test004.nt,v 1.1 2005/07/03 13:11:02 pgearon Exp $
+##################################################################
+
+<http://example.org/baz1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Domain1> .
+<http://example.org/baz1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Domain2> .
+<http://example.org/baz2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Range1> .
+<http://example.org/baz2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Range2> .
+<http://example.org/Domain1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#Class> .
+<http://example.org/Domain2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#Class> .
+<http://example.org/Range1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#Class> .
+<http://example.org/Range2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#Class> .
+
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test004.rdf
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test004.rdf 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test004.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Copyright World Wide Web Consortium, (Massachusetts Institute of
- Technology, Institut National de Recherche en Informatique et en
- Automatique, Keio University).
-
- All Rights Reserved.
-
- Please see the full Copyright clause at
- <http://www.w3.org/Consortium/Legal/copyright-software.html>
-
- $Id: test004.rdf,v 1.1 2005/07/03 13:11:02 pgearon Exp $
--->
-
-<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:test="http://example.org/">
-
- <test:Domain1 rdf:about="http://example.org/baz1"/>
- <test:Domain2 rdf:about="http://example.org/baz1"/>
- <test:Range1 rdf:about="http://example.org/baz2"/>
- <test:Range2 rdf:about="http://example.org/baz2"/>
- <rdfs:Class rdf:about="http://example.org/Domain1" />
- <rdfs:Class rdf:about="http://example.org/Domain2" />
- <rdfs:Class rdf:about="http://example.org/Range1" />
- <rdfs:Class rdf:about="http://example.org/Range2" />
-</rdf:RDF>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test004.rdf (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test004.rdf)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test004.rdf (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-domain-and-range/test004.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!--
+ Copyright World Wide Web Consortium, (Massachusetts Institute of
+ Technology, Institut National de Recherche en Informatique et en
+ Automatique, Keio University).
+
+ All Rights Reserved.
+
+ Please see the full Copyright clause at
+ <http://www.w3.org/Consortium/Legal/copyright-software.html>
+
+ $Id: test004.rdf,v 1.1 2005/07/03 13:11:02 pgearon Exp $
+-->
+
+<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:test="http://example.org/">
+
+ <test:Domain1 rdf:about="http://example.org/baz1"/>
+ <test:Domain2 rdf:about="http://example.org/baz1"/>
+ <test:Range1 rdf:about="http://example.org/baz2"/>
+ <test:Range2 rdf:about="http://example.org/baz2"/>
+ <rdfs:Class rdf:about="http://example.org/Domain1" />
+ <rdfs:Class rdf:about="http://example.org/Domain2" />
+ <rdfs:Class rdf:about="http://example.org/Range1" />
+ <rdfs:Class rdf:about="http://example.org/Range2" />
+</rdf:RDF>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf)
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/Manifest.rdf
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/Manifest.rdf 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/Manifest.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-
-<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:test="http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#"
->
-
-<test:PositiveEntailmentTest rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/Manifest.rdf#test001">
-
- <test:issue rdf:resource="http://www.w3.org/2000/03/rdf-tracking/#rdfs-no-cycles-in-subClassOf" />
- <test:status>APPROVED</test:status>
- <test:approval rdf:resource="http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2001Oct/0249.html" />
-
- <test:description>
- Cycles are permitted in subClassOf; therefore, no error occurs and the following entailment
- holds trivially.
- </test:description>
-
- <test:entailmentRules rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#" />
- <test:entailmentRules rdf:resource="http://www.w3.org/2000/01/rdf-schema#" />
-
- <test:premiseDocument>
- <test:RDF-XML-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001.rdf" />
- </test:premiseDocument>
-
- <test:conclusionDocument>
- <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001.nt" />
- </test:conclusionDocument>
-
-</test:PositiveEntailmentTest>
-
-
-
-</rdf:RDF>
-
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/Manifest.rdf (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/Manifest.rdf)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/Manifest.rdf (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/Manifest.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+
+<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:test="http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#"
+>
+
+<test:PositiveEntailmentTest rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/Manifest.rdf#test001">
+
+ <test:issue rdf:resource="http://www.w3.org/2000/03/rdf-tracking/#rdfs-no-cycles-in-subClassOf" />
+ <test:status>APPROVED</test:status>
+ <test:approval rdf:resource="http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2001Oct/0249.html" />
+
+ <test:description>
+ Cycles are permitted in subClassOf; therefore, no error occurs and the following entailment
+ holds trivially.
+ </test:description>
+
+ <test:entailmentRules rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#" />
+ <test:entailmentRules rdf:resource="http://www.w3.org/2000/01/rdf-schema#" />
+
+ <test:premiseDocument>
+ <test:RDF-XML-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001.rdf" />
+ </test:premiseDocument>
+
+ <test:conclusionDocument>
+ <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001.nt" />
+ </test:conclusionDocument>
+
+</test:PositiveEntailmentTest>
+
+
+
+</rdf:RDF>
+
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/loadResult1.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/loadResult1.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/loadResult1.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully loaded 3 statements from @baseuri@/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subClassOf/test001.rdf into @server@#test</message></query></answer>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/loadResult1.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/loadResult1.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/loadResult1.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/loadResult1.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully loaded 3 statements from @baseuri@/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subClassOf/test001.rdf into @server@#test</message></query></answer>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/queryResult3.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/queryResult3.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/queryResult3.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><variables><o/></variables><solution><o resource="http://www.w3.org/2000/01/rdf-schema#Resource"/></solution><solution><o resource="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#X"/></solution></query></answer>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/queryResult3.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/queryResult3.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/queryResult3.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/queryResult3.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><variables><o/></variables><solution><o resource="http://www.w3.org/2000/01/rdf-schema#Resource"/></solution><solution><o resource="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#X"/></solution></query></answer>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/queryResultCommon.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/queryResultCommon.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/queryResultCommon.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><variables><o/></variables><solution><o resource="http://www.w3.org/2000/01/rdf-schema#Resource"/></solution><solution><o resource="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#A"/></solution><solution><o resource="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#B"/></solution></query></answer>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/queryResultCommon.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/queryResultCommon.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/queryResultCommon.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/queryResultCommon.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><variables><o/></variables><solution><o resource="http://www.w3.org/2000/01/rdf-schema#Resource"/></solution><solution><o resource="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#A"/></solution><solution><o resource="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#B"/></solution></query></answer>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/ruleResult1.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/ruleResult1.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/ruleResult1.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully applied @baseuri@/rules/rdfs.dl to @server@#test</message></query></answer>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/ruleResult1.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/ruleResult1.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/ruleResult1.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/ruleResult1.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully applied @baseuri@/rules/rdfs.dl to @server@#test</message></query></answer>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/test.jxu
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/test.jxu 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/test.jxu 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,67 +0,0 @@
-<jxu>
- <set name="debug" value="false" />
-
- <!-- Load the test data -->
- <set name="modelName" value="@server@#test" />
- <set name="loadCommand" value="load <@baseuri@/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subClassOf/test001.rdf> into <@server@#test> ;" />
- <eval stepClass="org.mulgara.store.jxunit.LoadDataJX" />
-
- <ifEqual converse="true" file="loadResult1.txt" name="loadResult">
- <save name="loadResult" file="badLoadResult1.xml"/>
- <fail>Output failed loading test data. Check badLoadResult1.xml for output.</fail>
- </ifEqual>
-
-
- <!-- Apply the rules -->
- <set name="query"
- value="apply <@baseuri@/rules/rdfs.dl> to <@server@#test> ;"/>
-
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <ifEqual converse="true" file="ruleResult1.txt" name="queryResult">
- <save name="queryResult" file="badRule1Result.xml"/>
- <fail>Output failed applying rules. Check badRule1Result.xml for output.</fail>
- </ifEqual>
-
-
- <!-- Query for A rdfs:subClassOf * -->
- <set name="query"
- value="select $o
- from <@server@#test>
- where <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#A> <http://www.w3.org/2000/01/rdf-schema#subClassOf> $o
- order by $o ;"/>
-
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <ifEqual converse="true" file="queryResultCommon.txt" name="queryResult">
- <save name="queryResult" file="badQuery1Result.xml"/>
- <fail>Output failed for test result 1. Check badQuery1Result.xml for output.</fail>
- </ifEqual>
-
-
- <!-- Query for B rdfs:subClassOf * -->
- <set name="query"
- value="select $o
- from <@server@#test>
- where <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#B> <http://www.w3.org/2000/01/rdf-schema#subClassOf> $o
- order by $o ;"/>
-
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <ifEqual converse="true" file="queryResultCommon.txt" name="queryResult">
- <save name="queryResult" file="badQuery2Result.xml"/>
- <fail>Output failed for test result 2. Check badQuery2Result.xml for output.</fail>
- </ifEqual>
-
-
- <!-- Query for X rdfs:subClassOf * -->
- <set name="query"
- value="select $o
- from <@server@#test>
- where <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#X> <http://www.w3.org/2000/01/rdf-schema#subClassOf> $o
- order by $o ;"/>
-
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <ifEqual converse="true" file="queryResult3.txt" name="queryResult">
- <save name="queryResult" file="badQuery3Result.xml"/>
- <fail>Output failed for test result 3. Check badQuery3Result.xml for output.</fail>
- </ifEqual>
-
-</jxu>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/test.jxu (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/test.jxu)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/test.jxu (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/test.jxu 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,67 @@
+<jxu>
+ <set name="debug" value="false" />
+
+ <!-- Load the test data -->
+ <set name="modelName" value="@server@#test" />
+ <set name="loadCommand" value="load <@baseuri@/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subClassOf/test001.rdf> into <@server@#test> ;" />
+ <eval stepClass="org.mulgara.store.jxunit.LoadDataJX" />
+
+ <ifEqual converse="true" file="loadResult1.txt" name="loadResult">
+ <save name="loadResult" file="badLoadResult1.xml"/>
+ <fail>Output failed loading test data. Check badLoadResult1.xml for output.</fail>
+ </ifEqual>
+
+
+ <!-- Apply the rules -->
+ <set name="query"
+ value="apply <@baseuri@/rules/rdfs.dl> to <@server@#test> ;"/>
+
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+ <ifEqual converse="true" file="ruleResult1.txt" name="queryResult">
+ <save name="queryResult" file="badRule1Result.xml"/>
+ <fail>Output failed applying rules. Check badRule1Result.xml for output.</fail>
+ </ifEqual>
+
+
+ <!-- Query for A rdfs:subClassOf * -->
+ <set name="query"
+ value="select $o
+ from <@server@#test>
+ where <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#A> <http://www.w3.org/2000/01/rdf-schema#subClassOf> $o
+ order by $o ;"/>
+
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+ <ifEqual converse="true" file="queryResultCommon.txt" name="queryResult">
+ <save name="queryResult" file="badQuery1Result.xml"/>
+ <fail>Output failed for test result 1. Check badQuery1Result.xml for output.</fail>
+ </ifEqual>
+
+
+ <!-- Query for B rdfs:subClassOf * -->
+ <set name="query"
+ value="select $o
+ from <@server@#test>
+ where <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#B> <http://www.w3.org/2000/01/rdf-schema#subClassOf> $o
+ order by $o ;"/>
+
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+ <ifEqual converse="true" file="queryResultCommon.txt" name="queryResult">
+ <save name="queryResult" file="badQuery2Result.xml"/>
+ <fail>Output failed for test result 2. Check badQuery2Result.xml for output.</fail>
+ </ifEqual>
+
+
+ <!-- Query for X rdfs:subClassOf * -->
+ <set name="query"
+ value="select $o
+ from <@server@#test>
+ where <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#X> <http://www.w3.org/2000/01/rdf-schema#subClassOf> $o
+ order by $o ;"/>
+
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+ <ifEqual converse="true" file="queryResult3.txt" name="queryResult">
+ <save name="queryResult" file="badQuery3Result.xml"/>
+ <fail>Output failed for test result 3. Check badQuery3Result.xml for output.</fail>
+ </ifEqual>
+
+</jxu>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/test001.nt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/test001.nt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/test001.nt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,18 +0,0 @@
-# Copyright World Wide Web Consortium, (Massachusetts Institute of
-# Technology, Institut National de Recherche en Informatique et en
-# Automatique, Keio University).
-#
-# All Rights Reserved.
-#
-# Please see the full Copyright clause at
-# <http://www.w3.org/Consortium/Legal/copyright-software.html>
-#
-# Author: Dan Connolly
-#
-# $Id: test001.nt,v 1.1 2005/07/03 13:11:02 pgearon Exp $
-#
-
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#A> <http://www.w3.org/2000/01/rdf-schema#subClassOf> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#B> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#B> <http://www.w3.org/2000/01/rdf-schema#subClassOf> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#A> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#X> <http://www.w3.org/2000/01/rdf-schema#subClassOf> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#X> .
-
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/test001.nt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/test001.nt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/test001.nt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/test001.nt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,18 @@
+# Copyright World Wide Web Consortium, (Massachusetts Institute of
+# Technology, Institut National de Recherche en Informatique et en
+# Automatique, Keio University).
+#
+# All Rights Reserved.
+#
+# Please see the full Copyright clause at
+# <http://www.w3.org/Consortium/Legal/copyright-software.html>
+#
+# Author: Dan Connolly
+#
+# $Id: test001.nt,v 1.1 2005/07/03 13:11:02 pgearon Exp $
+#
+
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#A> <http://www.w3.org/2000/01/rdf-schema#subClassOf> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#B> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#B> <http://www.w3.org/2000/01/rdf-schema#subClassOf> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#A> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#X> <http://www.w3.org/2000/01/rdf-schema#subClassOf> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#X> .
+
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/test001.rdf
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/test001.rdf 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/test001.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Copyright World Wide Web Consortium, (Massachusetts Institute of
- Technology, Institut National de Recherche en Informatique et en
- Automatique, Keio University).
-
- All Rights Reserved.
-
- Please see the full Copyright clause at
- <http://www.w3.org/Consortium/Legal/copyright-software.html>
-
- Author: Dan Connolly
-
- Description: see:
-
- http://www.w3.org/2000/03/rdf-tracking/#rdfs-no-cycles-in-subClassOf
-
- $Id: test001.rdf,v 1.1 2005/07/03 13:11:02 pgearon Exp $
-
--->
-
-<rdf:RDF
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#">
-
- <rdf:Description rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#A">
- <rdfs:subClassOf rdf:resource="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#B"/>
- </rdf:Description>
-
- <rdf:Description rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#B">
- <rdfs:subClassOf rdf:resource="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#A"/>
- </rdf:Description>
-
- <rdf:Description rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#X">
- <rdfs:subClassOf rdf:resource="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#X"/>
- </rdf:Description>
-</rdf:RDF>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/test001.rdf (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/test001.rdf)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/test001.rdf (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subClassOf/test001.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!--
+ Copyright World Wide Web Consortium, (Massachusetts Institute of
+ Technology, Institut National de Recherche en Informatique et en
+ Automatique, Keio University).
+
+ All Rights Reserved.
+
+ Please see the full Copyright clause at
+ <http://www.w3.org/Consortium/Legal/copyright-software.html>
+
+ Author: Dan Connolly
+
+ Description: see:
+
+ http://www.w3.org/2000/03/rdf-tracking/#rdfs-no-cycles-in-subClassOf
+
+ $Id: test001.rdf,v 1.1 2005/07/03 13:11:02 pgearon Exp $
+
+-->
+
+<rdf:RDF
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#">
+
+ <rdf:Description rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#A">
+ <rdfs:subClassOf rdf:resource="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#B"/>
+ </rdf:Description>
+
+ <rdf:Description rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#B">
+ <rdfs:subClassOf rdf:resource="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#A"/>
+ </rdf:Description>
+
+ <rdf:Description rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#X">
+ <rdfs:subClassOf rdf:resource="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subClassOf/test001#X"/>
+ </rdf:Description>
+</rdf:RDF>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf)
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/Manifest.rdf
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/Manifest.rdf 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/Manifest.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-
-<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:test="http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#"
->
-
-<test:PositiveEntailmentTest rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/Manifest.rdf#test001">
-
- <test:issue rdf:resource="http://www.w3.org/2000/03/rdf-tracking/#rdfs-no-cycles-in-subPropertyOf" />
- <test:status>APPROVED</test:status>
- <test:approval rdf:resource="http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2001Oct/0249.html" />
-
- <test:description>
- Cycles are permitted in subPropertyOf; therefore, no error occurs and the following entailment
- holds trivially.
- </test:description>
-
- <test:entailmentRules rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#" />
- <test:entailmentRules rdf:resource="http://www.w3.org/2000/01/rdf-schema#" />
-
- <test:premiseDocument>
- <test:RDF-XML-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001.rdf" />
- </test:premiseDocument>
-
- <test:conclusionDocument>
- <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001.nt" />
- </test:conclusionDocument>
-
-</test:PositiveEntailmentTest>
-
-
-
-</rdf:RDF>
-
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/Manifest.rdf (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/Manifest.rdf)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/Manifest.rdf (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/Manifest.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+
+<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:test="http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#"
+>
+
+<test:PositiveEntailmentTest rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/Manifest.rdf#test001">
+
+ <test:issue rdf:resource="http://www.w3.org/2000/03/rdf-tracking/#rdfs-no-cycles-in-subPropertyOf" />
+ <test:status>APPROVED</test:status>
+ <test:approval rdf:resource="http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2001Oct/0249.html" />
+
+ <test:description>
+ Cycles are permitted in subPropertyOf; therefore, no error occurs and the following entailment
+ holds trivially.
+ </test:description>
+
+ <test:entailmentRules rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#" />
+ <test:entailmentRules rdf:resource="http://www.w3.org/2000/01/rdf-schema#" />
+
+ <test:premiseDocument>
+ <test:RDF-XML-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001.rdf" />
+ </test:premiseDocument>
+
+ <test:conclusionDocument>
+ <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001.nt" />
+ </test:conclusionDocument>
+
+</test:PositiveEntailmentTest>
+
+
+
+</rdf:RDF>
+
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/loadResult1.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/loadResult1.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/loadResult1.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully loaded 3 statements from @baseuri@/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subPropertyOf/test001.rdf into @server@#test</message></query></answer>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/loadResult1.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/loadResult1.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/loadResult1.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/loadResult1.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully loaded 3 statements from @baseuri@/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subPropertyOf/test001.rdf into @server@#test</message></query></answer>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/queryResult3.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/queryResult3.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/queryResult3.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><variables><o/></variables><solution><o resource="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#X"/></solution></query></answer>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/queryResult3.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/queryResult3.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/queryResult3.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/queryResult3.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><variables><o/></variables><solution><o resource="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#X"/></solution></query></answer>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/queryResultCommon.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/queryResultCommon.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/queryResultCommon.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><variables><o/></variables><solution><o resource="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#A"/></solution><solution><o resource="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#B"/></solution></query></answer>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/queryResultCommon.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/queryResultCommon.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/queryResultCommon.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/queryResultCommon.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><variables><o/></variables><solution><o resource="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#A"/></solution><solution><o resource="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#B"/></solution></query></answer>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/ruleResult1.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/ruleResult1.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/ruleResult1.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully applied @baseuri@/rules/rdfs.dl to @server@#test</message></query></answer>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/ruleResult1.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/ruleResult1.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/ruleResult1.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/ruleResult1.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully applied @baseuri@/rules/rdfs.dl to @server@#test</message></query></answer>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/test.jxu
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/test.jxu 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/test.jxu 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,67 +0,0 @@
-<jxu>
- <set name="debug" value="false" />
-
- <!-- Load the test data -->
- <set name="modelName" value="@server@#test" />
- <set name="loadCommand" value="load <@baseuri@/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subPropertyOf/test001.rdf> into <@server@#test> ;" />
- <eval stepClass="org.mulgara.store.jxunit.LoadDataJX" />
-
- <ifEqual converse="true" file="loadResult1.txt" name="loadResult">
- <save name="loadResult" file="badLoadResult1.xml"/>
- <fail>Output failed loading test data. Check badLoadResult1.xml for output.</fail>
- </ifEqual>
-
-
- <!-- Apply the rules -->
- <set name="query"
- value="apply <@baseuri@/rules/rdfs.dl> to <@server@#test> ;"/>
-
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <ifEqual converse="true" file="ruleResult1.txt" name="queryResult">
- <save name="queryResult" file="badRule1Result.xml"/>
- <fail>Output failed applying rules. Check badRule1Result.xml for output.</fail>
- </ifEqual>
-
-
- <!-- Query for A rdfs:subPropertyOf * -->
- <set name="query"
- value="select $o
- from <@server@#test>
- where <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#A> <http://www.w3.org/2000/01/rdf-schema#subPropertyOf> $o
- order by $o ;"/>
-
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <ifEqual converse="true" file="queryResultCommon.txt" name="queryResult">
- <save name="queryResult" file="badQuery1Result.xml"/>
- <fail>Output failed for test result 1. Check badQuery1Result.xml for output.</fail>
- </ifEqual>
-
-
- <!-- Query for B rdfs:subPropertyOf * -->
- <set name="query"
- value="select $o
- from <@server@#test>
- where <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#B> <http://www.w3.org/2000/01/rdf-schema#subPropertyOf> $o
- order by $o ;"/>
-
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <ifEqual converse="true" file="queryResultCommon.txt" name="queryResult">
- <save name="queryResult" file="badQuery2Result.xml"/>
- <fail>Output failed for test result 2. Check badQuery2Result.xml for output.</fail>
- </ifEqual>
-
-
- <!-- Query for X rdfs:subPropertyOf * -->
- <set name="query"
- value="select $o
- from <@server@#test>
- where <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#X> <http://www.w3.org/2000/01/rdf-schema#subPropertyOf> $o
- order by $o ;"/>
-
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <ifEqual converse="true" file="queryResult3.txt" name="queryResult">
- <save name="queryResult" file="badQuery3Result.xml"/>
- <fail>Output failed for test result 3. Check badQuery3Result.xml for output.</fail>
- </ifEqual>
-
-</jxu>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/test.jxu (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/test.jxu)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/test.jxu (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/test.jxu 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,67 @@
+<jxu>
+ <set name="debug" value="false" />
+
+ <!-- Load the test data -->
+ <set name="modelName" value="@server@#test" />
+ <set name="loadCommand" value="load <@baseuri@/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subPropertyOf/test001.rdf> into <@server@#test> ;" />
+ <eval stepClass="org.mulgara.store.jxunit.LoadDataJX" />
+
+ <ifEqual converse="true" file="loadResult1.txt" name="loadResult">
+ <save name="loadResult" file="badLoadResult1.xml"/>
+ <fail>Output failed loading test data. Check badLoadResult1.xml for output.</fail>
+ </ifEqual>
+
+
+ <!-- Apply the rules -->
+ <set name="query"
+ value="apply <@baseuri@/rules/rdfs.dl> to <@server@#test> ;"/>
+
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+ <ifEqual converse="true" file="ruleResult1.txt" name="queryResult">
+ <save name="queryResult" file="badRule1Result.xml"/>
+ <fail>Output failed applying rules. Check badRule1Result.xml for output.</fail>
+ </ifEqual>
+
+
+ <!-- Query for A rdfs:subPropertyOf * -->
+ <set name="query"
+ value="select $o
+ from <@server@#test>
+ where <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#A> <http://www.w3.org/2000/01/rdf-schema#subPropertyOf> $o
+ order by $o ;"/>
+
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+ <ifEqual converse="true" file="queryResultCommon.txt" name="queryResult">
+ <save name="queryResult" file="badQuery1Result.xml"/>
+ <fail>Output failed for test result 1. Check badQuery1Result.xml for output.</fail>
+ </ifEqual>
+
+
+ <!-- Query for B rdfs:subPropertyOf * -->
+ <set name="query"
+ value="select $o
+ from <@server@#test>
+ where <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#B> <http://www.w3.org/2000/01/rdf-schema#subPropertyOf> $o
+ order by $o ;"/>
+
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+ <ifEqual converse="true" file="queryResultCommon.txt" name="queryResult">
+ <save name="queryResult" file="badQuery2Result.xml"/>
+ <fail>Output failed for test result 2. Check badQuery2Result.xml for output.</fail>
+ </ifEqual>
+
+
+ <!-- Query for X rdfs:subPropertyOf * -->
+ <set name="query"
+ value="select $o
+ from <@server@#test>
+ where <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#X> <http://www.w3.org/2000/01/rdf-schema#subPropertyOf> $o
+ order by $o ;"/>
+
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+ <ifEqual converse="true" file="queryResult3.txt" name="queryResult">
+ <save name="queryResult" file="badQuery3Result.xml"/>
+ <fail>Output failed for test result 3. Check badQuery3Result.xml for output.</fail>
+ </ifEqual>
+
+</jxu>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/test001.nt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/test001.nt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/test001.nt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,18 +0,0 @@
-# Copyright World Wide Web Consortium, (Massachusetts Institute of
-# Technology, Institut National de Recherche en Informatique et en
-# Automatique, Keio University).
-#
-# All Rights Reserved.
-#
-# Please see the full Copyright clause at
-# <http://www.w3.org/Consortium/Legal/copyright-software.html>
-#
-# Author: Frank Manola
-#
-# $Id: test001.nt,v 1.1 2005/07/03 13:11:02 pgearon Exp $
-#
-
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#A> <http://www.w3.org/2000/01/rdf-schema#subPropertyOf> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#B> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#B> <http://www.w3.org/2000/01/rdf-schema#subPropertyOf> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#A> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#X> <http://www.w3.org/2000/01/rdf-schema#subPropertyOf> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#X> .
-
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/test001.nt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/test001.nt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/test001.nt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/test001.nt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,18 @@
+# Copyright World Wide Web Consortium, (Massachusetts Institute of
+# Technology, Institut National de Recherche en Informatique et en
+# Automatique, Keio University).
+#
+# All Rights Reserved.
+#
+# Please see the full Copyright clause at
+# <http://www.w3.org/Consortium/Legal/copyright-software.html>
+#
+# Author: Frank Manola
+#
+# $Id: test001.nt,v 1.1 2005/07/03 13:11:02 pgearon Exp $
+#
+
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#A> <http://www.w3.org/2000/01/rdf-schema#subPropertyOf> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#B> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#B> <http://www.w3.org/2000/01/rdf-schema#subPropertyOf> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#A> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#X> <http://www.w3.org/2000/01/rdf-schema#subPropertyOf> <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#X> .
+
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/test001.rdf
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/test001.rdf 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/test001.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Copyright World Wide Web Consortium, (Massachusetts Institute of
- Technology, Institut National de Recherche en Informatique et en
- Automatique, Keio University).
-
- All Rights Reserved.
-
- Please see the full Copyright clause at
- <http://www.w3.org/Consortium/Legal/copyright-software.html>
-
- Author: Frank Manola
-
- Description:
-
- Related issue:
-
- http://www.w3.org/2000/03/rdf-tracking/#rdfs-no-cycles-in-subPropertyOf
-
- $Id: test001.rdf,v 1.1 2005/07/03 13:11:02 pgearon Exp $
-
--->
-
-<rdf:RDF
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#">
-
- <rdf:Description rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#A">
- <rdfs:subPropertyOf rdf:resource="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#B"/>
- </rdf:Description>
-
- <rdf:Description rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#B">
- <rdfs:subPropertyOf rdf:resource="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#A"/>
- </rdf:Description>
-
- <rdf:Description rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#X">
- <rdfs:subPropertyOf rdf:resource="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#X"/>
- </rdf:Description>
-</rdf:RDF>
-
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/test001.rdf (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/test001.rdf)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/test001.rdf (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-no-cycles-in-subPropertyOf/test001.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!--
+ Copyright World Wide Web Consortium, (Massachusetts Institute of
+ Technology, Institut National de Recherche en Informatique et en
+ Automatique, Keio University).
+
+ All Rights Reserved.
+
+ Please see the full Copyright clause at
+ <http://www.w3.org/Consortium/Legal/copyright-software.html>
+
+ Author: Frank Manola
+
+ Description:
+
+ Related issue:
+
+ http://www.w3.org/2000/03/rdf-tracking/#rdfs-no-cycles-in-subPropertyOf
+
+ $Id: test001.rdf,v 1.1 2005/07/03 13:11:02 pgearon Exp $
+
+-->
+
+<rdf:RDF
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#">
+
+ <rdf:Description rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#A">
+ <rdfs:subPropertyOf rdf:resource="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#B"/>
+ </rdf:Description>
+
+ <rdf:Description rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#B">
+ <rdfs:subPropertyOf rdf:resource="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#A"/>
+ </rdf:Description>
+
+ <rdf:Description rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#X">
+ <rdfs:subPropertyOf rdf:resource="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-no-cycles-in-subPropertyOf/test001#X"/>
+ </rdf:Description>
+</rdf:RDF>
+
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subClassOf-a-Property (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-subClassOf-a-Property)
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subClassOf-a-Property/Manifest.rdf
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-subClassOf-a-Property/Manifest.rdf 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subClassOf-a-Property/Manifest.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-
-<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:test="http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#"
->
-
-
-<test:NegativeEntailmentTest rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-subClassOf-a-Property/Manifest.rdf#test001">
-
- <test:issue rdf:resource="http://www.w3.org/2000/03/rdf-tracking/#rdfs-subClassOf-a-Property" />
- <test:status>APPROVED</test:status>
- <test:approval rdf:resource="http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2003Jan/0025.html" />
-
- <test:description>
-an instance of the Property class may have an rdfs:subClassOf property.
-the meaning of such a property is defined by the model theory.
-
-The wording of the formal resolution is a bit bare, so let me add a few
-words of explanation. What this means is that a resource can be both a
-class and a property.
-
-This test is encoded as follows: a Property may have a subclass (that is, such an RDF graph
-is satisfiable)
- </test:description>
-
- <test:entailmentRules rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#" />
- <test:entailmentRules rdf:resource="http://www.w3.org/2000/01/rdf-schema#" />
-
- <test:premiseDocument>
- <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-subClassOf-a-Property/test001.nt" />
- </test:premiseDocument>
-
- <test:conclusionDocument>
- <test:False-Document/>
- </test:conclusionDocument>
-
-</test:NegativeEntailmentTest>
-
-
-
-</rdf:RDF>
-
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subClassOf-a-Property/Manifest.rdf (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-subClassOf-a-Property/Manifest.rdf)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subClassOf-a-Property/Manifest.rdf (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subClassOf-a-Property/Manifest.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+
+<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:test="http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#"
+>
+
+
+<test:NegativeEntailmentTest rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-subClassOf-a-Property/Manifest.rdf#test001">
+
+ <test:issue rdf:resource="http://www.w3.org/2000/03/rdf-tracking/#rdfs-subClassOf-a-Property" />
+ <test:status>APPROVED</test:status>
+ <test:approval rdf:resource="http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2003Jan/0025.html" />
+
+ <test:description>
+an instance of the Property class may have an rdfs:subClassOf property.
+the meaning of such a property is defined by the model theory.
+
+The wording of the formal resolution is a bit bare, so let me add a few
+words of explanation. What this means is that a resource can be both a
+class and a property.
+
+This test is encoded as follows: a Property may have a subclass (that is, such an RDF graph
+is satisfiable)
+ </test:description>
+
+ <test:entailmentRules rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#" />
+ <test:entailmentRules rdf:resource="http://www.w3.org/2000/01/rdf-schema#" />
+
+ <test:premiseDocument>
+ <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-subClassOf-a-Property/test001.nt" />
+ </test:premiseDocument>
+
+ <test:conclusionDocument>
+ <test:False-Document/>
+ </test:conclusionDocument>
+
+</test:NegativeEntailmentTest>
+
+
+
+</rdf:RDF>
+
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subClassOf-a-Property/mulgara-readme.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-subClassOf-a-Property/mulgara-readme.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subClassOf-a-Property/mulgara-readme.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,5 +0,0 @@
-Consistency tests are not a part of the rule engine yet.
-
-Initially, the only consistency testing that was going to be done was for OWL.
-The test demonstrates the need to do it under RDFS as well. Consistencies
-should be added into the rules configuration.
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subClassOf-a-Property/mulgara-readme.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-subClassOf-a-Property/mulgara-readme.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subClassOf-a-Property/mulgara-readme.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subClassOf-a-Property/mulgara-readme.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,5 @@
+Consistency tests are not a part of the rule engine yet.
+
+Initially, the only consistency testing that was going to be done was for OWL.
+The test demonstrates the need to do it under RDFS as well. Consistencies
+should be added into the rules configuration.
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subClassOf-a-Property/test001.nt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-subClassOf-a-Property/test001.nt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subClassOf-a-Property/test001.nt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,15 +0,0 @@
-# Copyright World Wide Web Consortium (Massachusetts Institute of
-# Technology Institut National de Recherche en Informatique et en
-# Automatique Keio University).
-#
-# All Rights Reserved.
-#
-# Please see the full Copyright clause at
-# <http://www.w3.org/Consortium/Legal/copyright-software.html>
-#
-# The following graph is legal (satisfiable)
-#
-# $Id: test001.nt,v 1.1 2005/07/03 13:11:02 pgearon Exp $
-##################################################################
-<http://example.org/foo> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Property> .
-<http://example.org/bar> <http://www.w3.org/2000/01/rdf-schema#subClassOf> <http://example.org/foo> .
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subClassOf-a-Property/test001.nt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-subClassOf-a-Property/test001.nt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subClassOf-a-Property/test001.nt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subClassOf-a-Property/test001.nt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,15 @@
+# Copyright World Wide Web Consortium (Massachusetts Institute of
+# Technology Institut National de Recherche en Informatique et en
+# Automatique Keio University).
+#
+# All Rights Reserved.
+#
+# Please see the full Copyright clause at
+# <http://www.w3.org/Consortium/Legal/copyright-software.html>
+#
+# The following graph is legal (satisfiable)
+#
+# $Id: test001.nt,v 1.1 2005/07/03 13:11:02 pgearon Exp $
+##################################################################
+<http://example.org/foo> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Property> .
+<http://example.org/bar> <http://www.w3.org/2000/01/rdf-schema#subClassOf> <http://example.org/foo> .
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics)
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/Manifest.n3
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/Manifest.n3 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/Manifest.n3 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,32 +0,0 @@
-# $Id: Manifest.n3,v 1.1 2005/07/03 13:11:03 pgearon Exp $
-# PxButton | test | Euler Manifest.n3 Manifest.n3 |
-
-#Processed by Id: cwm.py,v 1.98 2002/07/24 02:31:38 timbl Exp
- # using base file:/w3ccvs/WWW/2000/10/rdf-tests/rdfcore/rdfs-subPropertyOf-semantics/Manifest.rdf
-
-# Notation3 generation by
-# notation3.py,v 1.111 2002/07/24 02:31:40 timbl Exp
-
-# Base was: file:/w3ccvs/WWW/2000/10/rdf-tests/rdfcore/rdfs-subPropertyOf-semantics/Manifest.rdf
- @prefix : <http://www.w3.org/2000/01/rdf-schema#> .
- @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
- @prefix test: <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#> .
-
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-subPropertyOf-semantics/test001> a test:PositiveEntailmentTest;
- test:conclusionDocument <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-subPropertyOf-semantics/test002.nt>;
- test:description """
- The inheritance semantics of the subPropertyOf relationship needs to be clarified.
-
- => subProperties inherit conjunctively the domain and range of their superproperties
- """;
- test:entailmentRules rdf:,
- :;
- test:issue <http://www.w3.org/2000/03/rdf-tracking/#rdfs-subPropertyOf-semantics>;
- test:premiseDocument <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-subPropertyOf-semantics/test001.nt>;
- test:status "PENDING" .
-
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-subPropertyOf-semantics/test001.nt> a test:RDF-XML-Document .
-
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-subPropertyOf-semantics/test002.nt> a test:NT-Document .
-
-#ENDS
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/Manifest.n3 (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/Manifest.n3)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/Manifest.n3 (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/Manifest.n3 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,32 @@
+# $Id: Manifest.n3,v 1.1 2005/07/03 13:11:03 pgearon Exp $
+# PxButton | test | Euler Manifest.n3 Manifest.n3 |
+
+#Processed by Id: cwm.py,v 1.98 2002/07/24 02:31:38 timbl Exp
+ # using base file:/w3ccvs/WWW/2000/10/rdf-tests/rdfcore/rdfs-subPropertyOf-semantics/Manifest.rdf
+
+# Notation3 generation by
+# notation3.py,v 1.111 2002/07/24 02:31:40 timbl Exp
+
+# Base was: file:/w3ccvs/WWW/2000/10/rdf-tests/rdfcore/rdfs-subPropertyOf-semantics/Manifest.rdf
+ @prefix : <http://www.w3.org/2000/01/rdf-schema#> .
+ @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+ @prefix test: <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#> .
+
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-subPropertyOf-semantics/test001> a test:PositiveEntailmentTest;
+ test:conclusionDocument <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-subPropertyOf-semantics/test002.nt>;
+ test:description """
+ The inheritance semantics of the subPropertyOf relationship needs to be clarified.
+
+ => subProperties inherit conjunctively the domain and range of their superproperties
+ """;
+ test:entailmentRules rdf:,
+ :;
+ test:issue <http://www.w3.org/2000/03/rdf-tracking/#rdfs-subPropertyOf-semantics>;
+ test:premiseDocument <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-subPropertyOf-semantics/test001.nt>;
+ test:status "PENDING" .
+
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-subPropertyOf-semantics/test001.nt> a test:RDF-XML-Document .
+
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-subPropertyOf-semantics/test002.nt> a test:NT-Document .
+
+#ENDS
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/Manifest.rdf
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/Manifest.rdf 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/Manifest.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-
-<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:test="http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#"
->
-
-<test:PositiveEntailmentTest rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-subPropertyOf-semantics/Manifest.rdf#test001">
-
- <test:issue rdf:resource="http://www.w3.org/2000/03/rdf-tracking/#rdfs-subPropertyOf-semantics" />
- <test:status>APPROVED</test:status>
- <test:approval rdf:resource="http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2003Jan/0025.html" />
-
-
- <test:description>
- The inheritance semantics of the subPropertyOf relationship needs to be clarified.
-
- => subProperties inherit conjunctively the domain and range of their superproperties
- </test:description>
-
- <test:entailmentRules rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#" />
- <test:entailmentRules rdf:resource="http://www.w3.org/2000/01/rdf-schema#" />
-
- <test:premiseDocument>
- <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-subPropertyOf-semantics/test001.nt" />
- </test:premiseDocument>
-
- <test:conclusionDocument>
- <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-subPropertyOf-semantics/test002.nt" />
- </test:conclusionDocument>
-
-</test:PositiveEntailmentTest>
-
-
-
-</rdf:RDF>
-
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/Manifest.rdf (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/Manifest.rdf)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/Manifest.rdf (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/Manifest.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+
+<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:test="http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#"
+>
+
+<test:PositiveEntailmentTest rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-subPropertyOf-semantics/Manifest.rdf#test001">
+
+ <test:issue rdf:resource="http://www.w3.org/2000/03/rdf-tracking/#rdfs-subPropertyOf-semantics" />
+ <test:status>APPROVED</test:status>
+ <test:approval rdf:resource="http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2003Jan/0025.html" />
+
+
+ <test:description>
+ The inheritance semantics of the subPropertyOf relationship needs to be clarified.
+
+ => subProperties inherit conjunctively the domain and range of their superproperties
+ </test:description>
+
+ <test:entailmentRules rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#" />
+ <test:entailmentRules rdf:resource="http://www.w3.org/2000/01/rdf-schema#" />
+
+ <test:premiseDocument>
+ <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-subPropertyOf-semantics/test001.nt" />
+ </test:premiseDocument>
+
+ <test:conclusionDocument>
+ <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-subPropertyOf-semantics/test002.nt" />
+ </test:conclusionDocument>
+
+</test:PositiveEntailmentTest>
+
+
+
+</rdf:RDF>
+
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/loadResult1.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/loadResult1.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/loadResult1.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully loaded 7 statements from @baseuri@/jxdata/iTQL/rdfs/rdfs-subPropertyOf-semantics/test001.rdf into @server@#test</message></query></answer>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/loadResult1.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/loadResult1.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/loadResult1.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/loadResult1.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully loaded 7 statements from @baseuri@/jxdata/iTQL/rdfs/rdfs-subPropertyOf-semantics/test001.rdf into @server@#test</message></query></answer>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/mulgara-readme.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/mulgara-readme.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/mulgara-readme.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,16 +0,0 @@
-Mulgara Tests
-
-The contents of this directory come from:
-http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-subPropertyOf-semantics/
-
-The nt files are equivalent to the rdf files and would normally be used for
-parser testing.
-
-Tests are performed by loading the initial data, performing RDFS entailment,
-and querying for expected results. While the expected results are found in
-the test002.rdf files in this directory, the tests are based in iTQL, and
-the resulting data is explicitly searched for in the test script.
-
-The test002.rdf, test002.nt and the manifest files are all left in this
-directory for completeness and to help explain the machanics of the tests.
-
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/mulgara-readme.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/mulgara-readme.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/mulgara-readme.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/mulgara-readme.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,16 @@
+Mulgara Tests
+
+The contents of this directory come from:
+http://www.w3.org/2000/10/rdf-tests/rdfcore/rdfs-subPropertyOf-semantics/
+
+The nt files are equivalent to the rdf files and would normally be used for
+parser testing.
+
+Tests are performed by loading the initial data, performing RDFS entailment,
+and querying for expected results. While the expected results are found in
+the test002.rdf files in this directory, the tests are based in iTQL, and
+the resulting data is explicitly searched for in the test script.
+
+The test002.rdf, test002.nt and the manifest files are all left in this
+directory for completeness and to help explain the machanics of the tests.
+
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/queryResult1.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/queryResult1.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/queryResult1.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><variables><o/></variables><solution><o resource="http://example.org/Domain1"/></solution><solution><o resource="http://example.org/Domain2"/></solution><solution><o resource="http://www.w3.org/2000/01/rdf-schema#Resource"/></solution></query></answer>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/queryResult1.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/queryResult1.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/queryResult1.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/queryResult1.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><variables><o/></variables><solution><o resource="http://example.org/Domain1"/></solution><solution><o resource="http://example.org/Domain2"/></solution><solution><o resource="http://www.w3.org/2000/01/rdf-schema#Resource"/></solution></query></answer>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/queryResult2.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/queryResult2.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/queryResult2.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><variables><o/></variables><solution><o resource="http://example.org/Range1"/></solution><solution><o resource="http://example.org/Range2"/></solution><solution><o resource="http://www.w3.org/2000/01/rdf-schema#Resource"/></solution></query></answer>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/queryResult2.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/queryResult2.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/queryResult2.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/queryResult2.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><variables><o/></variables><solution><o resource="http://example.org/Range1"/></solution><solution><o resource="http://example.org/Range2"/></solution><solution><o resource="http://www.w3.org/2000/01/rdf-schema#Resource"/></solution></query></answer>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/ruleResult1.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/ruleResult1.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/ruleResult1.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully applied @baseuri@/rules/rdfs.dl to @server@#test</message></query></answer>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/ruleResult1.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/ruleResult1.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/ruleResult1.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/ruleResult1.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully applied @baseuri@/rules/rdfs.dl to @server@#test</message></query></answer>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test.jxu
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test.jxu 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test.jxu 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,54 +0,0 @@
-<jxu>
- <set name="debug" value="false" />
-
- <!-- Load the test data -->
- <set name="modelName" value="@server@#test" />
- <set name="loadCommand" value="load <@baseuri@/jxdata/iTQL/rdfs/rdfs-subPropertyOf-semantics/test001.rdf> into <@server@#test> ;" />
- <eval stepClass="org.mulgara.store.jxunit.LoadDataJX" />
-
- <ifEqual converse="true" file="loadResult1.txt" name="loadResult">
- <save name="loadResult" file="badLoadResult1.xml"/>
- <fail>Output failed loading the test data. Check badLoadResult1.xml for output.</fail>
- </ifEqual>
-
-
- <!-- Apply the rules -->
- <set name="query"
- value="apply <@baseuri@/rules/rdfs.dl> to <@server@#test> ;"/>
-
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <ifEqual converse="true" file="ruleResult1.txt" name="queryResult">
- <save name="queryResult" file="badRule1Result.xml"/>
- <fail>Output failed applying rules. Check badRule1Result.xml for output.</fail>
- </ifEqual>
-
-
- <!-- Check the results of entailment -->
-
- <!-- Look for types on baz1 -->
- <set name="query"
- value="select $o
- from <@server@#test>
- where <http://example.org/baz1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> $o
- order by $o ;"/>
-
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <ifEqual converse="true" file="queryResult1.txt" name="queryResult">
- <save name="queryResult" file="badQuery1Result.xml"/>
- <fail>Output failed for the first part of the test. Check badQuery1Result.xml for output.</fail>
- </ifEqual>
-
- <!-- Look for types on baz2 -->
- <set name="query"
- value="select $o
- from <@server@#test>
- where <http://example.org/baz2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> $o
- order by $o ;"/>
-
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <ifEqual converse="true" file="queryResult2.txt" name="queryResult">
- <save name="queryResult" file="badQuery2Result.xml"/>
- <fail>Output failed for the second part of the test. Check badQuery2Result.xml for output.</fail>
- </ifEqual>
-
-</jxu>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test.jxu (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test.jxu)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test.jxu (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test.jxu 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,54 @@
+<jxu>
+ <set name="debug" value="false" />
+
+ <!-- Load the test data -->
+ <set name="modelName" value="@server@#test" />
+ <set name="loadCommand" value="load <@baseuri@/jxdata/iTQL/rdfs/rdfs-subPropertyOf-semantics/test001.rdf> into <@server@#test> ;" />
+ <eval stepClass="org.mulgara.store.jxunit.LoadDataJX" />
+
+ <ifEqual converse="true" file="loadResult1.txt" name="loadResult">
+ <save name="loadResult" file="badLoadResult1.xml"/>
+ <fail>Output failed loading the test data. Check badLoadResult1.xml for output.</fail>
+ </ifEqual>
+
+
+ <!-- Apply the rules -->
+ <set name="query"
+ value="apply <@baseuri@/rules/rdfs.dl> to <@server@#test> ;"/>
+
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+ <ifEqual converse="true" file="ruleResult1.txt" name="queryResult">
+ <save name="queryResult" file="badRule1Result.xml"/>
+ <fail>Output failed applying rules. Check badRule1Result.xml for output.</fail>
+ </ifEqual>
+
+
+ <!-- Check the results of entailment -->
+
+ <!-- Look for types on baz1 -->
+ <set name="query"
+ value="select $o
+ from <@server@#test>
+ where <http://example.org/baz1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> $o
+ order by $o ;"/>
+
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+ <ifEqual converse="true" file="queryResult1.txt" name="queryResult">
+ <save name="queryResult" file="badQuery1Result.xml"/>
+ <fail>Output failed for the first part of the test. Check badQuery1Result.xml for output.</fail>
+ </ifEqual>
+
+ <!-- Look for types on baz2 -->
+ <set name="query"
+ value="select $o
+ from <@server@#test>
+ where <http://example.org/baz2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> $o
+ order by $o ;"/>
+
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+ <ifEqual converse="true" file="queryResult2.txt" name="queryResult">
+ <save name="queryResult" file="badQuery2Result.xml"/>
+ <fail>Output failed for the second part of the test. Check badQuery2Result.xml for output.</fail>
+ </ifEqual>
+
+</jxu>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test001.nt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test001.nt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test001.nt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,24 +0,0 @@
-# Copyright World Wide Web Consortium, (Massachusetts Institute of
-# Technology, Institut National de Recherche en Informatique et en
-# Automatique, Keio University).
-#
-# All Rights Reserved.
-#
-# Please see the full Copyright clause at
-# <http://www.w3.org/Consortium/Legal/copyright-software.html>
-#
-# Issue rdfs-subPropertyOf-semantics:
-# The inheritance semantics of the subPropertyOf relationship needs to be clarified.
-#
-# => subProperties inherit conjunctively the domain and range of their superproperties
-#
-# $Id: test001.nt,v 1.1 2005/07/03 13:11:03 pgearon Exp $
-##################################################################
-
-<http://example.org/bar> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Property> .
-<http://example.org/bas> <http://www.w3.org/2000/01/rdf-schema#subPropertyOf> <http://example.org/bar> .
-<http://example.org/bar> <http://www.w3.org/2000/01/rdf-schema#domain> <http://example.org/Domain1> .
-<http://example.org/bas> <http://www.w3.org/2000/01/rdf-schema#domain> <http://example.org/Domain2> .
-<http://example.org/bar> <http://www.w3.org/2000/01/rdf-schema#range> <http://example.org/Range1> .
-<http://example.org/bas> <http://www.w3.org/2000/01/rdf-schema#range> <http://example.org/Range2> .
-<http://example.org/baz1> <http://example.org/bas> <http://example.org/baz2> .
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test001.nt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test001.nt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test001.nt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test001.nt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,24 @@
+# Copyright World Wide Web Consortium, (Massachusetts Institute of
+# Technology, Institut National de Recherche en Informatique et en
+# Automatique, Keio University).
+#
+# All Rights Reserved.
+#
+# Please see the full Copyright clause at
+# <http://www.w3.org/Consortium/Legal/copyright-software.html>
+#
+# Issue rdfs-subPropertyOf-semantics:
+# The inheritance semantics of the subPropertyOf relationship needs to be clarified.
+#
+# => subProperties inherit conjunctively the domain and range of their superproperties
+#
+# $Id: test001.nt,v 1.1 2005/07/03 13:11:03 pgearon Exp $
+##################################################################
+
+<http://example.org/bar> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Property> .
+<http://example.org/bas> <http://www.w3.org/2000/01/rdf-schema#subPropertyOf> <http://example.org/bar> .
+<http://example.org/bar> <http://www.w3.org/2000/01/rdf-schema#domain> <http://example.org/Domain1> .
+<http://example.org/bas> <http://www.w3.org/2000/01/rdf-schema#domain> <http://example.org/Domain2> .
+<http://example.org/bar> <http://www.w3.org/2000/01/rdf-schema#range> <http://example.org/Range1> .
+<http://example.org/bas> <http://www.w3.org/2000/01/rdf-schema#range> <http://example.org/Range2> .
+<http://example.org/baz1> <http://example.org/bas> <http://example.org/baz2> .
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test001.rdf
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test001.rdf 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test001.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Copyright World Wide Web Consortium, (Massachusetts Institute of
- Technology, Institut National de Recherche en Informatique et en
- Automatique, Keio University).
-
- All Rights Reserved.
-
- Please see the full Copyright clause at
- <http://www.w3.org/Consortium/Legal/copyright-software.html>
-
- Issue rdfs-subPropertyOf-semantics:
- The inheritance semantics of the subPropertyOf relationship needs to be clarified.
-
- => subProperties inherit conjunctively the domain and range of their superproperties
-
- $Id: test001.rdf,v 1.1 2005/07/03 13:11:03 pgearon Exp $
--->
-
-<rdf:RDF xmlns="http://www.w3.org/2000/01/rdf-schema#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-
- <rdf:Property rdf:about="http://example.org/bar">
- <domain rdf:resource="http://example.org/Domain1"/>
- <range rdf:resource="http://example.org/Range1"/>
- </rdf:Property>
-
- <rdf:Description rdf:about="http://example.org/bas">
- <subPropertyOf rdf:resource="http://example.org/bar"/>
- <domain rdf:resource="http://example.org/Domain2"/>
- <range rdf:resource="http://example.org/Range2"/>
- </rdf:Description>
-
- <rdf:Description rdf:about="http://example.org/baz1">
- <bas xmlns="http://example.org/"
- rdf:resource="http://example.org/baz2"/>
- </rdf:Description>
-</rdf:RDF>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test001.rdf (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test001.rdf)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test001.rdf (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test001.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<!--
+ Copyright World Wide Web Consortium, (Massachusetts Institute of
+ Technology, Institut National de Recherche en Informatique et en
+ Automatique, Keio University).
+
+ All Rights Reserved.
+
+ Please see the full Copyright clause at
+ <http://www.w3.org/Consortium/Legal/copyright-software.html>
+
+ Issue rdfs-subPropertyOf-semantics:
+ The inheritance semantics of the subPropertyOf relationship needs to be clarified.
+
+ => subProperties inherit conjunctively the domain and range of their superproperties
+
+ $Id: test001.rdf,v 1.1 2005/07/03 13:11:03 pgearon Exp $
+-->
+
+<rdf:RDF xmlns="http://www.w3.org/2000/01/rdf-schema#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+
+ <rdf:Property rdf:about="http://example.org/bar">
+ <domain rdf:resource="http://example.org/Domain1"/>
+ <range rdf:resource="http://example.org/Range1"/>
+ </rdf:Property>
+
+ <rdf:Description rdf:about="http://example.org/bas">
+ <subPropertyOf rdf:resource="http://example.org/bar"/>
+ <domain rdf:resource="http://example.org/Domain2"/>
+ <range rdf:resource="http://example.org/Range2"/>
+ </rdf:Description>
+
+ <rdf:Description rdf:about="http://example.org/baz1">
+ <bas xmlns="http://example.org/"
+ rdf:resource="http://example.org/baz2"/>
+ </rdf:Description>
+</rdf:RDF>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test002.nt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test002.nt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test002.nt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,21 +0,0 @@
-# Copyright World Wide Web Consortium, (Massachusetts Institute of
-# Technology, Institut National de Recherche en Informatique et en
-# Automatique, Keio University).
-#
-# All Rights Reserved.
-#
-# Please see the full Copyright clause at
-# <http://www.w3.org/Consortium/Legal/copyright-software.html>
-#
-# Issue rdfs-subPropertyOf-semantics:
-# The inheritance semantics of the subPropertyOf relationship needs to be clarified.
-#
-# => subProperties inherit conjunctively the domain and range of their superproperties
-#
-# $Id: test002.nt,v 1.1 2005/07/03 13:11:03 pgearon Exp $
-##################################################################
-
-<http://example.org/baz1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Domain1> .
-<http://example.org/baz1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Domain2> .
-<http://example.org/baz2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Range1> .
-<http://example.org/baz2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Range2> .
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test002.nt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test002.nt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test002.nt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test002.nt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,21 @@
+# Copyright World Wide Web Consortium, (Massachusetts Institute of
+# Technology, Institut National de Recherche en Informatique et en
+# Automatique, Keio University).
+#
+# All Rights Reserved.
+#
+# Please see the full Copyright clause at
+# <http://www.w3.org/Consortium/Legal/copyright-software.html>
+#
+# Issue rdfs-subPropertyOf-semantics:
+# The inheritance semantics of the subPropertyOf relationship needs to be clarified.
+#
+# => subProperties inherit conjunctively the domain and range of their superproperties
+#
+# $Id: test002.nt,v 1.1 2005/07/03 13:11:03 pgearon Exp $
+##################################################################
+
+<http://example.org/baz1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Domain1> .
+<http://example.org/baz1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Domain2> .
+<http://example.org/baz2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Range1> .
+<http://example.org/baz2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Range2> .
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test002.rdf
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test002.rdf 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test002.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Copyright World Wide Web Consortium, (Massachusetts Institute of
- Technology, Institut National de Recherche en Informatique et en
- Automatique, Keio University).
-
- All Rights Reserved.
-
- Please see the full Copyright clause at
- <http://www.w3.org/Consortium/Legal/copyright-software.html>
-
- Issue rdfs-subPropertyOf-semantics:
- The inheritance semantics of the subPropertyOf relationship needs to be clarified.
-
- => subProperties inherit conjunctively the domain and range of their superproperties
-
- $Id: test002.rdf,v 1.1 2005/07/03 13:11:03 pgearon Exp $
--->
-
-<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-
- <Domain1 xmlns="http://example.org/"
- rdf:about="http://example.org/baz1">
- <rdf:type rdf:resource="http://example.org/Domain2"/>
- </Domain1>
-
- <Range1 xmlns="http://example.org/"
- rdf:about="http://example.org/baz2">
- <rdf:type rdf:resource="http://example.org/Range2"/>
- </Range1>
-</rdf:RDF>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test002.rdf (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test002.rdf)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test002.rdf (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-subPropertyOf-semantics/test002.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!--
+ Copyright World Wide Web Consortium, (Massachusetts Institute of
+ Technology, Institut National de Recherche en Informatique et en
+ Automatique, Keio University).
+
+ All Rights Reserved.
+
+ Please see the full Copyright clause at
+ <http://www.w3.org/Consortium/Legal/copyright-software.html>
+
+ Issue rdfs-subPropertyOf-semantics:
+ The inheritance semantics of the subPropertyOf relationship needs to be clarified.
+
+ => subProperties inherit conjunctively the domain and range of their superproperties
+
+ $Id: test002.rdf,v 1.1 2005/07/03 13:11:03 pgearon Exp $
+-->
+
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+
+ <Domain1 xmlns="http://example.org/"
+ rdf:about="http://example.org/baz1">
+ <rdf:type rdf:resource="http://example.org/Domain2"/>
+ </Domain1>
+
+ <Range1 xmlns="http://example.org/"
+ rdf:about="http://example.org/baz2">
+ <rdf:type rdf:resource="http://example.org/Range2"/>
+ </Range1>
+</rdf:RDF>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-transitive-subSubProperty (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-transitive-subSubProperty)
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-transitive-subSubProperty/mulgara-readme.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-transitive-subSubProperty/mulgara-readme.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-transitive-subSubProperty/mulgara-readme.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,6 +0,0 @@
-This test is not relevant to RDFS because arbitrary properties cannot be
-declared as transitive. These tests cannot be applied to the existing
-transitive properies (rdfs:subClassOf and rdfs:subPropertyOf) as these
-properties should not have their types modified (by giving them a super
-type) and all sub properties will be given the semantics and entailments
-of the rdfs properties they inherit from.
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-transitive-subSubProperty/mulgara-readme.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-transitive-subSubProperty/mulgara-readme.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-transitive-subSubProperty/mulgara-readme.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-transitive-subSubProperty/mulgara-readme.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,6 @@
+This test is not relevant to RDFS because arbitrary properties cannot be
+declared as transitive. These tests cannot be applied to the existing
+transitive properies (rdfs:subClassOf and rdfs:subPropertyOf) as these
+properties should not have their types modified (by giving them a super
+type) and all sub properties will be given the semantics and entailments
+of the rdfs properties they inherit from.
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-transitive-subSubProperty/test001.nt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-transitive-subSubProperty/test001.nt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-transitive-subSubProperty/test001.nt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,31 +0,0 @@
-# Copyright World Wide Web Consortium, (Massachusetts Institute of
-# Technology, Institut National de Recherche en Informatique et en
-# Automatique, Keio University).
-#
-# All Rights Reserved.
-#
-# Please see the full Copyright clause at
-# <http://www.w3.org/Consortium/Legal/copyright-software.html>
-#
-# Issue rdfs-transitive-subSubProperty:
-# Is a super/sub-property of a transitive property necessarily transitive?
-#
-# e.g. ancestor is a transitive property
-# parent is a sub-property of ancestor but is not transitive
-# ancestor-or-uncle is a super-property of ancestor but is not transitive
-#
-# $Id: test001.nt,v 1.1 2005/07/03 13:11:03 pgearon Exp $
-##################################################################
-
-<http://example.org/foo#jd> <http://example.org/foo#ancestor-or-uncle> <http://example.org/foo#fd> .
-<http://example.org/foo#fd> <http://example.org/foo#ancestor-or-uncle> <http://example.org/foo#od> .
-<http://example.org/foo#jd> <http://example.org/foo#ancestor-or-uncle> <http://example.org/foo#od> .
-<http://example.org/foo#fd> <http://example.org/foo#ancestor-or-uncle> <http://example.org/foo#ad> .
-
-<http://example.org/foo#jd> <http://example.org/foo#ancestor> <http://example.org/foo#fd> .
-<http://example.org/foo#fd> <http://example.org/foo#ancestor> <http://example.org/foo#od> .
-<http://example.org/foo#jd> <http://example.org/foo#ancestor> <http://example.org/foo#od> .
-
-<http://example.org/foo#jd> <http://example.org/foo#parent> <http://example.org/foo#fd> .
-<http://example.org/foo#fd> <http://example.org/foo#parent> <http://example.org/foo#od> .
-
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-transitive-subSubProperty/test001.nt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-transitive-subSubProperty/test001.nt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-transitive-subSubProperty/test001.nt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-transitive-subSubProperty/test001.nt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,31 @@
+# Copyright World Wide Web Consortium, (Massachusetts Institute of
+# Technology, Institut National de Recherche en Informatique et en
+# Automatique, Keio University).
+#
+# All Rights Reserved.
+#
+# Please see the full Copyright clause at
+# <http://www.w3.org/Consortium/Legal/copyright-software.html>
+#
+# Issue rdfs-transitive-subSubProperty:
+# Is a super/sub-property of a transitive property necessarily transitive?
+#
+# e.g. ancestor is a transitive property
+# parent is a sub-property of ancestor but is not transitive
+# ancestor-or-uncle is a super-property of ancestor but is not transitive
+#
+# $Id: test001.nt,v 1.1 2005/07/03 13:11:03 pgearon Exp $
+##################################################################
+
+<http://example.org/foo#jd> <http://example.org/foo#ancestor-or-uncle> <http://example.org/foo#fd> .
+<http://example.org/foo#fd> <http://example.org/foo#ancestor-or-uncle> <http://example.org/foo#od> .
+<http://example.org/foo#jd> <http://example.org/foo#ancestor-or-uncle> <http://example.org/foo#od> .
+<http://example.org/foo#fd> <http://example.org/foo#ancestor-or-uncle> <http://example.org/foo#ad> .
+
+<http://example.org/foo#jd> <http://example.org/foo#ancestor> <http://example.org/foo#fd> .
+<http://example.org/foo#fd> <http://example.org/foo#ancestor> <http://example.org/foo#od> .
+<http://example.org/foo#jd> <http://example.org/foo#ancestor> <http://example.org/foo#od> .
+
+<http://example.org/foo#jd> <http://example.org/foo#parent> <http://example.org/foo#fd> .
+<http://example.org/foo#fd> <http://example.org/foo#parent> <http://example.org/foo#od> .
+
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-transitive-subSubProperty/test001.rdf
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/rdfs-transitive-subSubProperty/test001.rdf 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-transitive-subSubProperty/test001.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Copyright World Wide Web Consortium, (Massachusetts Institute of
- Technology, Institut National de Recherche en Informatique et en
- Automatique, Keio University).
-
- All Rights Reserved.
-
- Please see the full Copyright clause at
- <http://www.w3.org/Consortium/Legal/copyright-software.html>
-
- Issue rdfs-transitive-subSubProperty:
- Is a super/sub-property of a transitive property necessarily transitive?
-
- e.g. ancestor is a transitive property
- parent is a sub-property of ancestor but is not transitive
- ancestor-or-uncle is a super-property of ancestor but is not transitive
-
- $Id: test001.rdf,v 1.1 2005/07/03 13:11:03 pgearon Exp $
--->
-
-<rdf:RDF xmlns="http://example.org/foo#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-
- <rdf:Description rdf:about="http://example.org/foo#fd">
- <ancestor-or-uncle rdf:resource="http://example.org/foo#ad"/>
- <ancestor-or-uncle rdf:resource="http://example.org/foo#od"/>
- <ancestor rdf:resource="http://example.org/foo#od"/>
- <parent rdf:resource="http://example.org/foo#od"/>
- </rdf:Description>
-
- <rdf:Description rdf:about="http://example.org/foo#jd">
- <ancestor-or-uncle rdf:resource="http://example.org/foo#fd"/>
- <ancestor-or-uncle rdf:resource="http://example.org/foo#od"/>
- <ancestor rdf:resource="http://example.org/foo#fd"/>
- <ancestor rdf:resource="http://example.org/foo#od"/>
- <parent rdf:resource="http://example.org/foo#fd"/>
- </rdf:Description>
-</rdf:RDF>
-
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-transitive-subSubProperty/test001.rdf (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/rdfs-transitive-subSubProperty/test001.rdf)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-transitive-subSubProperty/test001.rdf (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/rdfs-transitive-subSubProperty/test001.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!--
+ Copyright World Wide Web Consortium, (Massachusetts Institute of
+ Technology, Institut National de Recherche en Informatique et en
+ Automatique, Keio University).
+
+ All Rights Reserved.
+
+ Please see the full Copyright clause at
+ <http://www.w3.org/Consortium/Legal/copyright-software.html>
+
+ Issue rdfs-transitive-subSubProperty:
+ Is a super/sub-property of a transitive property necessarily transitive?
+
+ e.g. ancestor is a transitive property
+ parent is a sub-property of ancestor but is not transitive
+ ancestor-or-uncle is a super-property of ancestor but is not transitive
+
+ $Id: test001.rdf,v 1.1 2005/07/03 13:11:03 pgearon Exp $
+-->
+
+<rdf:RDF xmlns="http://example.org/foo#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+
+ <rdf:Description rdf:about="http://example.org/foo#fd">
+ <ancestor-or-uncle rdf:resource="http://example.org/foo#ad"/>
+ <ancestor-or-uncle rdf:resource="http://example.org/foo#od"/>
+ <ancestor rdf:resource="http://example.org/foo#od"/>
+ <parent rdf:resource="http://example.org/foo#od"/>
+ </rdf:Description>
+
+ <rdf:Description rdf:about="http://example.org/foo#jd">
+ <ancestor-or-uncle rdf:resource="http://example.org/foo#fd"/>
+ <ancestor-or-uncle rdf:resource="http://example.org/foo#od"/>
+ <ancestor rdf:resource="http://example.org/foo#fd"/>
+ <ancestor rdf:resource="http://example.org/foo#od"/>
+ <parent rdf:resource="http://example.org/foo#fd"/>
+ </rdf:Description>
+</rdf:RDF>
+
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/statement-entailment)
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/Manifest.n3
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/statement-entailment/Manifest.n3 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/Manifest.n3 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,47 +0,0 @@
-# $Id: Manifest.n3,v 1.1 2005/07/03 13:11:03 pgearon Exp $
-# PxButton | test | Euler Manifest.n3 Manifest.n3 |
-
-#Processed by Id: cwm.py,v 1.92 2002/03/22 21:36:00 timbl Exp
- # using base file:/www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/Manifest.rdf
-
-# Notation3 generation by
-# notation3.py,v 1.107 2002/03/22 21:36:00 timbl Exp
-
-# Base was: file:/www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/Manifest.rdf
- @prefix : <http://www.w3.org/2000/01/rdf-schema#> .
- @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
- @prefix test: <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#> .
-
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NegativeEntailmentTest>;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#approval> <http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2002Feb/0476.html>;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#conclusionDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001b.nt>;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#description> """
- RDFCore WG RESOLVED that a reified statement was a stating, not a statement.
- The following entailment does not, therefore, hold.
- """;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#entailmentRules> rdf:,
- :;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#premiseDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001a.nt>;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#status> "PENDING" .
-
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001a.nt> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NT-Document> .
-
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001b.nt> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NT-Document> .
-
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NegativeEntailmentTest>;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#approval> <http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2002Feb/0476.html>;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#conclusionDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002b.nt>;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#description> """
- RDFCore WG RESOLVED that a statement does NOT entail its reification.
- The following entailment does not, therefore, hold.
- """;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#entailmentRules> rdf:,
- :;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#premiseDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002a.nt>;
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#status> "PENDING" .
-
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002a.nt> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NT-Document> .
-
- <http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002b.nt> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NT-Document> .
-
-#ENDS
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/Manifest.n3 (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/statement-entailment/Manifest.n3)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/Manifest.n3 (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/Manifest.n3 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,47 @@
+# $Id: Manifest.n3,v 1.1 2005/07/03 13:11:03 pgearon Exp $
+# PxButton | test | Euler Manifest.n3 Manifest.n3 |
+
+#Processed by Id: cwm.py,v 1.92 2002/03/22 21:36:00 timbl Exp
+ # using base file:/www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/Manifest.rdf
+
+# Notation3 generation by
+# notation3.py,v 1.107 2002/03/22 21:36:00 timbl Exp
+
+# Base was: file:/www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/Manifest.rdf
+ @prefix : <http://www.w3.org/2000/01/rdf-schema#> .
+ @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+ @prefix test: <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#> .
+
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NegativeEntailmentTest>;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#approval> <http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2002Feb/0476.html>;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#conclusionDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001b.nt>;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#description> """
+ RDFCore WG RESOLVED that a reified statement was a stating, not a statement.
+ The following entailment does not, therefore, hold.
+ """;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#entailmentRules> rdf:,
+ :;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#premiseDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001a.nt>;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#status> "PENDING" .
+
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001a.nt> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NT-Document> .
+
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001b.nt> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NT-Document> .
+
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NegativeEntailmentTest>;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#approval> <http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2002Feb/0476.html>;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#conclusionDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002b.nt>;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#description> """
+ RDFCore WG RESOLVED that a statement does NOT entail its reification.
+ The following entailment does not, therefore, hold.
+ """;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#entailmentRules> rdf:,
+ :;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#premiseDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002a.nt>;
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#status> "PENDING" .
+
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002a.nt> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NT-Document> .
+
+ <http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002b.nt> a <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NT-Document> .
+
+#ENDS
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/Manifest.nt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/statement-entailment/Manifest.nt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/Manifest.nt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,20 +0,0 @@
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#entailmentRules> <http://www.w3.org/2000/01/rdf-schema#> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#description> "\n RDFCore WG RESOLVED that a reified statement was a stating, not a statement.\n The following entailment does not, therefore, hold.\n " .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#entailmentRules> <http://www.w3.org/2000/01/rdf-schema#> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002b.nt> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NT-Document> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#premiseDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002a.nt> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002a.nt> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NT-Document> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NegativeEntailmentTest> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#approval> <http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2002Feb/0476.html> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001b.nt> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NT-Document> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#description> "\n RDFCore WG RESOLVED that a statement does NOT entail its reification.\n The following entailment does not, therefore, hold.\n " .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#entailmentRules> <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NegativeEntailmentTest> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#conclusionDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002b.nt> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#premiseDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001a.nt> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#entailmentRules> <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#approval> <http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2002Feb/0476.html> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001a.nt> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NT-Document> .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#status> "PENDING" .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#status> "PENDING" .
-<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#conclusionDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001b.nt> .
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/Manifest.nt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/statement-entailment/Manifest.nt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/Manifest.nt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/Manifest.nt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,20 @@
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#entailmentRules> <http://www.w3.org/2000/01/rdf-schema#> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#description> "\n RDFCore WG RESOLVED that a reified statement was a stating, not a statement.\n The following entailment does not, therefore, hold.\n " .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#entailmentRules> <http://www.w3.org/2000/01/rdf-schema#> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002b.nt> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NT-Document> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#premiseDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002a.nt> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002a.nt> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NT-Document> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NegativeEntailmentTest> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#approval> <http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2002Feb/0476.html> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001b.nt> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NT-Document> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#description> "\n RDFCore WG RESOLVED that a statement does NOT entail its reification.\n The following entailment does not, therefore, hold.\n " .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#entailmentRules> <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NegativeEntailmentTest> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#conclusionDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002b.nt> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#premiseDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001a.nt> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#entailmentRules> <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#approval> <http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2002Feb/0476.html> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001a.nt> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#NT-Document> .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#status> "PENDING" .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#status> "PENDING" .
+<http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001> <http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#conclusionDocument> <http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001b.nt> .
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/Manifest.rdf
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/statement-entailment/Manifest.rdf 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/Manifest.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,102 +0,0 @@
-<?xml version="1.0"?>
-
-<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:test="http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#"
->
-
-<test:NegativeEntailmentTest rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/Manifest.rdf#test001">
-
- <test:status>APPROVED</test:status>
- <test:approval rdf:resource="http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2002Feb/0476.html" />
- <test:description>
- RDFCore WG RESOLVED that a reified statement was a stating, not a statement.
- The following entailment does not, therefore, hold.
- </test:description>
-
- <test:entailmentRules rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#" />
-
- <test:premiseDocument>
- <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001a.nt" />
- </test:premiseDocument>
-
- <test:conclusionDocument>
- <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001b.nt" />
- </test:conclusionDocument>
-
-</test:NegativeEntailmentTest>
-
-
-<test:NegativeEntailmentTest rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/Manifest.rdf#test002">
-
- <test:status>APPROVED</test:status>
- <test:approval rdf:resource="http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2002Feb/0476.html" />
- <test:description>
- RDFCore WG RESOLVED that a statement does NOT entail its reification.
- The following entailment does not, therefore, hold.
- </test:description>
-
- <test:entailmentRules rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#" />
-
- <test:premiseDocument>
- <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002a.nt" />
- </test:premiseDocument>
-
- <test:conclusionDocument>
- <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002b.nt" />
- </test:conclusionDocument>
-
-</test:NegativeEntailmentTest>
-
-
-<test:NegativeEntailmentTest rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/Manifest.rdf#test003">
-
- <test:status>APPROVED</test:status>
- <test:approval rdf:resource="http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2002Feb/0476.html" />
- <test:description>
- RDFCore WG RESOLVED that a reified statement was a stating, not a statement.
- The following entailment does not, therefore, hold.
- This is the same as test001, but using RDFS-entailment.
- </test:description>
-
- <test:entailmentRules rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#" />
- <test:entailmentRules rdf:resource="http://www.w3.org/2000/01/rdf-schema#" />
-
- <test:premiseDocument>
- <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001a.nt" />
- </test:premiseDocument>
-
- <test:conclusionDocument>
- <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001b.nt" />
- </test:conclusionDocument>
-
-</test:NegativeEntailmentTest>
-
-
-<test:NegativeEntailmentTest rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/Manifest.rdf#test004">
-
- <test:status>APPROVED</test:status>
- <test:approval rdf:resource="http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2002Feb/0476.html" />
- <test:description>
- RDFCore WG RESOLVED that a statement does NOT entail its reification.
- The following entailment does not, therefore, hold.
- This is the same as test002, but using RDFS-entailment.
- </test:description>
-
- <test:entailmentRules rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#" />
- <test:entailmentRules rdf:resource="http://www.w3.org/2000/01/rdf-schema#" />
-
- <test:premiseDocument>
- <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002a.nt" />
- </test:premiseDocument>
-
- <test:conclusionDocument>
- <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002b.nt" />
- </test:conclusionDocument>
-
-</test:NegativeEntailmentTest>
-
-
-</rdf:RDF>
-
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/Manifest.rdf (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/statement-entailment/Manifest.rdf)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/Manifest.rdf (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/Manifest.rdf 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+
+<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:test="http://www.w3.org/2000/10/rdf-tests/rdfcore/testSchema#"
+>
+
+<test:NegativeEntailmentTest rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/Manifest.rdf#test001">
+
+ <test:status>APPROVED</test:status>
+ <test:approval rdf:resource="http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2002Feb/0476.html" />
+ <test:description>
+ RDFCore WG RESOLVED that a reified statement was a stating, not a statement.
+ The following entailment does not, therefore, hold.
+ </test:description>
+
+ <test:entailmentRules rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#" />
+
+ <test:premiseDocument>
+ <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001a.nt" />
+ </test:premiseDocument>
+
+ <test:conclusionDocument>
+ <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001b.nt" />
+ </test:conclusionDocument>
+
+</test:NegativeEntailmentTest>
+
+
+<test:NegativeEntailmentTest rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/Manifest.rdf#test002">
+
+ <test:status>APPROVED</test:status>
+ <test:approval rdf:resource="http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2002Feb/0476.html" />
+ <test:description>
+ RDFCore WG RESOLVED that a statement does NOT entail its reification.
+ The following entailment does not, therefore, hold.
+ </test:description>
+
+ <test:entailmentRules rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#" />
+
+ <test:premiseDocument>
+ <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002a.nt" />
+ </test:premiseDocument>
+
+ <test:conclusionDocument>
+ <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002b.nt" />
+ </test:conclusionDocument>
+
+</test:NegativeEntailmentTest>
+
+
+<test:NegativeEntailmentTest rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/Manifest.rdf#test003">
+
+ <test:status>APPROVED</test:status>
+ <test:approval rdf:resource="http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2002Feb/0476.html" />
+ <test:description>
+ RDFCore WG RESOLVED that a reified statement was a stating, not a statement.
+ The following entailment does not, therefore, hold.
+ This is the same as test001, but using RDFS-entailment.
+ </test:description>
+
+ <test:entailmentRules rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#" />
+ <test:entailmentRules rdf:resource="http://www.w3.org/2000/01/rdf-schema#" />
+
+ <test:premiseDocument>
+ <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001a.nt" />
+ </test:premiseDocument>
+
+ <test:conclusionDocument>
+ <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test001b.nt" />
+ </test:conclusionDocument>
+
+</test:NegativeEntailmentTest>
+
+
+<test:NegativeEntailmentTest rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/Manifest.rdf#test004">
+
+ <test:status>APPROVED</test:status>
+ <test:approval rdf:resource="http://lists.w3.org/Archives/Public/w3c-rdfcore-wg/2002Feb/0476.html" />
+ <test:description>
+ RDFCore WG RESOLVED that a statement does NOT entail its reification.
+ The following entailment does not, therefore, hold.
+ This is the same as test002, but using RDFS-entailment.
+ </test:description>
+
+ <test:entailmentRules rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#" />
+ <test:entailmentRules rdf:resource="http://www.w3.org/2000/01/rdf-schema#" />
+
+ <test:premiseDocument>
+ <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002a.nt" />
+ </test:premiseDocument>
+
+ <test:conclusionDocument>
+ <test:NT-Document rdf:about="http://www.w3.org/2000/10/rdf-tests/rdfcore/statement-entailment/test002b.nt" />
+ </test:conclusionDocument>
+
+</test:NegativeEntailmentTest>
+
+
+</rdf:RDF>
+
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/loadResult1.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/statement-entailment/loadResult1.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/loadResult1.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully loaded 9 statements from @baseuri@/jxdata/iTQL/rdfs/statement-entailment/test001a.nt into @server@#test</message></query></answer>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/loadResult1.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/statement-entailment/loadResult1.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/loadResult1.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/loadResult1.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully loaded 9 statements from @baseuri@/jxdata/iTQL/rdfs/statement-entailment/test001a.nt into @server@#test</message></query></answer>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/loadResult2.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/statement-entailment/loadResult2.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/loadResult2.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully loaded 1 statements from @baseuri@/jxdata/iTQL/rdfs/statement-entailment/test002a.nt into @server@#test</message></query></answer>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/loadResult2.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/statement-entailment/loadResult2.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/loadResult2.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/loadResult2.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully loaded 1 statements from @baseuri@/jxdata/iTQL/rdfs/statement-entailment/test002a.nt into @server@#test</message></query></answer>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/queryResult1.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/statement-entailment/queryResult1.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/queryResult1.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><variables><s/></variables><solution><s resource="http://example.org/stmt1"/></solution></query></answer>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/queryResult1.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/statement-entailment/queryResult1.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/queryResult1.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/queryResult1.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><variables><s/></variables><solution><s resource="http://example.org/stmt1"/></solution></query></answer>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/queryResult2.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/statement-entailment/queryResult2.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/queryResult2.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><variables><s/></variables></query></answer>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/queryResult2.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/statement-entailment/queryResult2.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/queryResult2.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/queryResult2.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><variables><s/></variables></query></answer>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/ruleResult1.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/statement-entailment/ruleResult1.txt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/ruleResult1.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully applied @baseuri@/rules/rdfs.dl to @server@#test</message></query></answer>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/ruleResult1.txt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/statement-entailment/ruleResult1.txt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/ruleResult1.txt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/ruleResult1.txt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully applied @baseuri@/rules/rdfs.dl to @server@#test</message></query></answer>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test.jxu
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/statement-entailment/test.jxu 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test.jxu 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,72 +0,0 @@
-<jxu>
- <set name="debug" value="false" />
-
- <set name="modelName" value="@server@#test" />
- <set name="loadCommand" value="load <@baseuri@/jxdata/iTQL/rdfs/statement-entailment/test001a.nt> into <@server@#test> ;" />
- <eval stepClass="org.mulgara.store.jxunit.LoadDataJX" />
-
- <ifEqual converse="true" file="loadResult1.txt" name="loadResult">
- <save name="loadResult" file="badLoadResult1.xml"/>
- <fail>Output failed loading test1 data. Check badLoadResult1.xml for output.</fail>
- </ifEqual>
-
-
- <set name="query"
- value="apply <@baseuri@/rules/rdfs.dl> to <@server@#test> ;"/>
-
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <ifEqual converse="true" file="ruleResult1.txt" name="queryResult">
- <save name="queryResult" file="badRule1Result.xml"/>
- <fail>Output failed applying rules. Check badRule1Result.xml for output.</fail>
- </ifEqual>
-
-
- <set name="query"
- value="select $s
- from <@server@#test> where $s <http://example.org/property> <http://example.org/foo> ;"/>
-
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <ifEqual converse="true" file="queryResult1.txt" name="queryResult">
- <save name="queryResult" file="badQuery1Result.xml"/>
- <fail>Output failed for first test. Check badQuery1Result.xml for output.</fail>
- </ifEqual>
-
- <!-- End of first test -->
-
- <!-- Load data for second test -->
-
- <set name="modelName" value="@server@#test" />
- <set name="loadCommand" value="load <@baseuri@/jxdata/iTQL/rdfs/statement-entailment/test002a.nt> into <@server@#test> ;" />
- <eval stepClass="org.mulgara.store.jxunit.LoadDataJX" />
-
- <ifEqual converse="true" file="loadResult2.txt" name="loadResult">
- <save name="loadResult" file="badLoadResult2.xml"/>
- <fail>Output failed loading test2 data. Check badLoadResult2.xml for output.</fail>
- </ifEqual>
-
-
- <set name="query"
- value="apply <@baseuri@/rules/rdfs.dl> to <@server@#test> ;"/>
-
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <ifEqual converse="true" file="ruleResult1.txt" name="queryResult">
- <save name="queryResult" file="badRule2Result.xml"/>
- <fail>Output failed applying rules. Check badRule2Result.xml for output.</fail>
- </ifEqual>
-
-
- <set name="query"
- value="select $s
- from <@server@#test>
- where $s <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Statement>
- or $s <http://www.w3.org/1999/02/22-rdf-syntax-ns#subject> <http://example.org/subj>
- or $s <http://www.w3.org/1999/02/22-rdf-syntax-ns#predicate> <http://example.org/prop>
- or $s <http://www.w3.org/1999/02/22-rdf-syntax-ns#object> <http://example.org/obj> ;"/>
-
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <ifEqual converse="true" file="queryResult2.txt" name="queryResult">
- <save name="queryResult" file="badQuery2Result.xml"/>
- <fail>Output failed for second test. Check badQuery2Result.xml for output.</fail>
- </ifEqual>
-
-</jxu>
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test.jxu (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/statement-entailment/test.jxu)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test.jxu (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test.jxu 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,72 @@
+<jxu>
+ <set name="debug" value="false" />
+
+ <set name="modelName" value="@server@#test" />
+ <set name="loadCommand" value="load <@baseuri@/jxdata/iTQL/rdfs/statement-entailment/test001a.nt> into <@server@#test> ;" />
+ <eval stepClass="org.mulgara.store.jxunit.LoadDataJX" />
+
+ <ifEqual converse="true" file="loadResult1.txt" name="loadResult">
+ <save name="loadResult" file="badLoadResult1.xml"/>
+ <fail>Output failed loading test1 data. Check badLoadResult1.xml for output.</fail>
+ </ifEqual>
+
+
+ <set name="query"
+ value="apply <@baseuri@/rules/rdfs.dl> to <@server@#test> ;"/>
+
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+ <ifEqual converse="true" file="ruleResult1.txt" name="queryResult">
+ <save name="queryResult" file="badRule1Result.xml"/>
+ <fail>Output failed applying rules. Check badRule1Result.xml for output.</fail>
+ </ifEqual>
+
+
+ <set name="query"
+ value="select $s
+ from <@server@#test> where $s <http://example.org/property> <http://example.org/foo> ;"/>
+
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+ <ifEqual converse="true" file="queryResult1.txt" name="queryResult">
+ <save name="queryResult" file="badQuery1Result.xml"/>
+ <fail>Output failed for first test. Check badQuery1Result.xml for output.</fail>
+ </ifEqual>
+
+ <!-- End of first test -->
+
+ <!-- Load data for second test -->
+
+ <set name="modelName" value="@server@#test" />
+ <set name="loadCommand" value="load <@baseuri@/jxdata/iTQL/rdfs/statement-entailment/test002a.nt> into <@server@#test> ;" />
+ <eval stepClass="org.mulgara.store.jxunit.LoadDataJX" />
+
+ <ifEqual converse="true" file="loadResult2.txt" name="loadResult">
+ <save name="loadResult" file="badLoadResult2.xml"/>
+ <fail>Output failed loading test2 data. Check badLoadResult2.xml for output.</fail>
+ </ifEqual>
+
+
+ <set name="query"
+ value="apply <@baseuri@/rules/rdfs.dl> to <@server@#test> ;"/>
+
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+ <ifEqual converse="true" file="ruleResult1.txt" name="queryResult">
+ <save name="queryResult" file="badRule2Result.xml"/>
+ <fail>Output failed applying rules. Check badRule2Result.xml for output.</fail>
+ </ifEqual>
+
+
+ <set name="query"
+ value="select $s
+ from <@server@#test>
+ where $s <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Statement>
+ or $s <http://www.w3.org/1999/02/22-rdf-syntax-ns#subject> <http://example.org/subj>
+ or $s <http://www.w3.org/1999/02/22-rdf-syntax-ns#predicate> <http://example.org/prop>
+ or $s <http://www.w3.org/1999/02/22-rdf-syntax-ns#object> <http://example.org/obj> ;"/>
+
+ <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+ <ifEqual converse="true" file="queryResult2.txt" name="queryResult">
+ <save name="queryResult" file="badQuery2Result.xml"/>
+ <fail>Output failed for second test. Check badQuery2Result.xml for output.</fail>
+ </ifEqual>
+
+</jxu>
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test001
===================================================================
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test001 (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/statement-entailment/test001)
===================================================================
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test001a.nt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/statement-entailment/test001a.nt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test001a.nt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,12 +0,0 @@
-<http://example.org/stmt1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Statement> .
-<http://example.org/stmt1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#subject> <http://example.org/subject> .
-<http://example.org/stmt1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#predicate> <http://example.org/predicate> .
-<http://example.org/stmt1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#object> <http://example.org/object> .
-
-<http://example.org/stmt2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Statement> .
-<http://example.org/stmt2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#subject> <http://example.org/subject> .
-<http://example.org/stmt2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#predicate> <http://example.org/predicate> .
-<http://example.org/stmt2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#object> <http://example.org/object> .
-
-<http://example.org/stmt1> <http://example.org/property> <http://example.org/foo> .
-
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test001a.nt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/statement-entailment/test001a.nt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test001a.nt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test001a.nt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,12 @@
+<http://example.org/stmt1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Statement> .
+<http://example.org/stmt1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#subject> <http://example.org/subject> .
+<http://example.org/stmt1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#predicate> <http://example.org/predicate> .
+<http://example.org/stmt1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#object> <http://example.org/object> .
+
+<http://example.org/stmt2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Statement> .
+<http://example.org/stmt2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#subject> <http://example.org/subject> .
+<http://example.org/stmt2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#predicate> <http://example.org/predicate> .
+<http://example.org/stmt2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#object> <http://example.org/object> .
+
+<http://example.org/stmt1> <http://example.org/property> <http://example.org/foo> .
+
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test001b.nt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/statement-entailment/test001b.nt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test001b.nt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,2 +0,0 @@
-<http://example.org/stmt2> <http://example.org/property> <http://example.org/foo> .
-
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test001b.nt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/statement-entailment/test001b.nt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test001b.nt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test001b.nt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,2 @@
+<http://example.org/stmt2> <http://example.org/property> <http://example.org/foo> .
+
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test002a.nt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/statement-entailment/test002a.nt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test002a.nt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,2 +0,0 @@
-<http://example.org/subj> <http://example.org/prop> <http://example.org/obj> .
-
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test002a.nt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/statement-entailment/test002a.nt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test002a.nt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test002a.nt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,2 @@
+<http://example.org/subj> <http://example.org/prop> <http://example.org/obj> .
+
Deleted: branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test002b.nt
===================================================================
--- trunk/jxdata/iTQL/rdfs-dl/statement-entailment/test002b.nt 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test002b.nt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -1,5 +0,0 @@
-_:r <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Statement> .
-_:r <http://www.w3.org/1999/02/22-rdf-syntax-ns#subject> <http://example.org/subj> .
-_:r <http://www.w3.org/1999/02/22-rdf-syntax-ns#predicate> <http://example.org/prop> .
-_:r <http://www.w3.org/1999/02/22-rdf-syntax-ns#object> <http://example.org/obj> .
-
Copied: branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test002b.nt (from rev 1606, trunk/jxdata/iTQL/rdfs-dl/statement-entailment/test002b.nt)
===================================================================
--- branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test002b.nt (rev 0)
+++ branches/consistency/jxdata/iTQL/rdfs-dl/statement-entailment/test002b.nt 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,5 @@
+_:r <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Statement> .
+_:r <http://www.w3.org/1999/02/22-rdf-syntax-ns#subject> <http://example.org/subj> .
+_:r <http://www.w3.org/1999/02/22-rdf-syntax-ns#predicate> <http://example.org/prop> .
+_:r <http://www.w3.org/1999/02/22-rdf-syntax-ns#object> <http://example.org/obj> .
+
Modified: branches/consistency/src/jar/query/java/org/mulgara/query/Query.java
===================================================================
--- branches/consistency/src/jar/query/java/org/mulgara/query/Query.java 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/src/jar/query/java/org/mulgara/query/Query.java 2009-03-12 22:52:17 UTC (rev 1607)
@@ -206,9 +206,7 @@
this.orderList = query.orderList;
this.limit = query.limit;
this.offset = query.offset;
- if (query.answer != null) {
- this.answer = (Answer)query.answer.clone();
- }
+ this.answer = (query.answer != null) ?(Answer)query.answer.clone() : new UnconstrainedAnswer();
/*
this(query.getVariableList(),
query.getModelExpression(),
@@ -407,8 +405,10 @@
* Close this {@link Query}, and the underlying {@link Answer} objects.
*/
public void close() throws TuplesException {
- answer.close();
- answer = null;
+ if (answer != null) {
+ answer.close();
+ answer = null;
+ }
if (mutableVariableList != null) {
for (SelectElement v: mutableVariableList) {
Modified: branches/consistency/src/jar/query/java/org/mulgara/query/filter/AbstractContextOwner.java
===================================================================
--- branches/consistency/src/jar/query/java/org/mulgara/query/filter/AbstractContextOwner.java 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/src/jar/query/java/org/mulgara/query/filter/AbstractContextOwner.java 2009-03-12 22:52:17 UTC (rev 1607)
@@ -11,7 +11,10 @@
*/
package org.mulgara.query.filter;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* Defines how to set and retrieve context
*
@@ -25,16 +28,36 @@
/** The more recent context */
private Context context = null;
+ /** A list of context owners that this owner provides the context for. */
+ private List<ContextOwner> contextListeners = new ArrayList<ContextOwner>();
+
/**
+ * Adds a context owner as a listener so that it will be updated with its context
+ * when this owner gets updated.
+ * @param l The context owner to register.
+ */
+ public void addContextListener(ContextOwner l) {
+ contextListeners.add(l);
+ }
+
+ /**
* Set the current context. This *must* be run at the start of every test else the underlying
* values will not resolve correctly.
* @param context The context for this test.
*/
- public void setCurrentContext(Context context) { this.context = context; }
+ public void setCurrentContext(Context context) {
+ this.context = context;
+ // update anyone who asked to be updated
+ for (ContextOwner l: contextListeners) l.setCurrentContext(context);
+ }
/**
* Get the current context. This is a callback that is used during a test.
* @return The context of the currently running test, or the most recent context if not in a test.
*/
- public Context getCurrentContext() { return context; }
+ public Context getCurrentContext() {
+ if (context != null) return context;
+ ContextOwner parent = getContextOwner();
+ return parent == null ? null : parent.getCurrentContext();
+ }
}
Modified: branches/consistency/src/jar/query/java/org/mulgara/query/filter/AbstractFilterValue.java
===================================================================
--- branches/consistency/src/jar/query/java/org/mulgara/query/filter/AbstractFilterValue.java 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/src/jar/query/java/org/mulgara/query/filter/AbstractFilterValue.java 2009-03-12 22:52:17 UTC (rev 1607)
@@ -95,9 +95,6 @@
/** @see org.mulgara.query.filter.RDFTerm#isURI() */
public boolean isURI() throws QueryException { return isIRI(); }
- /** @see org.mulgara.query.filter.RDFTerm#notEquals(org.mulgara.query.filter.RDFTerm) */
- public boolean notEquals(RDFTerm v) throws QueryException { return !resolve().equals(v); }
-
/** @see org.mulgara.query.filter.RDFTerm#sameTerm(org.mulgara.query.filter.RDFTerm) */
public boolean sameTerm(RDFTerm v) throws QueryException { return resolve().sameTerm(v); }
@@ -137,7 +134,10 @@
public ContextOwner getContextOwner() { return contextOwner; }
/** @see org.mulgara.query.filter.RDFTerm#setContextOwner(org.mulgara.query.filter.ContextOwner) */
- public void setContextOwner(ContextOwner owner) { contextOwner = owner; }
+ public void setContextOwner(ContextOwner owner) {
+ contextOwner = owner;
+ owner.addContextListener(this);
+ }
/** @see org.mulgara.query.filter.ContextOwner#getCurrentContext() */
public Context getCurrentContext() { return contextOwner.getCurrentContext(); }
@@ -145,6 +145,7 @@
/** @see org.mulgara.query.filter.ContextOwner#setCurrentContext(org.mulgara.query.filter.Context) */
public void setCurrentContext(Context context) {
if (!(context.equals(contextOwner.getCurrentContext()))) throw new AssertionError("Filter context being set differently to initial calling context.");
+ super.setCurrentContext(context);
}
/**
Copied: branches/consistency/src/jar/query/java/org/mulgara/query/filter/CompoundStatementUnitTest.java (from rev 1606, trunk/src/jar/query/java/org/mulgara/query/filter/CompoundStatementUnitTest.java)
===================================================================
--- branches/consistency/src/jar/query/java/org/mulgara/query/filter/CompoundStatementUnitTest.java (rev 0)
+++ branches/consistency/src/jar/query/java/org/mulgara/query/filter/CompoundStatementUnitTest.java 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,132 @@
+/**
+ * The contents of this file are subject to the Open Software License
+ * Version 3.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.opensource.org/licenses/osl-3.0.txt
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ */
+package org.mulgara.query.filter;
+
+import java.net.URI;
+
+import org.jrdf.graph.Literal;
+import org.jrdf.graph.Node;
+import org.mulgara.query.QueryException;
+import org.mulgara.query.filter.TestContext;
+import org.mulgara.query.filter.TestContextOwner;
+import org.mulgara.query.rdf.LiteralImpl;
+
+import org.mulgara.query.filter.arithmetic.AddOperation;
+import org.mulgara.query.filter.value.Bool;
+import org.mulgara.query.filter.value.NumericLiteral;
+import org.mulgara.query.filter.value.Var;
+
+import static org.mulgara.query.rdf.XSD.*;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+
+/**
+ * Tests the addition and comparisons functions cascaded together.
+ *
+ * @created Apr 15, 2008
+ * @author Paul Gearon
+ * @copyright © 2008 <a href="http://www.topazproject.org/">The Topaz Project</a>
+ * @licence <a href="{@docRoot}/../../LICENCE.txt">Open Software License v3.0</a>
+ */
+public class CompoundStatementUnitTest extends TestCase {
+
+ protected URI xsdInt = INT_URI;
+ protected URI xsdFloat = FLOAT_URI;
+ Bool t = Bool.TRUE;
+ Bool f = Bool.FALSE;
+
+ /**
+ * Build the unit test.
+ * @param name The name of the test
+ */
+ public CompoundStatementUnitTest(String name) {
+ super(name);
+ }
+
+ /**
+ * Hook for test runner to obtain a test suite from.
+ * @return The test suite
+ */
+ public static Test suite() {
+ TestSuite suite = new TestSuite();
+ suite.addTest(new CompoundStatementUnitTest("testValues"));
+ suite.addTest(new CompoundStatementUnitTest("testVar"));
+ return suite;
+ }
+
+ public void testValues() throws Exception {
+ NumericLiteral four = new NumericLiteral(4);
+ NumericLiteral five = new NumericLiteral(5);
+ NumericLiteral seven = new NumericLiteral(7);
+ NumericLiteral ten = new NumericLiteral(10);
+
+ TestContext c = new TestContext(new String[] {}, new Node[][] {});
+ c.beforeFirst();
+
+ AddOperation addition = new AddOperation(five, four);
+ Filter stmt = new LessThan(addition, ten);
+
+ stmt.setContextOwner(new TestContextOwner(c));
+ stmt.setCurrentContext(c);
+ assertTrue(stmt.test(c));
+
+ addition = new AddOperation(five, seven);
+ stmt = new LessThan(addition, ten);
+
+ stmt.setContextOwner(new TestContextOwner(c));
+ stmt.setCurrentContext(c);
+ assertTrue(!stmt.test(c));
+ }
+
+
+ public void testVar() throws Exception {
+ Var x = new Var("x");
+ Var y = new Var("y");
+ NumericLiteral ten = new NumericLiteral(10);
+
+ AddOperation addition = new AddOperation(x, y);
+ Filter stmt = new LessThan(addition, ten);
+
+ Literal four = new LiteralImpl("4", xsdInt);
+ Literal five = new LiteralImpl("5", xsdInt);
+ Literal seven = new LiteralImpl("7.0", xsdFloat);
+ Node[][] rows = {
+ new Node[] {four, five},
+ new Node[] {five, seven},
+ new Node[] {null, five},
+ };
+ TestContext c = new TestContext(new String[] {"x", "y"}, rows);
+ c.beforeFirst();
+ stmt.setContextOwner(new TestContextOwner(c));
+ // check the context setting
+ stmt.setCurrentContext(c);
+
+ c.next();
+ assertTrue(stmt.test(c)); // 4 + 5 < 10
+ c.next();
+ assertTrue(!stmt.test(c)); // 5 + 7 < 10
+ c.next();
+
+ try {
+ assertTrue(stmt.test(c)); // null + 5 < 10
+ fail("No exception when testing an unbound value for equality");
+ } catch (QueryException qe) {
+ assertTrue(qe.getMessage().startsWith("Resolving unbound variable"));
+ }
+
+ }
+
+
+}
Modified: branches/consistency/src/jar/query/java/org/mulgara/query/filter/ContextOwner.java
===================================================================
--- branches/consistency/src/jar/query/java/org/mulgara/query/filter/ContextOwner.java 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/src/jar/query/java/org/mulgara/query/filter/ContextOwner.java 2009-03-12 22:52:17 UTC (rev 1607)
@@ -34,4 +34,24 @@
* @return The context of the currently running test, or the most recent context if not in a test.
*/
public Context getCurrentContext();
+
+ /**
+ * Sets the object that contains the current context to work in.
+ * @param owner The object that owns this context.
+ */
+ public void setContextOwner(ContextOwner owner);
+
+ /**
+ * Gets the object that contains the current context to work in.
+ * @return The object that owns this context.
+ */
+ public ContextOwner getContextOwner();
+
+ /**
+ * Adds a context owner as a listener so that it will be updated with its context
+ * when this owner gets updated.
+ * @param l The context owner to register.
+ */
+ public void addContextListener(ContextOwner l);
+
}
Modified: branches/consistency/src/jar/query/java/org/mulgara/query/filter/EqualityComparisonUnitTest.java
===================================================================
--- branches/consistency/src/jar/query/java/org/mulgara/query/filter/EqualityComparisonUnitTest.java 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/src/jar/query/java/org/mulgara/query/filter/EqualityComparisonUnitTest.java 2009-03-12 22:52:17 UTC (rev 1607)
@@ -88,36 +88,30 @@
// compare unequal literals
RDFTerm lhs = t;
RDFTerm rhs = f;
+ assertTrue(f.equals(new Equals(lhs, rhs)));
+ assertTrue(f.equals(new SameTerm(lhs, rhs)));
+ assertTrue(t.equals(new NotEquals(lhs, rhs)));
+
+ // compare incomparable literals
+ lhs = TypedLiteral.newLiteral(7);
try {
assertTrue(f.equals(new Equals(lhs, rhs)));
- fail("Unequal literals should throw an exception when compared for equality");
+ fail("Incomparable literals should throw an exception when compared for equality");
} catch (QueryException qe) {
assertTrue(qe.getMessage().startsWith("Type Error"));
}
- assertTrue(f.equals(new SameTerm(lhs, rhs)));
- assertTrue(t.equals(new NotEquals(lhs, rhs)));
// compare equivalent but different literals
lhs = TypedLiteral.newLiteral(7);
rhs = TypedLiteral.newLiteral(7.0);
- try {
- assertTrue(f.equals(new Equals(lhs, rhs)));
- fail("Unequal literals should throw an exception when compared for equality");
- } catch (QueryException qe) {
- assertTrue(qe.getMessage().startsWith("Type Error"));
- }
+ assertTrue(t.equals(new Equals(lhs, rhs)));
assertTrue(f.equals(new SameTerm(lhs, rhs)));
- assertTrue(t.equals(new NotEquals(lhs, rhs)));
+ assertTrue(f.equals(new NotEquals(lhs, rhs)));
// compare unequal literal strings
lhs = TypedLiteral.newLiteral("foo", null, null);
rhs = TypedLiteral.newLiteral("fool", null, null);
- try {
- assertTrue(f.equals(new Equals(lhs, rhs)));
- fail("Unequal literals should throw an exception when compared for equality");
- } catch (QueryException qe) {
- assertTrue(qe.getMessage().startsWith("Type Error"));
- }
+ assertTrue(f.equals(new Equals(lhs, rhs)));
assertTrue(f.equals(new SameTerm(lhs, rhs)));
assertTrue(t.equals(new NotEquals(lhs, rhs)));
@@ -131,17 +125,17 @@
assertTrue(qe.getMessage().startsWith("Type Error"));
}
assertTrue(f.equals(new SameTerm(lhs, rhs)));
- assertTrue(t.equals(new NotEquals(lhs, rhs)));
-
- // compare unequal languages
- lhs = TypedLiteral.newLiteral("foo", null, "en");
- rhs = TypedLiteral.newLiteral("foo", null, "fr");
try {
- assertTrue(f.equals(new Equals(lhs, rhs)));
+ assertTrue(t.equals(new NotEquals(lhs, rhs)));
fail("Unequal literals should throw an exception when compared for equality");
} catch (QueryException qe) {
assertTrue(qe.getMessage().startsWith("Type Error"));
}
+
+ // compare unequal languages
+ lhs = TypedLiteral.newLiteral("foo", null, "en");
+ rhs = TypedLiteral.newLiteral("foo", null, "fr");
+ assertTrue(f.equals(new Equals(lhs, rhs)));
assertTrue(f.equals(new SameTerm(lhs, rhs)));
assertTrue(t.equals(new NotEquals(lhs, rhs)));
@@ -203,6 +197,11 @@
new Node[] {simple, strEn},
new Node[] {simple, strFr},
+ new Node[] {seven, str},
+ new Node[] {sevenF, str},
+ new Node[] {str, seven},
+ new Node[] {str, sevenF},
+
new Node[] {str, str},
new Node[] {str, strEn},
new Node[] {strEn, strEn},
@@ -229,68 +228,70 @@
eq.setCurrentContext(c);
same.setCurrentContext(c);
ne.setCurrentContext(c);
-
- String results = "tl tlll tltl ff tff x tf";
+ // 01 2345 6789 0123 45 678 9 01
+ String results = "te tlff llll tltf ff tff x tf";
runTests(c, eq, same, ne, results);
}
private void runTests(TestContext c, AbstractFilterValue eq, AbstractFilterValue same, AbstractFilterValue ne, String results) throws Exception {
c.beforeFirst();
+ int i = 0;
for (char result: results.toCharArray()) {
if (result == ' ') continue;
+ String it = "iteration: " + i++;
assertTrue(c.next());
switch (result) {
case 't': // equal
- assertTrue(t.equals(eq));
- assertTrue(t.equals(same));
- assertTrue(f.equals(ne));
+ assertTrue(it, t.equals(eq));
+ assertTrue(it, t.equals(same));
+ assertTrue(it, f.equals(ne));
break;
case 'f': // unequal
- assertTrue(f.equals(eq));
- assertTrue(f.equals(same));
- assertTrue(t.equals(ne));
+ assertTrue(it, f.equals(eq));
+ assertTrue(it, f.equals(same));
+ assertTrue(it, t.equals(ne));
break;
case 'l': // unequal literals
- assertTrue(f.equals(same));
- assertTrue(t.equals(ne));
+ assertTrue(it, f.equals(same));
try {
- assertTrue(f.equals(eq));
- fail("Unequal literals should throw an exception when compared for equality");
+ assertTrue(it, t.equals(ne));
+ fail("Unequal literals should throw an exception when compared for equality: " + i);
} catch (QueryException qe) {
assertTrue(qe.getMessage().startsWith("Type Error"));
}
- break;
-
- case 'e': // equivalent but unequal
- assertTrue(t.equals(same));
- assertTrue(t.equals(ne));
try {
- assertTrue(f.equals(eq));
- fail("Unequal literals should throw an exception when compared for equality");
+ assertTrue(it, f.equals(eq));
+ fail("Unequal literals should throw an exception when compared for equality: " + i);
} catch (QueryException qe) {
assertTrue(qe.getMessage().startsWith("Type Error"));
}
break;
+ case 'e': // equivalent but unequal
+ assertTrue(it, f.equals(same));
+ assertTrue(it, f.equals(ne));
+ assertTrue(it, t.equals(eq));
+ break;
+
case 'x': // exception due to unbound
try {
- assertTrue(f.equals(eq));
- fail("No exception when testing an unbound value for equality");
+ assertTrue(it, f.equals(eq));
+ fail("No exception when testing an unbound value for equality: " + i);
} catch (QueryException qe) {
assertTrue(qe.getMessage().startsWith("Resolving unbound variable"));
}
try {
- assertTrue(f.equals(same));
- fail("No exception when testing an unbound value for equivalency");
+ assertTrue(it, f.equals(same));
+ fail("No exception when testing an unbound value for equivalency: " + i);
} catch (QueryException qe) {
assertTrue(qe.getMessage().startsWith("Resolving unbound variable"));
}
try {
- assertTrue(f.equals(ne));
- fail("No exception when testing an unbound value for inequality");
+ assertTrue(it, f.equals(ne));
+ fail("No exception when testing an unbound value for inequality: " + i);
} catch (QueryException qe) {
assertTrue(qe.getMessage().startsWith("Resolving unbound variable"));
}
Modified: branches/consistency/src/jar/query/java/org/mulgara/query/filter/Filter.java
===================================================================
--- branches/consistency/src/jar/query/java/org/mulgara/query/filter/Filter.java 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/src/jar/query/java/org/mulgara/query/filter/Filter.java 2009-03-12 22:52:17 UTC (rev 1607)
@@ -46,9 +46,9 @@
public boolean isIRI() throws QueryException { return false; }
public boolean isLiteral() throws QueryException { return true; }
public boolean isURI() throws QueryException { return false; }
- public boolean notEquals(RDFTerm v) throws QueryException { return !equals(v); }
public boolean sameTerm(RDFTerm v) throws QueryException { return equals(v); }
public void setContextOwner(ContextOwner owner) { }
+ public void addContextListener(ContextOwner l) { }
};
}
Copied: branches/consistency/src/jar/query/java/org/mulgara/query/filter/InequalityComparisonUnitTest.java (from rev 1606, trunk/src/jar/query/java/org/mulgara/query/filter/InequalityComparisonUnitTest.java)
===================================================================
--- branches/consistency/src/jar/query/java/org/mulgara/query/filter/InequalityComparisonUnitTest.java (rev 0)
+++ branches/consistency/src/jar/query/java/org/mulgara/query/filter/InequalityComparisonUnitTest.java 2009-03-12 22:52:17 UTC (rev 1607)
@@ -0,0 +1,382 @@
+/**
+ * The contents of this file are subject to the Open Software License
+ * Version 3.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.opensource.org/licenses/osl-3.0.txt
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ */
+package org.mulgara.query.filter;
+
+import java.net.URI;
+import java.util.Date;
+
+import org.jrdf.graph.Literal;
+import org.jrdf.graph.Node;
+import org.mulgara.query.QueryException;
+import org.mulgara.query.filter.TestContext;
+import org.mulgara.query.filter.TestContextOwner;
+import org.mulgara.query.rdf.LiteralImpl;
+
+import org.mulgara.query.filter.value.Bool;
+import org.mulgara.query.filter.value.ComparableExpression;
+import org.mulgara.query.filter.value.DateTime;
+import org.mulgara.query.filter.value.TypedLiteral;
+import org.mulgara.query.filter.value.Var;
+
+import static org.mulgara.query.rdf.XSD.*;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+
+/**
+ * Tests the < and > functions.
+ *
+ * @created Apr 15, 2008
+ * @author Paul Gearon
+ * @copyright © 2008 <a href="http://www.topazproject.org/">The Topaz Project</a>
+ * @licence <a href="{@docRoot}/../../LICENCE.txt">Open Software License v3.0</a>
+ */
+public class InequalityComparisonUnitTest extends TestCase {
+
+ protected URI xsdInt = INT_URI;
+ protected URI xsdFloat = FLOAT_URI;
+ protected URI xsdString = STRING_URI;
+ Bool t = Bool.TRUE;
+ Bool f = Bool.FALSE;
+
+ /**
+ * Build the unit test.
+ * @param name The name of the test
+ */
+ public InequalityComparisonUnitTest(String name) {
+ super(name);
+ }
+
+ /**
+ * Hook for test runner to obtain a test suite from.
+ * @return The test suite
+ */
+ public static Test suite() {
+ TestSuite suite = new TestSuite();
+ suite.addTest(new InequalityComparisonUnitTest("testLT"));
+ suite.addTest(new InequalityComparisonUnitTest("testLTE"));
+ suite.addTest(new InequalityComparisonUnitTest("testGT"));
+ suite.addTest(new InequalityComparisonUnitTest("testGTE"));
+ suite.addTest(new InequalityComparisonUnitTest("testVar"));
+ return suite;
+ }
+
+ private void fnTst(BinaryComparisonFilter fn, Bool expected) throws QueryException {
+ assertTrue(expected.equals(fn));
+ assertTrue(fn.equals(expected));
+ }
+
+
+ public void testLT() throws Exception {
+ // compares two equal literals
+ fnTst(new LessThan(t, t), f);
+ fnTst(new LessThan(f, f), f);
+ fnTst(new LessThan(f, t), t);
+ fnTst(new LessThan(t, f), f);
+
+ ComparableExpression lhs = TypedLiteral.newLiteral(7);
+ ComparableExpression rhs = TypedLiteral.newLiteral(7.0);
+ fnTst(new LessThan(lhs, lhs), f);
+ fnTst(new LessThan(lhs, rhs), f);
+ fnTst(new LessThan(rhs, lhs), f);
+
+ rhs = TypedLiteral.newLiteral(8.0);
+ fnTst(new LessThan(lhs, rhs), t);
+ fnTst(new LessThan(rhs, lhs), f);
+
+ // compare unequal literal strings
+ lhs = TypedLiteral.newLiteral("foo", null, null);
+ rhs = TypedLiteral.newLiteral("fool", null, null);
+ fnTst(new LessThan(lhs, rhs), t);
+ fnTst(new LessThan(rhs, lhs), f);
+
+ // compare unequal literals types
+ rhs = TypedLiteral.newLiteral("foo", xsdString, null);
+ try {
+ assertTrue(f.equals(new LessThan(lhs, rhs)));
+ fail("Unequal literals should throw an exception when compared for inequality");
+ } catch (QueryException qe) {
+ assertTrue(qe.getMessage().startsWith("Type Error"));
+ }
+
+ Date date = new Date();
+ lhs = new DateTime(date);
+ rhs = new DateTime(new Date(date.getTime() + 1000));
+ fnTst(new LessThan(lhs, rhs), t);
+ fnTst(new LessThan(rhs, lhs), f);
+ }
+
+ public void testGT() throws Exception {
+ // compares two equal literals
+ fnTst(new GreaterThan(t, t), f);
+ fnTst(new GreaterThan(f, f), f);
+ fnTst(new GreaterThan(f, t), f);
+ fnTst(new GreaterThan(t, f), t);
+
+ ComparableExpression lhs = TypedLiteral.newLiteral(7);
+ ComparableExpression rhs = TypedLiteral.newLiteral(7.0);
+ fnTst(new GreaterThan(lhs, lhs), f);
+ fnTst(new GreaterThan(lhs, rhs), f);
+ fnTst(new GreaterThan(rhs, lhs), f);
+
+ rhs = TypedLiteral.newLiteral(8.0);
+ fnTst(new GreaterThan(lhs, rhs), f);
+ fnTst(new GreaterThan(rhs, lhs), t);
+
+ // compare unequal literal strings
+ lhs = TypedLiteral.newLiteral("foo", null, null);
+ rhs = TypedLiteral.newLiteral("foo", null, null);
+ fnTst(new GreaterThan(lhs, rhs), f);
+ fnTst(new GreaterThan(rhs, lhs), f);
+ rhs = TypedLiteral.newLiteral("fool", null, null);
+ fnTst(new GreaterThan(lhs, rhs), f);
+ fnTst(new GreaterThan(rhs, lhs), t);
+
+ // compare unequal literals types
+ rhs = TypedLiteral.newLiteral("foo", xsdString, null);
+ try {
+ assertTrue(f.equals(new GreaterThan(lhs, rhs)));
+ fail("Unequal literals should throw an exception when compared for inequality");
+ } catch (QueryException qe) {
+ assertTrue(qe.getMessage().startsWith("Type Error"));
+ }
+
+ Date date = new Date();
+ lhs = new DateTime(date);
+ rhs = new DateTime(new Date(date.getTime() + 1000));
+ fnTst(new GreaterThan(lhs, rhs), f);
+ fnTst(new GreaterThan(rhs, lhs), t);
+ }
+
+ public void testLTE() throws Exception {
+ // compares two equal literals
+ fnTst(new LessThanEqualTo(t, t), t);
+ fnTst(new LessThanEqualTo(f, f), t);
+ fnTst(new LessThanEqualTo(f, t), t);
+ fnTst(new LessThanEqualTo(t, f), f);
+
+ ComparableExpression lhs = TypedLiteral.newLiteral(7);
+ ComparableExpression rhs = TypedLiteral.newLiteral(7.0);
+ fnTst(new LessThanEqualTo(lhs, lhs), t);
+ fnTst(new LessThanEqualTo(lhs, rhs), t);
+ fnTst(new LessThanEqualTo(rhs, lhs), t);
+
+ rhs = TypedLiteral.newLiteral(8.0);
+ fnTst(new LessThanEqualTo(lhs, rhs), t);
+ fnTst(new LessThanEqualTo(rhs, lhs), f);
+
+ // compare unequal literal strings
+ lhs = TypedLiteral.newLiteral("foo", null, null);
+ rhs = TypedLiteral.newLiteral("foo", null, null);
+ fnTst(new LessThanEqualTo(lhs, rhs), t);
+ fnTst(new LessThanEqualTo(rhs, lhs), t);
+ rhs = TypedLiteral.newLiteral("fool", null, null);
+ fnTst(new LessThanEqualTo(lhs, rhs), t);
+ fnTst(new LessThanEqualTo(rhs, lhs), f);
+
+ // compare unequal literals types
+ rhs = TypedLiteral.newLiteral("foo", xsdString, null);
+ try {
+ assertTrue(f.equals(new LessThanEqualTo(lhs, rhs)));
+ fail("Unequal literals should throw an exception when compared for inequality");
+ } catch (QueryException qe) {
+ assertTrue(qe.getMessage().startsWith("Type Error"));
+ }
+
+ Date date = new Date();
+ lhs = new DateTime(date);
+ rhs = new DateTime(new Date(date.getTime() + 1000));
+ fnTst(new LessThanEqualTo(lhs, rhs), t);
+ fnTst(new LessThanEqualTo(rhs, lhs), f);
+ }
+
+ public void testGTE() throws Exception {
+ // compares two equal literals
+ fnTst(new GreaterThanEqualTo(t, t), t);
+ fnTst(new GreaterThanEqualTo(f, f), t);
+ fnTst(new GreaterThanEqualTo(f, t), f);
+ fnTst(new GreaterThanEqualTo(t, f), t);
+
+ ComparableExpression lhs = TypedLiteral.newLiteral(7);
+ ComparableExpression rhs = TypedLiteral.newLiteral(7.0);
+ fnTst(new GreaterThanEqualTo(lhs, lhs), t);
+ fnTst(new GreaterThanEqualTo(lhs, rhs), t);
+ fnTst(new GreaterThanEqualTo(rhs, lhs), t);
+
+ rhs = TypedLiteral.newLiteral(8.0);
+ fnTst(new GreaterThanEqualTo(lhs, rhs), f);
+ fnTst(new GreaterThanEqualTo(rhs, lhs), t);
+
+ // compare unequal literal strings
+ lhs = TypedLiteral.newLiteral("foo", null, null);
+ rhs = TypedLiteral.newLiteral("foo", null, null);
+ fnTst(new GreaterThanEqualTo(lhs, rhs), t);
+ fnTst(new GreaterThanEqualTo(rhs, lhs), t);
+ rhs = TypedLiteral.newLiteral("fool", null, null);
+ fnTst(new GreaterThan(lhs, rhs), f);
+ fnTst(new GreaterThan(rhs, lhs), t);
+
+ // compare unequal literals types
+ rhs = TypedLiteral.newLiteral("foo", xsdString, null);
+ try {
+ assertTrue(f.equals(new GreaterThanEqualTo(lhs, rhs)));
+ fail("Unequal literals should throw an exception when compared for inequality");
+ } catch (QueryException qe) {
+ assertTrue(qe.getMessage().startsWith("Type Error"));
+ }
+
+ Date date = new Date();
+ lhs = new DateTime(date);
+ rhs = new DateTime(new Date(date.getTime() + 1000));
+ fnTst(new GreaterThanEqualTo(lhs, rhs), f);
+ fnTst(new GreaterThanEqualTo(rhs, lhs), t);
+ }
+
+ public void testVar() throws Exception {
+ Var x = new Var("x");
+ Var y = new Var("y");
+ AbstractFilterValue lt = new LessThan(x, y);
+ AbstractFilterValue lte = new LessThanEqualTo(x, y);
+ AbstractFilterValue gt = new GreaterThan(x, y);
+ AbstractFilterValue gte = new GreaterThanEqualTo(x, y);
+
+ Literal seven = new LiteralImpl("7", xsdInt);
+ Literal sevenF = new LiteralImpl("7.0", xsdFloat);
+ Literal eight = new LiteralImpl("8", xsdInt);
+ Literal eightF = new LiteralImpl("8.0", xsdFloat);
+ Literal simple = new LiteralImpl("foo");
+ Literal simpleLarge = new LiteralImpl("goo");
+ Literal str = new LiteralImpl("foo", xsdString);
+ Literal strLarge = new LiteralImpl("goo", xsdString);
+ Node[][] rows = {
+ new Node[] {seven, seven},
+ new Node[] {seven, sevenF},
+ new Node[] {seven, eight},
+ new Node[] {seven, eightF},
+
+ new Node[] {simple, simple},
+ new Node[] {simple, simpleLarge},
+ new Node[] {simple, str},
+
+ new Node[] {seven, str},
+ new Node[] {sevenF, str},
+ new Node[] {str, seven},
+ new Node[] {str, sevenF},
+
+ new Node[] {str, str},
+ new Node[] {str, strLarge},
+
+ new Node[] {null, str},
+ };
+ TestContext c = new TestContext(new String[] {"x", "y"}, rows);
+ c.beforeFirst();
+ lt.setContextOwner(new TestContextOwner(c));
+ lte.setContextOwner(new TestContextOwner(c));
+ gt.setContextOwner(new TestContextOwner(c));
+ gte.setContextOwner(new TestContextOwner(c));
+ // check the context setting
+ lt.setCurrentContext(c);
+ lte.setCurrentContext(c);
+ gt.setCurrentContext(c);
+ gte.setCurrentContext(c);
+ // 0123 456 7890 12 3
+ String results = "eell elx xxxx el n";
+ runTests(c, lt, lte, gt, gte, results);
+
+ }
+
+ private void runTests(TestContext c, AbstractFilterValue lt, AbstractFilterValue lte, AbstractFilterValue gt, AbstractFilterValue gte, String results) throws Exception {
+ c.beforeFirst();
+ int i = 0;
+ for (char result: results.toCharArray()) {
+ if (result == ' ') continue;
+ String it = "iteration: " + i++;
+ assertTrue(c.next());
+ switch (result) {
+ case 'e': // equal
+ assertTrue(it, f.equals(lt));
+ assertTrue(it, t.equals(lte));
+ assertTrue(it, f.equals(gt));
+ assertTrue(it, t.equals(gte));
+ break;
+
+ case 'l': // less than
+ assertTrue(it, t.equals(lt));
+ assertTrue(it, t.equals(lte));
+ assertTrue(it, f.equals(gt));
+ assertTrue(it, f.equals(gte));
+ break;
+
+ case 'x': // Type error
+ try {
+ assertTrue(it, t.equals(lt));
+ fail("Unequal literals should throw an exception when compared for less than: " + i);
+ } catch (QueryException qe) {
+ assertTrue(qe.getMessage().startsWith("Type Error"));
+ }
+ try {
+ assertTrue(it, t.equals(lte));
+ fail("Unequal literals should throw an exception when compared for less than or equal: " + i);
+ } catch (QueryException qe) {
+ assertTrue(qe.getMessage().startsWith("Type Error"));
+ }
+ try {
+ assertTrue(it, t.equals(gt));
+ fail("Unequal literals should throw an exception when compared for greater than: " + i);
+ } catch (QueryException qe) {
+ assertTrue(qe.getMessage().startsWith("Type Error"));
+ }
+ try {
+ assertTrue(it, t.equals(gte));
+ fail("Unequal literals should throw an exception when compared for greater than or equal: " + i);
+ } catch (QueryException qe) {
+ assertTrue(qe.getMessage().startsWith("Type Error"));
+ }
+ break;
+
+ case 'n': // exception due to unbound
+ try {
+ assertTrue(it, f.equals(lt));
+ fail("No exception when testing an unbound value for equality: " + i);
+ } catch (QueryException qe) {
+ assertTrue(qe.getMessage().startsWith("Resolving unbound variable"));
+ }
+ try {
+ assertTrue(it, f.equals(lte));
+ fail("No exception when testing an unbound value for equivalency: " + i);
+ } catch (QueryException qe) {
+ assertTrue(qe.getMessage().startsWith("Resolving unbound variable"));
+ }
+ try {
+ assertTrue(it, f.equals(gt));
+ fail("No exception when testing an unbound value for inequality: " + i);
+ } catch (QueryException qe) {
+ assertTrue(qe.getMessage().startsWith("Resolving unbound variable"));
+ }
+ try {
+ assertTrue(it, f.equals(gte));
+ fail("No exception when testing an unbound value for inequality: " + i);
+ } catch (QueryException qe) {
+ assertTrue(qe.getMessage().startsWith("Resolving unbound variable"));
+ }
+ break;
+
+ default:
+ fail("Bad test data");
+ }
+ }
+ assertFalse(c.next());
+ }
+
+}
Modified: branches/consistency/src/jar/query/java/org/mulgara/query/filter/NotEquals.java
===================================================================
--- branches/consistency/src/jar/query/java/org/mulgara/query/filter/NotEquals.java 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/src/jar/query/java/org/mulgara/query/filter/NotEquals.java 2009-03-12 22:52:17 UTC (rev 1607)
@@ -33,7 +33,7 @@
/** @see org.mulgara.query.filter.BinaryTestFilter#testCmp() */
boolean testCmp() throws QueryException {
- return lhs.notEquals(rhs);
+ return !lhs.equals(rhs);
}
}
Modified: branches/consistency/src/jar/query/java/org/mulgara/query/filter/RDFTerm.java
===================================================================
--- branches/consistency/src/jar/query/java/org/mulgara/query/filter/RDFTerm.java 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/src/jar/query/java/org/mulgara/query/filter/RDFTerm.java 2009-03-12 22:52:17 UTC (rev 1607)
@@ -24,7 +24,7 @@
* @copyright © 2008 <a href="http://www.topazproject.org/">The Topaz Project</a>
* @licence <a href="{@docRoot}/../../LICENCE.txt">Open Software License v3.0</a>
*/
-public interface RDFTerm extends Serializable {
+public interface RDFTerm extends Serializable, ContextOwner {
/**
* Returns the data represented by this expression.
@@ -43,15 +43,6 @@
public boolean equals(RDFTerm v) throws QueryException;
/**
- * A value based inequality test.
- * @param v The object to compare to
- * @return <code>false</code> iff v has the same value as the current object.
- * @throws QueryException Resolving the data for this value leads to an error,
- * or the types are incompatible.
- */
- public boolean notEquals(RDFTerm v) throws QueryException;
-
- /**
* Tests if this object is a URI or IRI.
* @return <code>true</code> if this object is an IRI.
*/
@@ -79,15 +70,4 @@
*/
public boolean sameTerm(RDFTerm v) throws QueryException;
- /**
- * Sets the object that contains the current context to work in.
- * @param owner The object that owns this context.
- */
- public void setContextOwner(ContextOwner owner);
-
- /**
- * Gets the object that contains the current context to work in.
- * @return The object that owns this context.
- */
- public ContextOwner getContextOwner();
}
Modified: branches/consistency/src/jar/query/java/org/mulgara/query/filter/TestContext.java
===================================================================
--- branches/consistency/src/jar/query/java/org/mulgara/query/filter/TestContext.java 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/src/jar/query/java/org/mulgara/query/filter/TestContext.java 2009-03-12 22:52:17 UTC (rev 1607)
@@ -108,6 +108,8 @@
/** @see org.mulgara.query.filter.Context#isBound(int) */
public boolean isBound(int columnNumber) throws QueryException {
if (columnNumber >= columnNames.size()) throw new QueryException("Unexpected column: " + columnNumber);
+ if (rowNumber < 0) throw new QueryException("beforeFirst() called on Context without next()");
+ if (rowNumber >= rows.length) throw new QueryException("called next() on Context too often");
return rows[rowNumber][columnNumber] != null;
}
Modified: branches/consistency/src/jar/query/java/org/mulgara/query/filter/TestContextOwner.java
===================================================================
--- branches/consistency/src/jar/query/java/org/mulgara/query/filter/TestContextOwner.java 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/src/jar/query/java/org/mulgara/query/filter/TestContextOwner.java 2009-03-12 22:52:17 UTC (rev 1607)
@@ -11,7 +11,10 @@
*/
package org.mulgara.query.filter;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* A test class for emulating a context ownership.
*
@@ -24,6 +27,9 @@
/** The owned context */
private Context ctx;
+ /** A list of context owners that this owner provides the context for. */
+ private List<ContextOwner> contextListeners = new ArrayList<ContextOwner>();
+
/**
* Create the test ownership.
* @param ctx The context to own.
@@ -34,9 +40,37 @@
* Updates the owned context.
* @param ctx The context to update to.
*/
- public void setCurrentContext(Context ctx) { this.ctx = ctx; }
+ public void setCurrentContext(Context ctx) {
+ this.ctx = ctx;
+ for (ContextOwner l: contextListeners) l.setCurrentContext(ctx);
+ }
/** @return the current context. */
public Context getCurrentContext() { return ctx; }
+ /**
+ * Adds a context owner as a listener so that it will be updated with its context
+ * when this owner gets updated.
+ * @param l The context owner to register.
+ */
+ public void addContextListener(ContextOwner l) {
+ contextListeners.add(l);
+ }
+
+ /**
+ * This provides a context, and does not need to refer to a parent.
+ * @see org.mulgara.query.filter.ContextOwner#getContextOwner()
+ */
+ public ContextOwner getContextOwner() {
+ throw new IllegalStateException("Should never be asking for the context owner of a Tuples");
+ }
+
+ /**
+ * The owner of the context for a Tuples is never needed, since it is always provided by the Tuples.
+ * @see org.mulgara.query.filter.ContextOwner#setContextOwner(org.mulgara.query.filter.ContextOwner)
+ */
+ public void setContextOwner(ContextOwner owner) {
+ throw new IllegalStateException("Should never be setting the context owner of a Tuples");
+ }
+
}
Modified: branches/consistency/src/jar/query/java/org/mulgara/query/filter/arithmetic/AbstractNumericOperation.java
===================================================================
--- branches/consistency/src/jar/query/java/org/mulgara/query/filter/arithmetic/AbstractNumericOperation.java 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/src/jar/query/java/org/mulgara/query/filter/arithmetic/AbstractNumericOperation.java 2009-03-12 22:52:17 UTC (rev 1607)
@@ -51,9 +51,6 @@
/** @see org.mulgara.query.filter.RDFTerm#isURI() */
public boolean isURI() throws QueryException { return false; }
- /** @see org.mulgara.query.filter.RDFTerm#notEquals() */
- public boolean notEquals(RDFTerm v) throws QueryException { return compare(getNumber(), v.getValue()) != 0; }
-
/** @see org.mulgara.query.filter.RDFTerm#sameTerm() */
public boolean sameTerm(RDFTerm v) throws QueryException { return getNumber().equals(v.getValue()); }
@@ -66,6 +63,7 @@
/** @see org.mulgara.query.filter.RDFTerm#setContextOwner(org.mulgara.query.filter.ContextOwner) */
public void setContextOwner(ContextOwner owner) {
this.owner = owner;
+ owner.addContextListener(this);
}
/** @see org.mulgara.query.filter.RDFTerm#getContextOwner() */
Modified: branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/AbstractComparable.java
===================================================================
--- branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/AbstractComparable.java 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/AbstractComparable.java 2009-03-12 22:52:17 UTC (rev 1607)
@@ -57,11 +57,6 @@
return compare(getValue(), v.getValue()) == 0;
}
- /** {@inheritDoc} */
- public boolean notEquals(ComparableExpression v) throws QueryException {
- return !equals(v);
- }
-
/**
* Tests a value to see if it is a simple literal, and throws an exception if it is.
* Simple literals do a similar test when compared with a ComparableExpression.
Modified: branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/AbstractComparableLiteral.java
===================================================================
--- branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/AbstractComparableLiteral.java 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/AbstractComparableLiteral.java 2009-03-12 22:52:17 UTC (rev 1607)
@@ -11,12 +11,15 @@
*/
package org.mulgara.query.filter.value;
+import java.math.BigDecimal;
+import java.net.URI;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import org.mulgara.query.QueryException;
import org.mulgara.query.filter.RDFTerm;
+import org.mulgara.query.rdf.XSD;
/**
@@ -74,7 +77,7 @@
/** {@inheritDoc} */
public boolean sameTerm(RDFTerm v) throws QueryException {
if (!v.isLiteral()) return false;
- return equalLiteralTypes((ValueLiteral)v) && getValue().equals(v.getValue());
+ return comparableLiteralTypes((ValueLiteral)v) && getValue().equals(v.getValue());
}
/**
@@ -86,24 +89,48 @@
*/
public boolean equals(RDFTerm v) throws QueryException {
if (!v.isLiteral()) return false;
- // compare types, and then check values
- if (equalLiteralTypes((ValueLiteral)v) && getValue().equals(v.getValue())) return true;
+ // numbers are compared differently
+ if (isNumber(v) && isNumber(this)) return numericEquals(v);
+
+ // simple strings can do the comparison for us. This object cannot be simple,
+ // otherwise this method would not have been called.
+ if (((ValueLiteral)v).isSimple()) return v.equals(this);
+
+ // if the types allow for direct comparisons, then do so
+ if (directlyComparableTypes(v)) return getValue().equals(v.getValue());
+
+ // This is now RDFterm-equal, return true or an error
+ // compare for type equality, then value equality
+ if (comparableLiteralTypes(v) && getValue().equals(v.getValue())) return true;
throw new QueryException("Type Error: Terms are not equal");
}
-
+
+
/**
- * {@inheritDoc}
- * Not the inverse of #equals(). This method returns true when the elements connot be determined
- * to be equal.
+ * Indicates that an direct compare operation is valid on these types. This is defined
+ * to be valid for:
+ * <ul>
+ * <li>booleans</li>
+ * <li>dateTimes</li>
+ * <li>XSD strings</li>
+ * </ul>
+ * Simple strings and numbers are handled elsewhere.
+ * @param vl The other value literal to be compared against.
+ * @return <code>true</code> if direct comparison is allowed between these types.
+ * @throws QueryException If there is a data error accessing the types.
*/
- public boolean notEquals(RDFTerm v) throws QueryException {
- try {
- return !equals(v);
- } catch (QueryException qe) {
- return true;
- }
+ private boolean directlyComparableTypes(RDFTerm term) throws QueryException {
+ ValueLiteral vl = (ValueLiteral)term;
+ IRI otherType = vl.getType();
+ IRI thisType = getType();
+ assert otherType != null && thisType != null;
+ // if differing types, then can't be compared
+ if (!thisType.equals(otherType)) return false;
+ URI tt = thisType.getValue();
+ return tt.equals(XSD.BOOLEAN_URI) || tt.equals(XSD.DATE_TIME_URI) || thisType.equals(SimpleLiteral.STRING_TYPE);
}
+
/**
* Compares the type of this object to the type of another object. This takes into account
* that Simple Literals claim to have a string type, when they have no type at all.
@@ -112,28 +139,26 @@
* then both objects have to be typed literals, or untyped literals.
* @throws QueryException If there is an error accessing the type data.
*/
- private boolean equalLiteralTypes(ValueLiteral vl) throws QueryException {
+ private boolean comparableLiteralTypes(RDFTerm term) throws QueryException {
+ ValueLiteral vl = (ValueLiteral)term;
IRI opType = vl.getType();
IRI thisType = getType();
assert opType != null && thisType != null;
- // if the types differ, then not equal
- if (!opType.equals(thisType)) return false;
- // types are the same. If they are not strings, then definitely equal
- if (!opType.equals(SimpleLiteral.STRING_TYPE)) return true;
- // both types are strings. Only true if the other object is not a simple literal
- return !vl.isSimple();
+ // if the types differ, then the literals are definitely not equal
+ return opType.equals(thisType);
}
+
/**
* Extended numerical comparison function. Currently unused.
* @param v The term to compare against.
* @return <code>true</code> if this compares against v with semantic equivalence, regardless of lexical equivalence
* @throws QueryException Thrown when a value cannot be resolved, or if the types are no numbers.
*/
- @SuppressWarnings("unused")
- private boolean numberCompare(RDFTerm v) throws QueryException {
- if (!(value instanceof Number) || !(v.getValue() instanceof Number)) throw new QueryException("Terms are not equal");
- return compare(value, v) == 0;
+ private boolean numericEquals(RDFTerm v) throws QueryException {
+ Object ov = v.getValue();
+ if (!(value instanceof Number) || !(ov instanceof Number)) throw new QueryException("Terms are not equal");
+ return compare(value, ov) == 0;
}
/**
@@ -149,6 +174,18 @@
return cmpFn.compare(left, right);
}
+
+ /**
+ * Utility to test a literal to see if it is a numeric type. Accepts an RDFTerm for convenience.
+ * @param t A ValueLiteral to test to see if it is a number.
+ * @return <code>true</code> if the term is a number.
+ * @throws QueryException If there was an error accessing the value of the term.
+ */
+ private static final boolean isNumber(RDFTerm t) throws QueryException {
+ return NumericLiteral.isNumeric(((ValueLiteral)t).getType().getValue());
+ }
+
+
/** Map of class types to the functions used to compare those types */
protected static Map<Class<? extends Comparable<?>>,DataCompare> typeMap = new HashMap<Class<? extends Comparable<?>>,DataCompare>();
@@ -158,10 +195,11 @@
typeMap.put(Boolean.class, new BooleanCompare());
typeMap.put(Float.class, new FloatCompare());
typeMap.put(Double.class, new DoubleCompare());
- typeMap.put(Long.class, new DecimalCompare());
- typeMap.put(Integer.class, new DecimalCompare());
- typeMap.put(Short.class, new DecimalCompare());
- typeMap.put(Byte.class, new DecimalCompare());
+ typeMap.put(Long.class, new IntegralCompare());
+ typeMap.put(Integer.class, new IntegralCompare());
+ typeMap.put(Short.class, new IntegralCompare());
+ typeMap.put(Byte.class, new IntegralCompare());
+ typeMap.put(BigDecimal.class, new BigDecimalCompare());
}
/** Defines a function for comparing objects of arbitrary type */
@@ -231,7 +269,7 @@
}
/** Implements integer comparisons */
- private static class DecimalCompare implements DataCompare {
+ private static class IntegralCompare implements DataCompare {
public int compare(Object left, Object right) throws QueryException {
if (!(right instanceof Number)) throw new QueryException("Type Error: Cannot compare a decimal number to a: " + right.getClass());
Long lleft = ((Number)left).longValue();
@@ -240,4 +278,18 @@
public ValueLiteral newLiteral(Object data) { return new NumericLiteral((Number)data); }
}
+ /** Implements big-decimal comparisons */
+ private static class BigDecimalCompare implements DataCompare {
+ public int compare(Object left, Object right) throws QueryException {
+ if (!(right instanceof Number)) throw new QueryException("Type Error: Cannot compare a decimal number to a: " + right.getClass());
+ BigDecimal bleft = (BigDecimal)left;
+ if (right instanceof BigDecimal) return bleft.compareTo((BigDecimal)right);
+ if (right instanceof Double || right instanceof Float) {
+ return bleft.compareTo(BigDecimal.valueOf(((Number)right).doubleValue()));
+ }
+ return bleft.compareTo(BigDecimal.valueOf(((Number)right).longValue()));
+ }
+ public ValueLiteral newLiteral(Object data) { return new NumericLiteral((Number)data); }
+ }
+
}
Modified: branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/BlankNodeValue.java
===================================================================
--- branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/BlankNodeValue.java 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/BlankNodeValue.java 2009-03-12 22:52:17 UTC (rev 1607)
@@ -13,6 +13,7 @@
import org.jrdf.graph.BlankNode;
import org.mulgara.query.QueryException;
+import org.mulgara.query.filter.Context;
import org.mulgara.query.filter.ContextOwner;
import org.mulgara.query.filter.RDFTerm;
@@ -52,11 +53,6 @@
}
/** {@inheritDoc} */
- public boolean notEquals(RDFTerm v) throws QueryException {
- return !equals(v);
- }
-
- /** {@inheritDoc} */
public boolean sameTerm(RDFTerm v) throws QueryException {
return equals(v);
}
@@ -78,4 +74,14 @@
/** This value does not need a context */
public void setContextOwner(ContextOwner owner) { }
+
+ /** This value does not need a context */
+ public Context getCurrentContext() { return null; }
+
+ /** This value does not need a context */
+ public void setCurrentContext(Context context) { }
+
+ /** This value does not need a context */
+ public void addContextListener(ContextOwner l) { }
+
}
Modified: branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/BlankNodeValueUnitTest.java
===================================================================
--- branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/BlankNodeValueUnitTest.java 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/BlankNodeValueUnitTest.java 2009-03-12 22:52:17 UTC (rev 1607)
@@ -59,8 +59,6 @@
assertFalse(b2.equals(bv.getValue()));
BlankNodeValue bv2 = new BlankNodeValue(b2);
assertTrue(bv.equals(bv));
- assertTrue(bv.notEquals(bv2));
- assertFalse(bv.notEquals(bv));
assertFalse(bv.equals(bv2));
}
Modified: branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/IRI.java
===================================================================
--- branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/IRI.java 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/IRI.java 2009-03-12 22:52:17 UTC (rev 1607)
@@ -14,6 +14,7 @@
import java.net.URI;
import org.mulgara.query.QueryException;
+import org.mulgara.query.filter.Context;
import org.mulgara.query.filter.ContextOwner;
import org.mulgara.query.filter.RDFTerm;
@@ -63,11 +64,6 @@
}
/** {@inheritDoc} */
- public boolean notEquals(RDFTerm v) throws QueryException {
- return !equals(v);
- }
-
- /** {@inheritDoc} */
public boolean isBlank() { return false; }
/** {@inheritDoc} */
@@ -90,4 +86,13 @@
/** This value does not need a context */
public void setContextOwner(ContextOwner owner) { }
+ /** This value does not need a context */
+ public Context getCurrentContext() { return null; }
+
+ /** This value does not need a context */
+ public void setCurrentContext(Context context) { }
+
+ /** This value does not need a context */
+ public void addContextListener(ContextOwner l) { }
+
}
Modified: branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/NumericLiteral.java
===================================================================
--- branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/NumericLiteral.java 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/NumericLiteral.java 2009-03-12 22:52:17 UTC (rev 1607)
@@ -11,6 +11,7 @@
*/
package org.mulgara.query.filter.value;
+import java.math.BigDecimal;
import java.net.URI;
import java.util.HashMap;
import java.util.Map;
@@ -36,7 +37,7 @@
* @param n The number to wrap
*/
public NumericLiteral(Number n) {
- super(n, typeMap.get(n.getClass()));
+ super(n, numericTypeMap.get(n.getClass()));
}
/**
@@ -59,7 +60,7 @@
* @return An IRI containing the XSD datatype of n.
*/
public static IRI getTypeFor(Number n) {
- return new IRI(typeMap.get(n.getClass()));
+ return new IRI(numericTypeMap.get(n.getClass()));
}
/**
@@ -82,15 +83,16 @@
}
/** A mapping of numeric types to their URIs */
- private static final Map<Class<? extends Number>,URI> typeMap = new HashMap<Class<? extends Number>,URI>();
+ private static final Map<Class<? extends Number>,URI> numericTypeMap = new HashMap<Class<? extends Number>,URI>();
static {
- typeMap.put(Float.class, XSD.FLOAT_URI);
- typeMap.put(Double.class, XSD.DOUBLE_URI);
- typeMap.put(Long.class, XSD.LONG_URI);
- typeMap.put(Integer.class, XSD.INT_URI);
- typeMap.put(Short.class, XSD.SHORT_URI);
- typeMap.put(Byte.class, XSD.BYTE_URI);
+ numericTypeMap.put(Float.class, XSD.FLOAT_URI);
+ numericTypeMap.put(Double.class, XSD.DOUBLE_URI);
+ numericTypeMap.put(Long.class, XSD.LONG_URI);
+ numericTypeMap.put(Integer.class, XSD.INT_URI);
+ numericTypeMap.put(Short.class, XSD.SHORT_URI);
+ numericTypeMap.put(Byte.class, XSD.BYTE_URI);
+ numericTypeMap.put(BigDecimal.class, XSD.DECIMAL_URI);
}
}
Modified: branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/NumericLiteralUnitTest.java
===================================================================
--- branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/NumericLiteralUnitTest.java 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/NumericLiteralUnitTest.java 2009-03-12 22:52:17 UTC (rev 1607)
@@ -11,6 +11,8 @@
*/
package org.mulgara.query.filter.value;
+import java.math.BigDecimal;
+
import org.mulgara.query.filter.Context;
import org.mulgara.query.filter.TestContext;
import static org.mulgara.query.rdf.XSD.*;
@@ -62,6 +64,11 @@
n = new NumericLiteral(six);
assertEquals(n.getValue(), six);
assertFalse(Double.valueOf(4).equals(n.getValue()));
+
+ BigDecimal large = new BigDecimal("12345678901234567890");
+ n = new NumericLiteral(large);
+ assertEquals(n.getValue(), large);
+ assertFalse(BigDecimal.valueOf(1234567890123456789L).equals(n.getValue()));
}
public void testFilter() throws Exception {
@@ -75,6 +82,11 @@
assertTrue(n.test(c));
n = new NumericLiteral(Double.valueOf(0));
assertFalse(n.test(c));
+
+ n = new NumericLiteral(BigDecimal.valueOf(5.0));
+ assertTrue(n.test(c));
+ n = new NumericLiteral(BigDecimal.ZERO);
+ assertFalse(n.test(c));
}
public void testType() throws Exception {
@@ -93,6 +105,10 @@
n = new NumericLiteral(Float.valueOf(5));
assertTrue(n.getType().isIRI());
assertEquals(n.getType().getValue(), FLOAT_URI);
+
+ n = new NumericLiteral(new BigDecimal("12345678901234567890"));
+ assertTrue(n.getType().isIRI());
+ assertEquals(n.getType().getValue(), DECIMAL_URI);
}
@@ -116,6 +132,12 @@
n2 = TypedLiteral.newLiteral(six);
assertTrue(n.equals(n2));
assertTrue(n.getType().equals(n2.getType()));
+
+ BigDecimal large = new BigDecimal("12345678901234567890");
+ n = new NumericLiteral(large);
+ n2 = TypedLiteral.newLiteral(large);
+ assertTrue(n.equals(n2));
+ assertTrue(n.getType().equals(n2.getType()));
}
}
Modified: branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/SimpleLiteral.java
===================================================================
--- branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/SimpleLiteral.java 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/SimpleLiteral.java 2009-03-12 22:52:17 UTC (rev 1607)
@@ -105,8 +105,9 @@
/**
* {@inheritDoc}
- * This method will only return <code>true</code> when the elements are identical.
- * Since this object is a literal, then an incorrect comparison will throw an exception.
+ * This method will only return <code>true</code> when the elements are identical, and
+ * <code>false</code> when they are the same type, but different values.
+ * Since this object is a literal, then a comparison with another type will throw an exception.
* {@link http://www.w3.org/TR/rdf-sparql-query/#func-RDFterm-equal}
* <em>produces a type error if the arguments are both literal but are not the same RDF term</em>
*/
@@ -114,7 +115,7 @@
if (!v.isLiteral()) return false;
if (((ValueLiteral)v).isSimple()) {
// check values and language codes
- if (getValue().equals(v.getValue()) && compareLangEquals((ValueLiteral)v)) return true;
+ return getValue().equals(v.getValue()) && compareLangEquals((ValueLiteral)v);
}
throw new QueryException("Type Error: Terms are not equal");
}
Modified: branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/TypedLiteral.java
===================================================================
--- branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/TypedLiteral.java 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/TypedLiteral.java 2009-03-12 22:52:17 UTC (rev 1607)
@@ -11,6 +11,7 @@
*/
package org.mulgara.query.filter.value;
+import java.math.BigDecimal;
import java.net.URI;
import java.util.Date;
import java.util.HashMap;
@@ -135,6 +136,9 @@
if (type == null) return ((String)value).length() != 0;
TypeInfo test = infoMap.get(type);
if (test == null) throw new QueryException("Type Error: no effective boolean value for: " + toString());
+ if (NumericLiteral.isNumeric(type)) {
+ return (value instanceof Number) && test.ebv((Number)value);
+ }
return test.ebv(value.toString());
}
@@ -149,6 +153,8 @@
public interface TypeInfo {
/** Returns an EBV of <code>true</code> iff the data matches the type sufficiently */
public boolean ebv(String data) throws QueryException;
+ /** Returns an EBV of <code>true</code> iff the number is not zero */
+ public boolean ebv(Number v) throws QueryException;
/** Returns data parsed out of the string literal */
public Object toData(String representation) throws QueryException;
/** Returns the URI for this type */
@@ -191,6 +197,7 @@
// initialize the types
static {
+ addDefaultTypeInfo(XSDDecimal.INSTANCE);
addDefaultTypeInfo(XSDString.INSTANCE);
addDefaultTypeInfo(XSDBoolean.INSTANCE);
addDefaultTypeInfo(XSDDouble.INSTANCE);
@@ -200,7 +207,6 @@
addDefaultTypeInfo(XSDShort.INSTANCE);
addDefaultTypeInfo(XSDByte.INSTANCE);
addDefaultTypeInfo(XSDDate.INSTANCE);
- infoMap.put(XSD.DECIMAL_URI, XSDLong.INSTANCE);
infoMap.put(XSD.INTEGER_URI, XSDLong.INSTANCE);
infoMap.put(XSD.NON_POSITIVE_INTEGER_URI, XSDLong.INSTANCE);
infoMap.put(XSD.NEGATIVE_INTEGER_URI, XSDLong.INSTANCE);
@@ -210,7 +216,6 @@
infoMap.put(XSD.UNSIGNED_INT_URI, XSDLong.INSTANCE);
infoMap.put(XSD.UNSIGNED_SHORT_URI, XSDInteger.INSTANCE);
infoMap.put(XSD.UNSIGNED_BYTE_URI, XSDShort.INSTANCE);
- infoMap.put(XSDAbbrev.DECIMAL_URI, XSDLong.INSTANCE);
infoMap.put(XSDAbbrev.INTEGER_URI, XSDLong.INSTANCE);
infoMap.put(XSDAbbrev.NON_POSITIVE_INTEGER_URI, XSDLong.INSTANCE);
infoMap.put(XSDAbbrev.NEGATIVE_INTEGER_URI, XSDLong.INSTANCE);
@@ -230,6 +235,7 @@
public static final XSDString INSTANCE = new XSDString();
private XSDString() { super(XSD.STRING_URI, XSDAbbrev.STRING_URI); }
public boolean ebv(String data) { return data != null && data.length() != 0; }
+ public boolean ebv(Number data) { throw new IllegalArgumentException("Found a number in a string operation"); }
public Object toData(String r) { return r; }
public ValueLiteral newLiteral(Object data) { return new TypedLiteral((String)data, getTypeURI()); }
}
@@ -238,10 +244,41 @@
public static final XSDBoolean INSTANCE = new XSDBoolean();
private XSDBoolean() { super(XSD.BOOLEAN_URI, XSDAbbrev.BOOLEAN_URI); }
public boolean ebv(String data) { return Boolean.parseBoolean(data); }
+ public boolean ebv(Number data) { throw new IllegalArgumentException("Found a number in a boolean operation"); }
public Object toData(String r) { return Boolean.parseBoolean(r); }
public ValueLiteral newLiteral(Object data) { return new Bool((Boolean)data); }
}
+ private static class XSDDecimal extends AbstractXSD {
+ public static final XSDDecimal INSTANCE = new XSDDecimal();
+ private XSDDecimal() { super(XSD.DECIMAL_URI, XSDAbbrev.DECIMAL_URI); }
+ public boolean ebv(String data) {
+ try {
+ if (data == null) return false;
+ BigDecimal d = new BigDecimal(data);
+ return !BigDecimal.ZERO.equals(d);
+ } catch (NumberFormatException nfe) {
+ return false;
+ }
+ }
+ public boolean ebv(Number data) {
+ return !BigDecimal.ZERO.equals(((BigDecimal)data));
+ }
+ public Object toData(String r) throws QueryException {
+ try {
+ return new BigDecimal(r);
+ } catch (NumberFormatException nfe) {
+ throw new QueryException("Type Error: Cannot convert to a Decimal: " + r);
+ }
+ }
+ public ValueLiteral newLiteral(Object data) {
+ if (data instanceof Double) return new NumericLiteral((Double)data, getTypeURI());
+ if (data instanceof Long) return new NumericLiteral((Long)data, getTypeURI());
+ return new NumericLiteral((BigDecimal)data, getTypeURI());
+ }
+ public Number valueOf(Number n) { return n.doubleValue(); }
+ }
+
private static class XSDDouble extends AbstractXSD {
public static final XSDDouble INSTANCE = new XSDDouble();
private XSDDouble() { super(XSD.DOUBLE_URI, XSDAbbrev.DOUBLE_URI); }
@@ -254,6 +291,7 @@
return false;
}
}
+ public boolean ebv(Number data) { return data.doubleValue() != 0.0D; }
public Object toData(String r) throws QueryException {
try {
return Double.parseDouble(r);
@@ -279,6 +317,7 @@
return false;
}
}
+ public boolean ebv(Number data) { return data.floatValue() != 0.0; }
public Object toData(String r) throws QueryException {
try {
return Float.parseFloat(r);
@@ -302,6 +341,7 @@
return false;
}
}
+ public boolean ebv(Number data) { return data.longValue() != 0L; }
public Object toData(String r) throws QueryException {
try {
return Long.parseLong(r);
@@ -325,6 +365,7 @@
return false;
}
}
+ public boolean ebv(Number data) { return data.intValue() != 0; }
public Object toData(String r) throws QueryException {
try {
return Integer.parseInt(r);
@@ -348,6 +389,7 @@
return false;
}
}
+ public boolean ebv(Number data) { return data.shortValue() != 0; }
public Object toData(String r) throws QueryException {
try {
return Short.parseShort(r);
@@ -371,9 +413,10 @@
return false;
}
}
+ public boolean ebv(Number data) { return data.byteValue() != 0; }
public Object toData(String r) throws QueryException {
try {
- return Long.parseLong(r);
+ return Byte.parseByte(r);
} catch (NumberFormatException nfe) {
throw new QueryException("Type Error: Cannot convert to a Byte: " + r);
}
@@ -388,6 +431,7 @@
public static final XSDDate INSTANCE = new XSDDate();
private XSDDate() { super(XSD.DATE_TIME_URI, XSDAbbrev.DATE_TIME_URI); }
public boolean ebv(String data) throws QueryException { throw new QueryException("Unable to convert a date to a boolean"); }
+ public boolean ebv(Number data) throws QueryException { throw new QueryException("Unable to convert a date to a boolean"); }
public Object toData(String r) { return DateTime.parseDate(r); }
public ValueLiteral newLiteral(Object data) { return new DateTime((Date)data); }
}
Modified: branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/Var.java
===================================================================
--- branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/Var.java 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/Var.java 2009-03-12 22:52:17 UTC (rev 1607)
@@ -114,11 +114,6 @@
}
/** {@inheritDoc} */
- public boolean notEquals(RDFTerm v) throws QueryException {
- return resolve().notEquals(v);
- }
-
- /** {@inheritDoc} */
public boolean greaterThan(ComparableExpression v) throws QueryException {
return resolveComparable().greaterThan(v);
}
@@ -207,6 +202,7 @@
/** @see org.mulgara.query.filter.RDFTerm#setContextOwner(org.mulgara.query.filter.ContextOwner) */
public void setContextOwner(ContextOwner owner) {
this.contextOwner = owner;
+ owner.addContextListener(this);
}
/**
Modified: branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/VarUnitTest.java
===================================================================
--- branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/VarUnitTest.java 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/src/jar/query/java/org/mulgara/query/filter/value/VarUnitTest.java 2009-03-12 22:52:17 UTC (rev 1607)
@@ -12,6 +12,8 @@
package org.mulgara.query.filter.value;
import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
import org.jrdf.graph.BlankNode;
import org.jrdf.graph.Literal;
@@ -52,6 +54,9 @@
/** A blank node used in the context */
BlankNode bn = new BlankNodeImpl();
+ /** A list of context owners that we may want to update if the context changes */
+ List<ContextOwner> contextListeners = new ArrayList<ContextOwner>();
+
/**
* Build the unit test.
* @param name The name of the test
@@ -100,7 +105,6 @@
assertEquals(foo.getLexicalForm(), v.getLexical());
assertEquals(SimpleLiteral.STRING_TYPE, v.getType());
assertTrue(v.equals(new SimpleLiteral("foo")));
- assertFalse(v.notEquals(new SimpleLiteral("foo")));
assertTrue(v.greaterThan(new SimpleLiteral("eoo")));
assertTrue(v.greaterThanEqualTo(new SimpleLiteral("eoo")));
assertTrue(v.lessThan(new SimpleLiteral("goo")));
@@ -137,7 +141,6 @@
} catch (QueryException e) { }
IRI i = new IRI(foobar.getURI());
assertTrue(v.equals(i));
- assertFalse(v.notEquals(i));
SimpleLiteral s = new SimpleLiteral("foobar");
try {
@@ -196,7 +199,6 @@
} catch (QueryException e) { }
BlankNodeValue b = new BlankNodeValue(bn);
assertTrue(v.equals(b));
- assertFalse(v.notEquals(b));
SimpleLiteral s = new SimpleLiteral("foobar");
try {
@@ -262,10 +264,6 @@
v.equals(b);
assertTrue(false);
} catch (QueryException e) { }
- try {
- v.notEquals(b);
- assertTrue(false);
- } catch (QueryException e) { }
SimpleLiteral s = new SimpleLiteral("foobar");
try {
@@ -318,6 +316,29 @@
return context;
}
- public void setCurrentContext(Context context) { /* no op */ }
-
+ public void setCurrentContext(Context context) {
+ for (ContextOwner l: contextListeners) l.setCurrentContext(context);
+ }
+
+ /**
+ * This provides a context, and does not need to refer to a parent.
+ * @see org.mulgara.query.filter.ContextOwner#getContextOwner()
+ */
+ public ContextOwner getContextOwner() {
+ throw new IllegalStateException("Should never be asking for the context owner of a Tuples");
+ }
+
+ /**
+ * The owner of the context for a Tuples is never needed, since it is always provided by the Tuples.
+ * @see org.mulgara.query.filter.ContextOwner#setContextOwner(org.mulgara.query.filter.ContextOwner)
+ */
+ public void setContextOwner(ContextOwner owner) { }
+
+ /**
+ * This provides a context and cannot be a parent
+ * @see org.mulgara.query.filter.ContextOwner#addContextListener(org.mulgara.query.filter.ContextOwner)
+ */
+ public void addContextListener(ContextOwner l) {
+ contextListeners.add(l);
+ }
}
Modified: branches/consistency/src/jar/querylang/java/org/mulgara/itql/TqlSession.java
===================================================================
--- branches/consistency/src/jar/querylang/java/org/mulgara/itql/TqlSession.java 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/src/jar/querylang/java/org/mulgara/itql/TqlSession.java 2009-03-12 22:52:17 UTC (rev 1607)
@@ -81,7 +81,7 @@
/** The default path to the post-loading script */
private final static String POST_LOADING_SCRIPT_PATH = "default-post.tql";
-
+
/** The command prompt */
final static String PROMPT = "TQL> ";
@@ -113,13 +113,13 @@
/** A functor for splitting commands apart. */
private CommandSplitter commandSplitter = null;
-
+
/** A flag to indicate that an executed command was complete */
private boolean incomplete = false;
-
+
/** A flag to indicate whether to use the Swing shell or not */
private boolean useSwing = false;
-
+
/** What machine should we query for models */
private String host = "localhost";
@@ -172,7 +172,7 @@
}
}
-
+
/**
* Convenience method to log errors and terminate the program.
* @param session The current session to close.
@@ -225,7 +225,7 @@
boolean isCommandIncomplete() {
return incomplete;
}
-
+
/**
* Indicates if we should use the Swing shell or not
*/
@@ -239,7 +239,7 @@
String getModelHost() {
return host;
}
-
+
/**
* Executes a series of commands the given command. Accumulates all the
* results of these commands into the answers and messages lists.
@@ -272,7 +272,7 @@
close();
return;
}
-
+
String msg = autoTql.getLastMessage();
if (msg == null) {
if (log.isDebugEnabled()) log.debug("Need to follow on for an incomplete command.");
@@ -342,7 +342,7 @@
String lastMessage = autoTql.getLastMessage();
if ((lastMessage != null) && (lastMessage != "") && (gui != null)) System.out.println(lastMessage);
-
+
Exception e = autoTql.getLastException();
if (e != null) log.warn("Couldn't execute command", e);
}
@@ -359,7 +359,7 @@
private void runInterface(boolean useSwing) {
-
+
if(useSwing) {
// Create the UI.
JFrame mainWindow = new JFrame(SHELL_NAME);
@@ -377,7 +377,7 @@
mainWindow.setVisible(true);
} else {
try {
- ConsoleReader reader = new ConsoleReader();
+ ConsoleReader reader = new ConsoleReader();
File historyFile = getHistoryFile();
History history = reader.getHistory();
history.setHistoryFile(historyFile);
@@ -397,13 +397,13 @@
if (answers.isEmpty()) {
for (String message: messages) out.println(message);
- } else {
+ } else {
int answerIndex = 0;
while (answerIndex < answers.size()) {
@SuppressWarnings("unused")
String lastMessage = (String)messages.get(answerIndex);
-
+
try {
// Assume the same number of answers and messages
Answer answer = answers.get(answerIndex);
@@ -414,7 +414,7 @@
// If there's more than one answer add an extra line before the heading.
out.println("Executing Query " + (answerIndex+1));
}
-
+
// print the results
if (answer != null) {
boolean hasAnswers = true;
@@ -451,7 +451,7 @@
if (line.equalsIgnoreCase("quit") || line.equalsIgnoreCase("exit")) {
break;
}
- }
+ }
} catch(TuplesException te ) {
te.printStackTrace();
}
@@ -463,16 +463,16 @@
e.printStackTrace();
}
-
+
}
if (log.isInfoEnabled()) log.info("Stopping TQL interpreter");
if (log.isDebugEnabled()) log.debug("Executed post-loading script");
}
-
+
/*
- * Get the history file if it exists.
- *
+ * Get the history file if it exists.
+ *
*/
private File getHistoryFile() {
// TODO: Generalize this process
@@ -516,18 +516,18 @@
private URL getPostLoadingScriptURL() {
return postLoadingScriptUrl;
}
-
+
/**
* @return the list of existing model names for tab completion purposes
*/
-
+
private List<String> prefetchModels(String hostname) {
List<String> retValue = new ArrayList<String>();
StringBuffer sb = new StringBuffer();
sb.append("select $model from <rmi://");
sb.append(hostname);
sb.append("/server1#> where $model $p $o;");
-
+
try {
executeCommand(sb.toString());
List<Answer> models = getLastAnswers();
@@ -540,7 +540,7 @@
} catch(Throwable t) {
t.printStackTrace();
}
-
+
return retValue;
}
@@ -649,7 +649,7 @@
// dump the interpreter configuration
if (null != parser.getOptionValue(ItqlOptionParser.DUMP_CONFIG)) dumpConfig();
-
+
String modelHost = (String) parser.getOptionValue(ItqlOptionParser.REMOTE);
if(modelHost != null) {
host = modelHost;
@@ -673,7 +673,7 @@
// override the default post-loading script
String postScript = (String)parser.getOptionValue(ItqlOptionParser.POST_SCRIPT);
if (postScript != null) postLoadingScriptUrl = new URL(preScript);
-
+
// override the default UI environment script
useSwing = parser.getOptionValue(ItqlOptionParser.GUI) != null;
@@ -724,7 +724,7 @@
usage.append("scripts (useful with -s)").append(EOL);
usage.append("-l, --logconfig use an external logging configuration file").append(EOL);
-
+
usage.append("-o, --postload execute an TQL script after interpreter stops,").append(EOL);
usage.append(" overriding default post-loading script").append(EOL);
usage.append("-p, --preload execute an TQL script before interpreter starts,").append(EOL);
Modified: branches/consistency/src/jar/querylang/java/org/mulgara/sparql/FilterMapper.java
===================================================================
--- branches/consistency/src/jar/querylang/java/org/mulgara/sparql/FilterMapper.java 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/src/jar/querylang/java/org/mulgara/sparql/FilterMapper.java 2009-03-12 22:52:17 UTC (rev 1607)
@@ -78,6 +78,7 @@
import org.mulgara.query.filter.arithmetic.MinusOperation;
import org.mulgara.query.filter.arithmetic.MultiplyOperation;
import org.mulgara.query.filter.value.Bool;
+import org.mulgara.query.filter.value.ComparableExpression;
import org.mulgara.query.filter.value.DataTypeFn;
import org.mulgara.query.filter.value.ExternalFn;
import org.mulgara.query.filter.value.IRI;
@@ -180,6 +181,18 @@
}
/**
+ * Converts a CST ComparableExpression into an AST ComparableExpression.
+ * @param operand The CST comparable expression.
+ * @return An AST comparable expression.
+ * @throws MulgaraParserException If the value was not mapped to an AST numeric expression.
+ */
+ static private ComparableExpression mapComparable(Expression operand) throws MulgaraParserException {
+ RDFTerm op = mapExpression(operand);
+ if (!(op instanceof ComparableExpression)) throw new MulgaraParserException("Non-comparable value in comparison operation: " + op.getClass().getSimpleName());
+ return (ComparableExpression)op;
+ }
+
+ /**
* Converts a CST Expression into an AST value that resolves to a literal ({@link ValueLiteral}).
* @param operand The CST expression.
* @return An AST value expression.
@@ -295,7 +308,7 @@
private static class DecimalMap extends AbstractExprToFilter<DecimalLiteral> {
public Class<DecimalLiteral> getMapType() { return DecimalLiteral.class; }
public RDFTerm typedMap(DecimalLiteral expr) {
- return new NumericLiteral(expr.getFloat());
+ return new NumericLiteral(expr.getValue());
}
}
@@ -404,28 +417,28 @@
private static class GreaterThanMap extends AbstractExprToFilter<GreaterThan> {
public Class<GreaterThan> getMapType() { return GreaterThan.class; }
public RDFTerm typedMap(GreaterThan expr) throws MulgaraParserException {
- return new org.mulgara.query.filter.GreaterThan(mapNumber(expr.getLhs()), mapNumber(expr.getRhs()));
+ return new org.mulgara.query.filter.GreaterThan(mapComparable(expr.getLhs()), mapComparable(expr.getRhs()));
}
}
private static class GreaterThanEqualMap extends AbstractExprToFilter<GreaterThanEqual> {
public Class<GreaterThanEqual> getMapType() { return GreaterThanEqual.class; }
public RDFTerm typedMap(GreaterThanEqual expr) throws MulgaraParserException {
- return new GreaterThanEqualTo(mapNumber(expr.getLhs()), mapNumber(expr.getRhs()));
+ return new GreaterThanEqualTo(mapComparable(expr.getLhs()), mapComparable(expr.getRhs()));
}
}
private static class LessThanMap extends AbstractExprToFilter<LessThan> {
public Class<LessThan> getMapType() { return LessThan.class; }
public RDFTerm typedMap(LessThan expr) throws MulgaraParserException {
- return new org.mulgara.query.filter.LessThan(mapNumber(expr.getLhs()), mapNumber(expr.getRhs()));
+ return new org.mulgara.query.filter.LessThan(mapComparable(expr.getLhs()), mapComparable(expr.getRhs()));
}
}
private static class LessThanEqualMap extends AbstractExprToFilter<LessThanEqual> {
public Class<LessThanEqual> getMapType() { return LessThanEqual.class; }
public RDFTerm typedMap(LessThanEqual expr) throws MulgaraParserException {
- return new LessThanEqualTo(mapNumber(expr.getLhs()), mapNumber(expr.getRhs()));
+ return new LessThanEqualTo(mapComparable(expr.getLhs()), mapComparable(expr.getRhs()));
}
}
Modified: branches/consistency/src/jar/querylang/java/org/mulgara/sparql/parser/cst/DecimalLiteral.java
===================================================================
--- branches/consistency/src/jar/querylang/java/org/mulgara/sparql/parser/cst/DecimalLiteral.java 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/src/jar/querylang/java/org/mulgara/sparql/parser/cst/DecimalLiteral.java 2009-03-12 22:52:17 UTC (rev 1607)
@@ -14,7 +14,9 @@
*/
package org.mulgara.sparql.parser.cst;
+import java.math.BigDecimal;
+
/**
* Represents a Decimal literal number.
*
@@ -26,45 +28,56 @@
public class DecimalLiteral implements NumericLiteral {
/** The value of this literal. */
- private float value;
+ private BigDecimal value;
/**
* Constructs the literal from a string image.
* @param value The string image of the value for this literal
*/
public DecimalLiteral(String s) {
- this.value = Float.parseFloat(s);
+ this.value = new BigDecimal(s);
}
/**
* Constructs the literal.
- * @param value The floating point value for this literal
+ * @param value The double precision floating point value for this literal
*/
- public DecimalLiteral(float value) {
- this.value = value;
+ public DecimalLiteral(double value) {
+ this.value = BigDecimal.valueOf(value);
}
/**
+ * Constructs the literal.
+ * @param value The long integral value for this literal
+ */
+ public DecimalLiteral(long value) {
+ this.value = BigDecimal.valueOf(value);
+ }
+
+ /**
* Retrieve the value as a generic Number.
+ * We deem the loss of precision to double to be acceptable
* @return A Number object containing the value.
*/
public Number getValue() {
- return new Float(value);
+ Number result = value.doubleValue();
+ if (result.equals(Double.NEGATIVE_INFINITY) || result.equals(Double.POSITIVE_INFINITY)) result = value;
+ return result;
}
/**
* Retrieve the value as a raw type.
* @return The internal value.
*/
- public float getFloat() {
- return value;
+ public double getDouble() {
+ return value.doubleValue();
}
/**
* @see org.mulgara.sparql.parser.cst.Node#getImage()
*/
public String getImage() {
- return Float.toString(value);
+ return value.toPlainString();
}
}
Modified: branches/consistency/src/jar/resolver-lucene/build.xml
===================================================================
--- branches/consistency/src/jar/resolver-lucene/build.xml 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/src/jar/resolver-lucene/build.xml 2009-03-12 22:52:17 UTC (rev 1607)
@@ -44,6 +44,7 @@
<fileset file="${tuples-hybrid.dist.dir}/${tuples-hybrid.jar}"/>
<fileset file="${resolver-memory.dist.dir}/${resolver-memory.jar}"/>
<fileset file="${content-n3.dist.dir}/${content-n3.jar}"/>
+ <fileset file="${content-rdfxml.dist.dir}/${content-rdfxml.jar}"/>
<fileset file="${resolver-file.dist.dir}/${resolver-file.jar}"/>
<fileset file="${lib.dir}/${antlr.jar}"/>
</path>
Modified: branches/consistency/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/FullTextStringIndexTuples.java
===================================================================
--- branches/consistency/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/FullTextStringIndexTuples.java 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/FullTextStringIndexTuples.java 2009-03-12 22:52:17 UTC (rev 1607)
@@ -182,8 +182,12 @@
String object = getString(objectElement);
results = new SearchHitsTuples(subject, predicate, object);
- if (subject != null || predicate != null || object != null) {
+ if (subject != null && predicate != null && object != null) {
Tuples old = results;
+ results = old.next() ? TuplesOperations.unconstrained() : TuplesOperations.empty();
+ old.close();
+ } else if (subject != null || predicate != null || object != null) {
+ Tuples old = results;
long t0 = System.currentTimeMillis();
results = TuplesOperations.materialize(results);
logger.debug("materialized " + results.getRowCount() + " lucene results() in " + (System.currentTimeMillis() - t0));
Modified: branches/consistency/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneResolverUnitTest.java
===================================================================
--- branches/consistency/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneResolverUnitTest.java 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneResolverUnitTest.java 2009-03-12 22:52:17 UTC (rev 1607)
@@ -82,6 +82,8 @@
public static Test suite() {
TestSuite suite = new TestSuite();
suite.addTest(new LuceneResolverUnitTest("testBasicQueries"));
+ suite.addTest(new LuceneResolverUnitTest("testSubqueries"));
+ suite.addTest(new LuceneResolverUnitTest("testSubqueries2"));
suite.addTest(new LuceneResolverUnitTest("testConcurrentQueries"));
suite.addTest(new LuceneResolverUnitTest("testConcurrentReadTransaction"));
suite.addTest(new LuceneResolverUnitTest("testTransactionIsolation"));
@@ -144,11 +146,26 @@
tempResolverFactoryClassName, // temporary models
null, // no dir for temp models
"", // no rule loader
- "org.mulgara.content.n3.N3ContentHandler");
+ "org.mulgara.content.rdfxml.RDFXMLContentHandler");
+ database.addContentHandler("org.mulgara.content.n3.N3ContentHandler");
database.addResolverFactory("org.mulgara.resolver.lucene.LuceneResolverFactory", persistenceDirectory);
ti = new TqlInterpreter();
+
+ // Load some test data
+ Session session = database.newSession();
+ try {
+ URI fileURI = new File(textDirectory + File.separator + "data.n3").toURI();
+
+ if (session.modelExists(modelURI)) {
+ session.removeModel(modelURI);
+ }
+ session.createModel(modelURI, luceneModelType);
+ session.setModel(modelURI, new GraphResource(fileURI));
+ } finally {
+ session.close();
+ }
}
}
@@ -172,15 +189,6 @@
Session session = database.newSession();
try {
- // Load some test data
- URI fileURI = new File(textDirectory + File.separator + "data.n3").toURI();
-
- if (session.modelExists(modelURI)) {
- session.removeModel(modelURI);
- }
- session.createModel(modelURI, luceneModelType);
- session.setModel(modelURI, new GraphResource(fileURI));
-
// Run simple query with variable subject and fixed predicate
String q = "select $s from <foo:bar> where $s <foo:hasText> 'American' in <" + modelURI + ">;";
Answer answer = session.query(parseQuery(q));
@@ -262,22 +270,128 @@
}
/**
+ * Subqueries.
+ */
+ public void testSubqueries() throws Exception {
+ logger.info("Testing subqueries");
+
+ try {
+ Session session = database.newSession();
+
+ try {
+ // Lucene query in outer query
+ String q = "select $s subquery(select $y $z from <" + modelURI + "> where $s $y $z)" +
+ " from <foo:bar> where $s $p 'b*' in <" + modelURI + "> order by $s;";
+
+ Answer answer = session.query(parseQuery(q));
+ compareResults(new Object[][] {
+ { "foo:node13", new Object[][] { { "foo:hasText", "Benefit Evaluation of Direct Coronary Stenting Study Group" } } },
+ { "foo:node14", new Object[][] { { "foo:hasText", "Biomarkers Definitions Working Group." } } },
+ }, answer, true);
+ answer.close();
+
+ // Lucene query in both
+ q = "select $x subquery(select $y from <foo:bar> where $x $y 'a*' in <" + modelURI + ">) " +
+ " from <foo:bar> where $x <foo:hasText> 'Group' in <" + modelURI + "> order by $x;";
+
+ answer = session.query(parseQuery(q));
+ compareResults(new Object[][] {
+ { "foo:node1", new Object[][] { { "foo:hasText" } } },
+ { "foo:node11", new Object[][] { { "foo:hasText" } } },
+ { "foo:node12", new Object[][] { { "foo:hasText" } } },
+ { "foo:node13", new Object[][] { } },
+ { "foo:node14", new Object[][] { } },
+ { "foo:node18", new Object[][] { } },
+ { "foo:node2", new Object[][] { { "foo:hasText" } } },
+ { "foo:node4", new Object[][] { { "foo:hasText" } } },
+ { "foo:node9", new Object[][] { { "foo:hasText" } } },
+ }, answer);
+ answer.close();
+
+ } finally {
+ session.close();
+ }
+ } catch (Exception e) {
+ fail(e);
+ }
+ }
+
+ /**
+ * Subqueries.
+ */
+ public void testSubqueries2() throws Exception {
+ logger.info("Testing subqueries2");
+
+ try {
+ Session session = database.newSession();
+
+ try {
+ // create models
+ URI dataModel = new URI("local:sampledata");
+ URI textModel = new URI("local:sampletext");
+
+ if (session.modelExists(dataModel)) session.removeModel(dataModel);
+ if (session.modelExists(textModel)) session.removeModel(textModel);
+ session.createModel(dataModel, null);
+ session.createModel(textModel, luceneModelType);
+
+ // load models
+ URI fileURI = new File(new File(System.getProperty("cvs.root"), "data"), "w3c-news.rss").toURI();
+ session.setModel(dataModel, new GraphResource(fileURI));
+
+ String q = "select $s $p $o from <local:sampledata> where $s $p $o and (" +
+ " $p <mulgara:is> <http://purl.org/rss/1.0/description> or " +
+ " $p <mulgara:is> <http://purl.org/rss/1.0/title>);";
+ session.insert(textModel, parseQuery(q));
+
+ // run queries
+ q = "select $s subquery(select $z from <local:sampledata> where $s <http://purl.org/rss/1.0/title> $z) " +
+ " from <local:sampledata> where $s $p $o and $s $p 'W*' in <local:sampletext> order by $s;";
+ Answer answer = session.query(parseQuery(q));
+ compareResults(new Object[][] {
+ { "http://www.w3.org/2000/08/w3c-synd/home.rss", new Object[][] { { "The World Wide Web Consortium" } } },
+ { "http://www.w3.org/News/2002#item12", new Object[][] { { "W3C Launches Web Services Activity" } } },
+ { "http://www.w3.org/News/2002#item13", new Object[][] { { "Platform for Privacy Preferences (P3P) Becomes a W3C Proposed Recommendation" } } },
+ { "http://www.w3.org/News/2002#item14", new Object[][] { { "XHTML+SMIL Profile Published" } } },
+ { "http://www.w3.org/News/2002#item15", new Object[][] { { "W3C Team Presentations in February" } } },
+ { "http://www.w3.org/News/2002#item16", new Object[][] { { "QA Framework First Public Working Drafts Published" } } },
+ { "http://www.w3.org/News/2002#item17", new Object[][] { { "DOM Level 3 Working Drafts Published" } } },
+ { "http://www.w3.org/News/2002#item18", new Object[][] { { "P3P Deployment Guide Updated" } } },
+ }, answer, true);
+ answer.close();
+
+ q = "select $s subquery(select $z from <local:sampledata> where $s <http://purl.org/rss/1.0/title> $z and $s <http://purl.org/rss/1.0/title> 'W*' in <local:sampletext>) " +
+ " from <local:sampledata> where $s <http://purl.org/rss/1.0/title> $o order by $s;";
+ answer = session.query(parseQuery(q));
+ compareResults(new Object[][] {
+ { "http://www.w3.org/2000/08/w3c-synd/home.rss", new Object[][] { { "The World Wide Web Consortium" } } },
+ { "http://www.w3.org/News/2002#item12", new Object[][] { { "W3C Launches Web Services Activity" } } },
+ { "http://www.w3.org/News/2002#item13", new Object[][] { { "Platform for Privacy Preferences (P3P) Becomes a W3C Proposed Recommendation" } } },
+ { "http://www.w3.org/News/2002#item14", new Object[][] { } },
+ { "http://www.w3.org/News/2002#item15", new Object[][] { { "W3C Team Presentations in February" } } },
+ { "http://www.w3.org/News/2002#item16", new Object[][] { { "QA Framework First Public Working Drafts Published" } } },
+ { "http://www.w3.org/News/2002#item17", new Object[][] { { "DOM Level 3 Working Drafts Published" } } },
+ { "http://www.w3.org/News/2002#item18", new Object[][] { } },
+ }, answer, true);
+ answer.close();
+
+ } finally {
+ session.close();
+ }
+ } catch (Exception e) {
+ fail(e);
+ }
+ }
+
+ /**
* Two queries, in parallel.
*/
public void testConcurrentQueries() throws Exception {
logger.info("Testing concurrentQueries");
try {
- // Load some test data
Session session = database.newSession();
- URI fileURI = new File(textDirectory + File.separator + "data.n3").toURI();
- if (session.modelExists(modelURI)) {
- session.removeModel(modelURI);
- }
- session.createModel(modelURI, luceneModelType);
- session.setModel(modelURI, new GraphResource(fileURI));
-
// Run the queries
try {
String q = "select $x from <foo:bar> where $x <foo:hasText> 'American' in <" + modelURI + ">;";
@@ -870,27 +984,43 @@
return res;
}
- private void compareResults(String[][] expected, Answer answer) throws Exception {
+ private void compareResults(Object[][] expected, Answer answer) throws Exception {
compareResults(expected, answer, false);
}
- private void compareResults(String[][] expected, Answer answer, boolean lastIsLiteral)
+ private void compareResults(Object[][] expected, Answer answer, boolean lastIsLiteral)
throws Exception {
try {
answer.beforeFirst();
+
for (int i = 0; i < expected.length; i++) {
assertTrue("Answer short at row " + i, answer.next());
assertEquals(expected[i].length, answer.getNumberOfVariables());
for (int j = 0; j < expected[i].length; j++) {
- Object exp = (lastIsLiteral && j == expected[i].length - 1) ?
- new LiteralImpl(expected[i][j]) :
- new URIReferenceImpl(new URI(expected[i][j]));
- assertEquals(exp, answer.getObject(j));
+ if (expected[i][j] == null) {
+ assertNull(answer.getObject(j));
+ } else if (expected[i][j] instanceof String) {
+ Object exp = (lastIsLiteral && j == expected[i].length - 1) ?
+ new LiteralImpl((String) expected[i][j]) :
+ new URIReferenceImpl(new URI((String) expected[i][j]));
+ assertEquals(exp, answer.getObject(j));
+ } else if (expected[i][j] instanceof Object[][]) {
+ compareResults((Object[][]) expected[i][j], (Answer) answer.getObject(j), lastIsLiteral);
+ } else {
+ throw new IllegalArgumentException("Don't know how to handle expected value '" +
+ expected[i][j] + "' of type " +
+ expected[i][j].getClass() + "' at index " + i +
+ "," + j);
+ }
}
}
- assertFalse(answer.next());
+
+ assertFalse("Answer too long", answer.next());
} catch (Exception e) {
- logger.error("Failed test - " + answer);
+ logger.error("Failed test - \n" + answer);
+ throw e;
+ } catch (Error e) {
+ logger.error("Failed test - \n" + dumpAnswer(answer, " "));
answer.close();
throw e;
}
@@ -909,6 +1039,25 @@
assertFalse(answer2.next());
}
+ private static String dumpAnswer(Answer answer, String indent) throws Exception {
+ StringBuilder sb = new StringBuilder(500);
+
+ answer.beforeFirst();
+ while (answer.next()) {
+ sb.append(indent).append("next-row\n");
+ for (int j = 0; j < answer.getNumberOfVariables(); j++) {
+ sb.append(indent).append(" column: " + answer.getObject(j) + "\n");
+ if (answer.getObject(j) instanceof Answer) {
+ sb.append(dumpAnswer((Answer) answer.getObject(j), indent + " "));
+ }
+ }
+ }
+
+ sb.append(indent).append("end\n");
+ return sb.toString();
+ }
+
+
private void fail(Throwable throwable) {
StringWriter stringWriter = new StringWriter();
throwable.printStackTrace(new PrintWriter(stringWriter));
Modified: branches/consistency/src/jar/tuples/java/org/mulgara/store/tuples/FilteredTuples.java
===================================================================
--- branches/consistency/src/jar/tuples/java/org/mulgara/store/tuples/FilteredTuples.java 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/src/jar/tuples/java/org/mulgara/store/tuples/FilteredTuples.java 2009-03-12 22:52:17 UTC (rev 1607)
@@ -63,6 +63,9 @@
/** The tuples context */
protected TuplesContext context;
+ /** A list of context owners that this owner provides the context for. */
+ private List<ContextOwner> contextListeners = new ArrayList<ContextOwner>();
+
/**
* Configure a tuples for filtering.
*
@@ -209,6 +212,7 @@
public void setCurrentContext(Context context) {
if (!(context instanceof TuplesContext)) throw new IllegalArgumentException("FilteredTuples can only accept a TuplesContext.");
this.context = (TuplesContext)context;
+ for (ContextOwner l: contextListeners) l.setCurrentContext(context);
}
/**
@@ -225,4 +229,32 @@
return false;
}
}
+
+
+ /**
+ * This provides a context, and does not need to refer to a parent.
+ * @see org.mulgara.query.filter.ContextOwner#getContextOwner()
+ */
+ public ContextOwner getContextOwner() {
+ throw new IllegalStateException("Should never be asking for the context owner of a Tuples");
+ }
+
+
+ /**
+ * The owner of the context for a Tuples is never needed, since it is always provided by the Tuples.
+ * @see org.mulgara.query.filter.ContextOwner#setContextOwner(org.mulgara.query.filter.ContextOwner)
+ */
+ public void setContextOwner(ContextOwner owner) {
+ }
+
+
+ /**
+ * Adds a context owner as a listener so that it will be updated with its context
+ * when this owner gets updated.
+ * @param l The context owner to register.
+ */
+ public void addContextListener(ContextOwner l) {
+ contextListeners.add(l);
+ }
+
}
Modified: branches/consistency/src/jar/tuples/java/org/mulgara/store/tuples/LeftJoin.java
===================================================================
--- branches/consistency/src/jar/tuples/java/org/mulgara/store/tuples/LeftJoin.java 2009-03-12 20:58:55 UTC (rev 1606)
+++ branches/consistency/src/jar/tuples/java/org/mulgara/store/tuples/LeftJoin.java 2009-03-12 22:52:17 UTC (rev 1607)
@@ -65,6 +65,9 @@
/** The tuples context */
protected TuplesContext context = null;
+ /** A list of context owners that this owner provides the context for. */
+ private List<ContextOwner> contextListeners = new ArrayList<ContextOwner>();
+
/** The set of variables common to both the lhs and the rhs. */
protected Set<Variable> commonVars;
@@ -399,9 +402,35 @@
public void setCurrentContext(Context context) {
if (!(context instanceof TuplesContext)) throw new IllegalArgumentException("LeftJoin can only accept a TuplesContext.");
this.context = (TuplesContext)context;
+ for (ContextOwner l: contextListeners) l.setCurrentContext(context);
}
+ /**
+ * This provides a context, and does not need to refer to a parent.
+ * @see org.mulgara.query.filter.ContextOwner#getContextOwner()
+ */
+ public ContextOwner getContextOwner() {
+ throw new IllegalStateException("Should never be asking for the context owner of a Tuples");
+ }
+
+
+ /**
+ * The owner of the context for a Tuples is never needed, since it is always provided by the Tuples.
+ * @see org.mulgara.query.filter.ContextOwner#setContextOwner(org.mulgara.query.filter.ContextOwner)
+ */
+ public void setContextOwner(ContextOwner owner) {
+ }
+
+ /**
+ * Adds a context owner as a listener so that it will be updated with its context
+ * when this owner gets updated.
+ * @param l The context owner to register.
+ */
+ public void addContextListener(ContextOwner l) {
+ contextListeners.add(l);
+ }
+
//
// Internal methods and classes
//
More information about the Mulgara-svn
mailing list