[Mulgara-svn] r933 - in trunk: jxdata/iTQL/node_types jxdata/iTQL/prefix jxdata/iTQL/rdfs/rdfs-container-membership-superProperty jxdata/iTQL/rdfs/rdfs-domain-and-range jxdata/iTQL/rdfs/rdfs-no-cycles-in-subClassOf jxdata/iTQL/rdfs/rdfs-no-cycles-in-subPropertyOf jxdata/iTQL/rdfs/rdfs-subPropertyOf-semantics jxdata/iTQL/rdfs/statement-entailment rules
pag at mulgara.org
pag at mulgara.org
Wed May 14 04:05:25 UTC 2008
Author: pag
Date: 2008-05-13 21:05:24 -0700 (Tue, 13 May 2008)
New Revision: 933
Removed:
trunk/jxdata/iTQL/rdfs/rdfs-container-membership-superProperty/configResult.txt
trunk/jxdata/iTQL/rdfs/rdfs-domain-and-range/configResult.txt
trunk/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subClassOf/configResult.txt
trunk/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subPropertyOf/configResult.txt
trunk/jxdata/iTQL/rdfs/rdfs-subPropertyOf-semantics/configResult.txt
trunk/jxdata/iTQL/rdfs/statement-entailment/configResult.txt
Modified:
trunk/jxdata/iTQL/node_types/test.jxu
trunk/jxdata/iTQL/prefix/test.jxu
trunk/jxdata/iTQL/rdfs/rdfs-container-membership-superProperty/test.jxu
trunk/jxdata/iTQL/rdfs/rdfs-domain-and-range/test.jxu
trunk/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subClassOf/test.jxu
trunk/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subPropertyOf/test.jxu
trunk/jxdata/iTQL/rdfs/rdfs-subPropertyOf-semantics/test.jxu
trunk/jxdata/iTQL/rdfs/statement-entailment/test.jxu
trunk/rules/rdfs-krule.rdf
Log:
Updated rules to no longer require hard-coded system graphs
Modified: trunk/jxdata/iTQL/node_types/test.jxu
===================================================================
--- trunk/jxdata/iTQL/node_types/test.jxu 2008-05-14 04:03:40 UTC (rev 932)
+++ trunk/jxdata/iTQL/node_types/test.jxu 2008-05-14 04:05:24 UTC (rev 933)
@@ -3,9 +3,9 @@
<!-- Configure the data type model -->
<set name="query" value="
- create <@server@#type> <http://mulgara.org/mulgara#TypeModel> ;
+ create <@server@#type> <http://mulgara.org/mulgara#TypeGraph> ;
drop <@server@#type> ;
- create <@server@#type> <http://mulgara.org/mulgara#TypeModel> ;
+ create <@server@#type> <http://mulgara.org/mulgara#TypeGraph> ;
"/>
<eval stepClass="org.mulgara.store.jxunit.QueryJX" />
Modified: trunk/jxdata/iTQL/prefix/test.jxu
===================================================================
--- trunk/jxdata/iTQL/prefix/test.jxu 2008-05-14 04:03:40 UTC (rev 932)
+++ trunk/jxdata/iTQL/prefix/test.jxu 2008-05-14 04:05:24 UTC (rev 933)
@@ -3,9 +3,9 @@
<!-- Configure the prefix model -->
<set name="query" value="
- create <@server@#prefix> <http://mulgara.org/mulgara#PrefixModel> ;
+ create <@server@#prefix> <http://mulgara.org/mulgara#PrefixGraph> ;
drop <@server@#prefix> ;
- create <@server@#prefix> <http://mulgara.org/mulgara#PrefixModel> ;
+ create <@server@#prefix> <http://mulgara.org/mulgara#PrefixGraph> ;
"/>
<eval stepClass="org.mulgara.store.jxunit.QueryJX" />
Deleted: trunk/jxdata/iTQL/rdfs/rdfs-container-membership-superProperty/configResult.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs/rdfs-container-membership-superProperty/configResult.txt 2008-05-14 04:03:40 UTC (rev 932)
+++ trunk/jxdata/iTQL/rdfs/rdfs-container-membership-superProperty/configResult.txt 2008-05-14 04:05:24 UTC (rev 933)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created graph @server@#type</message></query><query><message>Successfully created graph @server@#prefix</message></query></answer>
Modified: trunk/jxdata/iTQL/rdfs/rdfs-container-membership-superProperty/test.jxu
===================================================================
--- trunk/jxdata/iTQL/rdfs/rdfs-container-membership-superProperty/test.jxu 2008-05-14 04:03:40 UTC (rev 932)
+++ trunk/jxdata/iTQL/rdfs/rdfs-container-membership-superProperty/test.jxu 2008-05-14 04:05:24 UTC (rev 933)
@@ -1,26 +1,7 @@
<jxu>
<set name="debug" value="false" />
- <!-- Drop the node type and prefix models -->
- <set name="query" value="
- drop <@server@#type> ;
- drop <@server@#prefix> ;
- "/>
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <!-- Do not care about results -->
-
- <set name="query" value="
- create <@server@#type> <http://mulgara.org/mulgara#TypeModel> ;
- create <@server@#prefix> <http://mulgara.org/mulgara#PrefixModel> ;
- "/>
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
-
- <ifEqual converse="true" file="configResult.txt" name="queryResult">
- <save name="queryResult" file="badConfigResult1.xml"/>
- <fail>Output failed setting up resolver models. Check badConfigResult1.xml for output.</fail>
- </ifEqual>
-
-
+ <!-- Load the RDFS rules -->
<set name="modelName" value="@server@#krule" />
<set name="loadCommand" value="load <@baseuri@/rules/rdfs-krule.rdf> into <@server@#krule> ;" />
<eval stepClass="org.mulgara.store.jxunit.LoadDataJX" />
Deleted: trunk/jxdata/iTQL/rdfs/rdfs-domain-and-range/configResult.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs/rdfs-domain-and-range/configResult.txt 2008-05-14 04:03:40 UTC (rev 932)
+++ trunk/jxdata/iTQL/rdfs/rdfs-domain-and-range/configResult.txt 2008-05-14 04:05:24 UTC (rev 933)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created graph @server@#type</message></query><query><message>Successfully created graph @server@#prefix</message></query></answer>
Modified: trunk/jxdata/iTQL/rdfs/rdfs-domain-and-range/test.jxu
===================================================================
--- trunk/jxdata/iTQL/rdfs/rdfs-domain-and-range/test.jxu 2008-05-14 04:03:40 UTC (rev 932)
+++ trunk/jxdata/iTQL/rdfs/rdfs-domain-and-range/test.jxu 2008-05-14 04:05:24 UTC (rev 933)
@@ -1,27 +1,6 @@
<jxu>
<set name="debug" value="false" />
- <!-- Drop the node type and prefix models -->
- <set name="query" value="
- drop <@server@#type> ;
- drop <@server@#prefix> ;
- "/>
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <!-- Do not care about results -->
-
- <!-- Create the node type and prefix models -->
- <set name="query" value="
- create <@server@#type> <http://mulgara.org/mulgara#TypeModel> ;
- create <@server@#prefix> <http://mulgara.org/mulgara#PrefixModel> ;
- "/>
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
-
- <ifEqual converse="true" file="configResult.txt" name="queryResult">
- <save name="queryResult" file="badConfigResult1.xml"/>
- <fail>Output failed setting up resolver models. Check badConfigResult1.xml for output.</fail>
- </ifEqual>
-
-
<!-- Load the RDFS rules -->
<set name="modelName" value="@server@#krule" />
<set name="loadCommand" value="load <@baseuri@/rules/rdfs-krule.rdf> into <@server@#krule> ;" />
Deleted: trunk/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subClassOf/configResult.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subClassOf/configResult.txt 2008-05-14 04:03:40 UTC (rev 932)
+++ trunk/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subClassOf/configResult.txt 2008-05-14 04:05:24 UTC (rev 933)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created graph @server@#type</message></query><query><message>Successfully created graph @server@#prefix</message></query></answer>
Modified: trunk/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subClassOf/test.jxu
===================================================================
--- trunk/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subClassOf/test.jxu 2008-05-14 04:03:40 UTC (rev 932)
+++ trunk/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subClassOf/test.jxu 2008-05-14 04:05:24 UTC (rev 933)
@@ -1,27 +1,6 @@
<jxu>
<set name="debug" value="false" />
- <!-- Drop the node type and prefix models -->
- <set name="query" value="
- drop <@server@#type> ;
- drop <@server@#prefix> ;
- "/>
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <!-- Do not care about results -->
-
- <!-- Create the prefix and type models -->
- <set name="query" value="
- create <@server@#type> <http://mulgara.org/mulgara#TypeModel> ;
- create <@server@#prefix> <http://mulgara.org/mulgara#PrefixModel> ;
- "/>
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
-
- <ifEqual converse="true" file="configResult.txt" name="queryResult">
- <save name="queryResult" file="badConfigResult1.xml"/>
- <fail>Output failed setting up resolver models. Check badConfigResult1.xml for output.</fail>
- </ifEqual>
-
-
<!-- Load the RDFS rules -->
<set name="modelName" value="@server@#krule" />
<set name="loadCommand" value="load <@baseuri@/rules/rdfs-krule.rdf> into <@server@#krule> ;" />
Deleted: trunk/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subPropertyOf/configResult.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subPropertyOf/configResult.txt 2008-05-14 04:03:40 UTC (rev 932)
+++ trunk/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subPropertyOf/configResult.txt 2008-05-14 04:05:24 UTC (rev 933)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created graph @server@#type</message></query><query><message>Successfully created graph @server@#prefix</message></query></answer>
Modified: trunk/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subPropertyOf/test.jxu
===================================================================
--- trunk/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subPropertyOf/test.jxu 2008-05-14 04:03:40 UTC (rev 932)
+++ trunk/jxdata/iTQL/rdfs/rdfs-no-cycles-in-subPropertyOf/test.jxu 2008-05-14 04:05:24 UTC (rev 933)
@@ -1,27 +1,6 @@
<jxu>
<set name="debug" value="false" />
- <!-- Drop the node type and prefix models -->
- <set name="query" value="
- drop <@server@#type> ;
- drop <@server@#prefix> ;
- "/>
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <!-- Do not care about results -->
-
- <!-- Create the prefix and type models -->
- <set name="query" value="
- create <@server@#type> <http://mulgara.org/mulgara#TypeModel> ;
- create <@server@#prefix> <http://mulgara.org/mulgara#PrefixModel> ;
- "/>
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
-
- <ifEqual converse="true" file="configResult.txt" name="queryResult">
- <save name="queryResult" file="badConfigResult1.xml"/>
- <fail>Output failed setting up resolver models. Check badConfigResult1.xml for output.</fail>
- </ifEqual>
-
-
<!-- Load the RDFS rules -->
<set name="modelName" value="@server@#krule" />
<set name="loadCommand" value="load <@baseuri@/rules/rdfs-krule.rdf> into <@server@#krule> ;" />
Deleted: trunk/jxdata/iTQL/rdfs/rdfs-subPropertyOf-semantics/configResult.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs/rdfs-subPropertyOf-semantics/configResult.txt 2008-05-14 04:03:40 UTC (rev 932)
+++ trunk/jxdata/iTQL/rdfs/rdfs-subPropertyOf-semantics/configResult.txt 2008-05-14 04:05:24 UTC (rev 933)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created graph @server@#type</message></query><query><message>Successfully created graph @server@#prefix</message></query></answer>
Modified: trunk/jxdata/iTQL/rdfs/rdfs-subPropertyOf-semantics/test.jxu
===================================================================
--- trunk/jxdata/iTQL/rdfs/rdfs-subPropertyOf-semantics/test.jxu 2008-05-14 04:03:40 UTC (rev 932)
+++ trunk/jxdata/iTQL/rdfs/rdfs-subPropertyOf-semantics/test.jxu 2008-05-14 04:05:24 UTC (rev 933)
@@ -1,27 +1,6 @@
<jxu>
<set name="debug" value="false" />
- <!-- Drop the node type and prefix models -->
- <set name="query" value="
- drop <@server@#type> ;
- drop <@server@#prefix> ;
- "/>
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <!-- Do not care about results -->
-
- <!-- Create the node type and prefix models -->
- <set name="query" value="
- create <@server@#type> <http://mulgara.org/mulgara#TypeModel> ;
- create <@server@#prefix> <http://mulgara.org/mulgara#PrefixModel> ;
- "/>
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
-
- <ifEqual converse="true" file="configResult.txt" name="queryResult">
- <save name="queryResult" file="badConfigResult1.xml"/>
- <fail>Output failed setting up resolver models. Check badConfigResult1.xml for output.</fail>
- </ifEqual>
-
-
<!-- Load the RDFS rules -->
<set name="modelName" value="@server@#krule" />
<set name="loadCommand" value="load <@baseuri@/rules/rdfs-krule.rdf> into <@server@#krule> ;" />
Deleted: trunk/jxdata/iTQL/rdfs/statement-entailment/configResult.txt
===================================================================
--- trunk/jxdata/iTQL/rdfs/statement-entailment/configResult.txt 2008-05-14 04:03:40 UTC (rev 932)
+++ trunk/jxdata/iTQL/rdfs/statement-entailment/configResult.txt 2008-05-14 04:05:24 UTC (rev 933)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully created graph @server@#type</message></query><query><message>Successfully created graph @server@#prefix</message></query></answer>
Modified: trunk/jxdata/iTQL/rdfs/statement-entailment/test.jxu
===================================================================
--- trunk/jxdata/iTQL/rdfs/statement-entailment/test.jxu 2008-05-14 04:03:40 UTC (rev 932)
+++ trunk/jxdata/iTQL/rdfs/statement-entailment/test.jxu 2008-05-14 04:05:24 UTC (rev 933)
@@ -1,26 +1,7 @@
<jxu>
<set name="debug" value="false" />
- <!-- Drop the node type and prefix models -->
- <set name="query" value="
- drop <@server@#type> ;
- drop <@server@#prefix> ;
- "/>
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
- <!-- Do not care about results -->
-
- <set name="query" value="
- create <@server@#type> <http://mulgara.org/mulgara#TypeModel> ;
- create <@server@#prefix> <http://mulgara.org/mulgara#PrefixModel> ;
- "/>
- <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
-
- <ifEqual converse="true" file="configResult.txt" name="queryResult">
- <save name="queryResult" file="badConfigResult1.xml"/>
- <fail>Output failed setting up resolver models. Check badConfigResult1.xml for output.</fail>
- </ifEqual>
-
-
+ <!-- Load the RDFS rules -->
<set name="modelName" value="@server@#krule" />
<set name="loadCommand" value="load <@baseuri@/rules/rdfs-krule.rdf> into <@server@#krule> ;" />
<eval stepClass="org.mulgara.store.jxunit.LoadDataJX" />
Modified: trunk/rules/rdfs-krule.rdf
===================================================================
--- trunk/rules/rdfs-krule.rdf 2008-05-14 04:03:40 UTC (rev 932)
+++ trunk/rules/rdfs-krule.rdf 2008-05-14 04:05:24 UTC (rev 933)
@@ -136,16 +136,16 @@
<rdf:value rdf:resource="&mulgara;uriReference"/>
</krule:URIReference>
- <krule:URIReference rdf:about="#ref_rdftypeModel">
- <rdf:value rdf:resource="rmi://localhost/server1#type"/>
+ <krule:URIReference rdf:about="#ref_rdftypeGraph">
+ <rdf:value rdf:resource="sys:type"/>
</krule:URIReference>
<krule:URIReference rdf:about="#ref_prefix">
<rdf:value rdf:resource="&mulgara;prefix"/>
</krule:URIReference>
- <krule:URIReference rdf:about="#ref_prefixModel">
- <rdf:value rdf:resource="rmi://localhost/server1#prefix"/>
+ <krule:URIReference rdf:about="#ref_prefixGraph">
+ <rdf:value rdf:resource="sys:prefix"/>
</krule:URIReference>
<krule:Axiom>
@@ -798,7 +798,7 @@
<URIReference rdf:about="#ref_uriType"/>
</hasObject>
<hasModel>
- <URIReference rdf:about="#ref_rdftypeModel"/>
+ <URIReference rdf:about="#ref_rdftypeGraph"/>
</hasModel>
</SimpleConstraint>
</argument>
@@ -1227,7 +1227,7 @@
</Literal>
</hasObject>
<hasModel>
- <URIReference rdf:about="#ref_prefixModel"/>
+ <URIReference rdf:about="#ref_prefixGraph"/>
</hasModel>
</SimpleConstraint>
</argument>
More information about the Mulgara-svn
mailing list