[Mulgara-svn] r1867 - branches/distinct_queries/jxdata/iTQL/distinct

[pag at mulgara.org]

Author: pag
Date: 2009-12-09 06:56:41 -0800 (Wed, 09 Dec 2009)
New Revision: 1867

Modified:
   branches/distinct_queries/jxdata/iTQL/distinct/result1.txt
   branches/distinct_queries/jxdata/iTQL/distinct/test.jxu
Log:
Changed the graph to load to a general URI, and not in the RMI scheme

Modified: branches/distinct_queries/jxdata/iTQL/distinct/result1.txt
===================================================================
--- branches/distinct_queries/jxdata/iTQL/distinct/result1.txt	2009-12-08 18:39:03 UTC (rev 1866)
+++ branches/distinct_queries/jxdata/iTQL/distinct/result1.txt	2009-12-09 14:56:41 UTC (rev 1867)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully loaded 96 statements from @baseuri@/jxdata/iTQL/people.rdf into @server@#people</message></query></answer>
+<answer xmlns="http://mulgara.org/tql#"><query><message>Successfully loaded 96 statements from @baseuri@/jxdata/iTQL/people.rdf into test:people</message></query></answer>

Modified: branches/distinct_queries/jxdata/iTQL/distinct/test.jxu
===================================================================
--- branches/distinct_queries/jxdata/iTQL/distinct/test.jxu	2009-12-08 18:39:03 UTC (rev 1866)
+++ branches/distinct_queries/jxdata/iTQL/distinct/test.jxu	2009-12-09 14:56:41 UTC (rev 1867)
@@ -1,8 +1,8 @@
 <jxu>
   <set name="debug" value="false" />
 
-  <set name="modelName" value="@server@#people" />
-  <set name="loadCommand" value="load &lt;@baseuri@/jxdata/iTQL/people.rdf&gt; into &lt;@server@#people&gt; ;" />
+  <set name="modelName" value="test:people" />
+  <set name="loadCommand" value="load &lt;@baseuri@/jxdata/iTQL/people.rdf&gt; into &lt;test:people&gt; ;" />
   <eval stepClass="org.mulgara.store.jxunit.LoadDataJX" />
 
   <ifEqual converse="true" file="result1.txt" name="loadResult">
@@ -18,7 +18,7 @@
       prefix contact: &lt;http://www.w3.org/2000/10/swap/pim/contact#&gt;
   
       select ?person ?email
-      from &lt;@server@#people&gt;
+      from &lt;test:people&gt;
       where {
         ?person a foaf:Person .
         ?person foaf:mbox ?email .
@@ -67,7 +67,7 @@
       prefix contact: &lt;http://www.w3.org/2000/10/swap/pim/contact#&gt;
   
       select distinct ?person ?email
-      from &lt;@server@#people&gt;
+      from &lt;test:people&gt;
       where {
         ?person a foaf:Person .
         ?person foaf:mbox ?email .
@@ -103,7 +103,7 @@
       }
       order by ?person"/>
 
-  <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
+  <eval stepClass="org.mulgara.store.jxunit.SparqlQueryJX" />
   <ifEqual converse="true" file="queryResult2.txt" name="queryResult">
     <save name="queryResult" file="badQuery2Result.xml"/>
     <fail>Output failed.  Check badQuery2Result.xml for output.</fail>
@@ -111,7 +111,7 @@
 
 
   <!-- now drop the graphs -->
-  <set name="query" value="drop &lt;@server@#people&gt;;"/>
+  <set name="query" value="drop &lt;test:people&gt;;"/>
   <eval stepClass="org.mulgara.store.jxunit.QueryJX" />
 
 </jxu>