You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2011/11/03 18:33:04 UTC

svn commit: r1197234 [8/24] - in /incubator/jena/Jena2/ARQ/trunk/testing/ARQ: Algebra/ Ask/ Assign/ Basic/ BasicPatterns/ BlankNodes/ Bound/ Construct/ Dataset/ Describe/ Distinct/ EngineMain/ EngineRef/ Examples/ Expr/ Expr1/ Expr2/ ExprBuiltIns/ Expr...

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/distinct-all.srx
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/distinct-all.srx?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/distinct-all.srx (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/distinct-all.srx Thu Nov  3 17:32:36 2011
@@ -1,111 +1,111 @@
-<?xml version="1.0"?>
-<sparql
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
-    xmlns="http://www.w3.org/2005/sparql-results#" >
-  <head>
-    <variable name="v"/>
-  </head>
-  <results>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#string">ABC</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#float">1.3e0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.3e0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal xml:lang="en">ABC</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">+1</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">01.0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal>ABC</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">01</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#string"></literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.0e0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">+1.0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal xml:lang="en">abc</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal xml:lang="en"></literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">1.0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <bnode>b0</bnode>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <uri>http://example/z1</uri>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal>abc</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal></literal>
-      </binding>
-    </result>
-  </results>
-</sparql>
+<?xml version="1.0"?>
+<sparql
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
+    xmlns="http://www.w3.org/2005/sparql-results#" >
+  <head>
+    <variable name="v"/>
+  </head>
+  <results>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string">ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#float">1.3e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.3e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en">ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">+1</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">01.0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal>ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">01</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string"></literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.0e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">+1.0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en">abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en"></literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">1.0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <bnode>b0</bnode>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <uri>http://example/z1</uri>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal>abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal></literal>
+      </binding>
+    </result>
+  </results>
+</sparql>

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/distinct-node.srx
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/distinct-node.srx?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/distinct-node.srx (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/distinct-node.srx Thu Nov  3 17:32:36 2011
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
-<sparql
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
-    xmlns="http://www.w3.org/2005/sparql-results#" >
-  <head>
-    <variable name="v"/>
-  </head>
-  <results>
-    <result>
-      <binding name="v">
-        <bnode>b0</bnode>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <uri>http://example/z1</uri>
-      </binding>
-    </result>
-  </results>
-</sparql>
+<?xml version="1.0"?>
+<sparql
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
+    xmlns="http://www.w3.org/2005/sparql-results#" >
+  <head>
+    <variable name="v"/>
+  </head>
+  <results>
+    <result>
+      <binding name="v">
+        <bnode>b0</bnode>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <uri>http://example/z1</uri>
+      </binding>
+    </result>
+  </results>
+</sparql>

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/distinct-num.srx
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/distinct-num.srx?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/distinct-num.srx (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/distinct-num.srx Thu Nov  3 17:32:36 2011
@@ -1,56 +1,56 @@
-<?xml version="1.0"?>
-<sparql
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
-    xmlns="http://www.w3.org/2005/sparql-results#" >
-  <head>
-    <variable name="v"/>
-  </head>
-  <results>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#float">1.3e0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.3e0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">+1</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">01.0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">01</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.0e0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">+1.0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">1.0</literal>
-      </binding>
-    </result>
-  </results>
-</sparql>
+<?xml version="1.0"?>
+<sparql
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
+    xmlns="http://www.w3.org/2005/sparql-results#" >
+  <head>
+    <variable name="v"/>
+  </head>
+  <results>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#float">1.3e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.3e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">+1</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">01.0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">01</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.0e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">+1.0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">1.0</literal>
+      </binding>
+    </result>
+  </results>
+</sparql>

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/distinct-opt.srx
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/distinct-opt.srx?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/distinct-opt.srx (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/distinct-opt.srx Thu Nov  3 17:32:36 2011
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
-<sparql
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
-    xmlns="http://www.w3.org/2005/sparql-results#" >
-  <head>
-    <variable name="v"/>
-  </head>
-  <results>
-    <result>
-      <binding name="v">
-        <uri>http://example/s</uri>
-      </binding>
-    </result>
-    <result>
-    </result>
-    <result>
-      <binding name="v">
-        <uri>http://example/r</uri>
-      </binding>
-    </result>
-  </results>
-</sparql>
+<?xml version="1.0"?>
+<sparql
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
+    xmlns="http://www.w3.org/2005/sparql-results#" >
+  <head>
+    <variable name="v"/>
+  </head>
+  <results>
+    <result>
+      <binding name="v">
+        <uri>http://example/s</uri>
+      </binding>
+    </result>
+    <result>
+    </result>
+    <result>
+      <binding name="v">
+        <uri>http://example/r</uri>
+      </binding>
+    </result>
+  </results>
+</sparql>

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/distinct-str.srx
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/distinct-str.srx?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/distinct-str.srx (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/distinct-str.srx Thu Nov  3 17:32:36 2011
@@ -1,56 +1,56 @@
-<?xml version="1.0"?>
-<sparql
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
-    xmlns="http://www.w3.org/2005/sparql-results#" >
-  <head>
-    <variable name="v"/>
-  </head>
-  <results>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#string">ABC</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal xml:lang="en">ABC</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal>ABC</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#string"></literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal xml:lang="en">abc</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal xml:lang="en"></literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal>abc</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal></literal>
-      </binding>
-    </result>
-  </results>
-</sparql>
+<?xml version="1.0"?>
+<sparql
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
+    xmlns="http://www.w3.org/2005/sparql-results#" >
+  <head>
+    <variable name="v"/>
+  </head>
+  <results>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string">ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en">ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal>ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string"></literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en">abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en"></literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal>abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal></literal>
+      </binding>
+    </result>
+  </results>
+</sparql>

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/manifest.ttl
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/manifest.ttl?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/manifest.ttl (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/manifest.ttl Thu Nov  3 17:32:36 2011
@@ -1,104 +1,104 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rdfs:	<http://www.w3.org/2000/01/rdf-schema#> .
-@prefix mf:     <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
-@prefix mfx:    <http://jena.hpl.hp.com/2005/05/test-manifest-extra#> .
-@prefix qt:     <http://www.w3.org/2001/sw/DataAccess/tests/test-query#> .
-
-<>  rdf:type mf:Manifest ;
-    rdfs:label "DISTINCT" ;
-    mf:entries
-    ( 
-      <#no-distinct-1>
-      <#distinct-1>
-      <#no-distinct-2>
-      <#distinct-2>
-      <#no-distinct-3>
-      <#distinct-3>
-      <#no-distinct-4>
-      <#distinct-4>
-      <#no-distinct-9>
-      <#distinct-9>
-    ) .
-
-
-<#no-distinct-1>
-    mf:name    "Numbers: No distinct" ;
-    rdf:type   mfx:TestQuery ; 
-    mf:action
-            [ qt:query  <no-distinct-1.rq> ;
-              qt:data   <data-num.ttl> ] ;
-    mf:result  <no-distinct-num.srx> .
-
-<#distinct-1>
-    mf:name    "Numbers: Distinct" ;
-    rdf:type   mfx:TestQuery ; 
-    mf:action
-            [ qt:query  <distinct-1.rq> ;
-              qt:data   <data-num.ttl> ] ;
-    mf:result  <distinct-num.srx> .
-
-<#no-distinct-2>
-    mf:name    "Strings: No distinct" ;
-    rdf:type   mfx:TestQuery ; 
-    mf:action
-            [ qt:query  <no-distinct-1.rq> ;
-              qt:data   <data-str.ttl> ] ;
-    mf:result  <no-distinct-str.srx> .
-
-<#distinct-2>
-    mf:name    "Strings: Distinct" ;
-    rdf:type   mfx:TestQuery ; 
-    mf:action
-            [ qt:query  <distinct-1.rq> ;
-              qt:data   <data-str.ttl> ] ;
-    mf:result  <distinct-str.srx> .
-
-<#no-distinct-3>
-    mf:name    "Nodes: No distinct" ;
-    rdf:type   mfx:TestQuery ; 
-    mf:action
-            [ qt:query  <no-distinct-1.rq> ;
-              qt:data   <data-node.ttl> ] ;
-    mf:result  <no-distinct-node.srx> .
-
-<#distinct-3>
-    mf:name    "Nodes: Distinct" ;
-    rdf:type   mfx:TestQuery ; 
-    mf:action
-            [ qt:query  <distinct-1.rq> ;
-              qt:data   <data-node.ttl> ] ;
-    mf:result  <distinct-node.srx> .
-
-<#no-distinct-4>
-    mf:name    "Opt: No distinct" ;
-    rdf:type   mfx:TestQuery ; 
-    mf:action
-            [ qt:query  <no-distinct-2.rq> ;
-              qt:data   <data-opt.ttl> ] ;
-    mf:result  <no-distinct-opt.srx> .
-
-<#distinct-4>
-    mf:name    "Opt: Distinct" ;
-    rdf:type   mfx:TestQuery ; 
-    mf:action
-            [ qt:query  <distinct-2.rq> ;
-              qt:data   <data-opt.ttl> ] ;
-    mf:result  <distinct-opt.srx> .
-
-
-
-<#no-distinct-9>
-    mf:name    "All: No distinct" ;
-    rdf:type   mfx:TestQuery ; 
-    mf:action
-            [ qt:query  <no-distinct-1.rq> ;
-              qt:data   <data-num.ttl> , <data-str.ttl> , <data-node.ttl> ] ;
-    mf:result  <no-distinct-all.srx> .
-
-<#distinct-9>
-    mf:name    "All: Distinct" ;
-    rdf:type   mfx:TestQuery ; 
-    mf:action
-            [ qt:query  <distinct-1.rq> ;
-              qt:data   <data-num.ttl> , <data-str.ttl> , <data-node.ttl> ] ;
-    mf:result  <distinct-all.srx> .
+@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs:	<http://www.w3.org/2000/01/rdf-schema#> .
+@prefix mf:     <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
+@prefix mfx:    <http://jena.hpl.hp.com/2005/05/test-manifest-extra#> .
+@prefix qt:     <http://www.w3.org/2001/sw/DataAccess/tests/test-query#> .
+
+<>  rdf:type mf:Manifest ;
+    rdfs:label "DISTINCT" ;
+    mf:entries
+    ( 
+      <#no-distinct-1>
+      <#distinct-1>
+      <#no-distinct-2>
+      <#distinct-2>
+      <#no-distinct-3>
+      <#distinct-3>
+      <#no-distinct-4>
+      <#distinct-4>
+      <#no-distinct-9>
+      <#distinct-9>
+    ) .
+
+
+<#no-distinct-1>
+    mf:name    "Numbers: No distinct" ;
+    rdf:type   mfx:TestQuery ; 
+    mf:action
+            [ qt:query  <no-distinct-1.rq> ;
+              qt:data   <data-num.ttl> ] ;
+    mf:result  <no-distinct-num.srx> .
+
+<#distinct-1>
+    mf:name    "Numbers: Distinct" ;
+    rdf:type   mfx:TestQuery ; 
+    mf:action
+            [ qt:query  <distinct-1.rq> ;
+              qt:data   <data-num.ttl> ] ;
+    mf:result  <distinct-num.srx> .
+
+<#no-distinct-2>
+    mf:name    "Strings: No distinct" ;
+    rdf:type   mfx:TestQuery ; 
+    mf:action
+            [ qt:query  <no-distinct-1.rq> ;
+              qt:data   <data-str.ttl> ] ;
+    mf:result  <no-distinct-str.srx> .
+
+<#distinct-2>
+    mf:name    "Strings: Distinct" ;
+    rdf:type   mfx:TestQuery ; 
+    mf:action
+            [ qt:query  <distinct-1.rq> ;
+              qt:data   <data-str.ttl> ] ;
+    mf:result  <distinct-str.srx> .
+
+<#no-distinct-3>
+    mf:name    "Nodes: No distinct" ;
+    rdf:type   mfx:TestQuery ; 
+    mf:action
+            [ qt:query  <no-distinct-1.rq> ;
+              qt:data   <data-node.ttl> ] ;
+    mf:result  <no-distinct-node.srx> .
+
+<#distinct-3>
+    mf:name    "Nodes: Distinct" ;
+    rdf:type   mfx:TestQuery ; 
+    mf:action
+            [ qt:query  <distinct-1.rq> ;
+              qt:data   <data-node.ttl> ] ;
+    mf:result  <distinct-node.srx> .
+
+<#no-distinct-4>
+    mf:name    "Opt: No distinct" ;
+    rdf:type   mfx:TestQuery ; 
+    mf:action
+            [ qt:query  <no-distinct-2.rq> ;
+              qt:data   <data-opt.ttl> ] ;
+    mf:result  <no-distinct-opt.srx> .
+
+<#distinct-4>
+    mf:name    "Opt: Distinct" ;
+    rdf:type   mfx:TestQuery ; 
+    mf:action
+            [ qt:query  <distinct-2.rq> ;
+              qt:data   <data-opt.ttl> ] ;
+    mf:result  <distinct-opt.srx> .
+
+
+
+<#no-distinct-9>
+    mf:name    "All: No distinct" ;
+    rdf:type   mfx:TestQuery ; 
+    mf:action
+            [ qt:query  <no-distinct-1.rq> ;
+              qt:data   <data-num.ttl> , <data-str.ttl> , <data-node.ttl> ] ;
+    mf:result  <no-distinct-all.srx> .
+
+<#distinct-9>
+    mf:name    "All: Distinct" ;
+    rdf:type   mfx:TestQuery ; 
+    mf:action
+            [ qt:query  <distinct-1.rq> ;
+              qt:data   <data-num.ttl> , <data-str.ttl> , <data-node.ttl> ] ;
+    mf:result  <distinct-all.srx> .

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/no-distinct-1.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/no-distinct-1.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/no-distinct-1.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/no-distinct-1.rq Thu Nov  3 17:32:36 2011
@@ -1,4 +1,4 @@
-SELECT ?v
-{
-    ?x ?p ?v .
-}
+SELECT ?v
+{
+    ?x ?p ?v .
+}

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/no-distinct-2.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/no-distinct-2.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/no-distinct-2.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/no-distinct-2.rq Thu Nov  3 17:32:36 2011
@@ -1,8 +1,8 @@
-PREFIX :      <http://example/> 
-PREFIX xsd:   <http://www.w3.org/2001/XMLSchema#>
-
-SELECT ?v
-{
-    :x1 ?p ?o
-    OPTIONAL { ?o :q ?v }
-}
+PREFIX :      <http://example/> 
+PREFIX xsd:   <http://www.w3.org/2001/XMLSchema#>
+
+SELECT ?v
+{
+    :x1 ?p ?o
+    OPTIONAL { ?o :q ?v }
+}

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/no-distinct-all.srx
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/no-distinct-all.srx?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/no-distinct-all.srx (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/no-distinct-all.srx Thu Nov  3 17:32:36 2011
@@ -1,231 +1,231 @@
-<?xml version="1.0"?>
-<sparql
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
-    xmlns="http://www.w3.org/2005/sparql-results#" >
-  <head>
-    <variable name="v"/>
-  </head>
-  <results>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#string">ABC</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#string">ABC</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#float">1.3e0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.3e0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal xml:lang="en">ABC</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal xml:lang="en">ABC</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">+1</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">+1</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.3e0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.3e0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">01.0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">01.0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal>ABC</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal>ABC</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">01</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">01</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#string"></literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#string"></literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.0e0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.0e0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">+1.0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">+1.0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal xml:lang="en">abc</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal xml:lang="en">abc</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal xml:lang="en"></literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal xml:lang="en"></literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.0e0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.0e0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">1.0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">1.0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <bnode>b0</bnode>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <uri>http://example/z1</uri>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <bnode>b0</bnode>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <uri>http://example/z1</uri>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal>abc</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal>abc</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal></literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal></literal>
-      </binding>
-    </result>
-  </results>
-</sparql>
+<?xml version="1.0"?>
+<sparql
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
+    xmlns="http://www.w3.org/2005/sparql-results#" >
+  <head>
+    <variable name="v"/>
+  </head>
+  <results>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string">ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string">ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#float">1.3e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.3e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en">ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en">ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">+1</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">+1</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.3e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.3e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">01.0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">01.0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal>ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal>ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">01</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">01</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string"></literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string"></literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.0e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.0e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">+1.0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">+1.0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en">abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en">abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en"></literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en"></literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.0e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.0e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">1.0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">1.0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <bnode>b0</bnode>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <uri>http://example/z1</uri>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <bnode>b0</bnode>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <uri>http://example/z1</uri>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal>abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal>abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal></literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal></literal>
+      </binding>
+    </result>
+  </results>
+</sparql>

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/no-distinct-node.srx
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/no-distinct-node.srx?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/no-distinct-node.srx (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/no-distinct-node.srx Thu Nov  3 17:32:36 2011
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
-<sparql
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
-    xmlns="http://www.w3.org/2005/sparql-results#" >
-  <head>
-    <variable name="v"/>
-  </head>
-  <results>
-    <result>
-      <binding name="v">
-        <bnode>b0</bnode>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <bnode>b0</bnode>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <uri>http://example/z1</uri>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <uri>http://example/z1</uri>
-      </binding>
-    </result>
-  </results>
-</sparql>
+<?xml version="1.0"?>
+<sparql
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
+    xmlns="http://www.w3.org/2005/sparql-results#" >
+  <head>
+    <variable name="v"/>
+  </head>
+  <results>
+    <result>
+      <binding name="v">
+        <bnode>b0</bnode>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <bnode>b0</bnode>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <uri>http://example/z1</uri>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <uri>http://example/z1</uri>
+      </binding>
+    </result>
+  </results>
+</sparql>

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/no-distinct-num.srx
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/no-distinct-num.srx?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/no-distinct-num.srx (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/no-distinct-num.srx Thu Nov  3 17:32:36 2011
@@ -1,121 +1,121 @@
-<?xml version="1.0"?>
-<sparql
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
-    xmlns="http://www.w3.org/2005/sparql-results#" >
-  <head>
-    <variable name="v"/>
-  </head>
-  <results>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#float">1.3e0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.3e0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">+1</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">+1</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.3e0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.3e0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">01.0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">01.0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">01</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">01</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.0e0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.0e0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">+1.0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">+1.0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.0e0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.0e0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">1.0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">1.0</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
-      </binding>
-    </result>
-  </results>
-</sparql>
+<?xml version="1.0"?>
+<sparql
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
+    xmlns="http://www.w3.org/2005/sparql-results#" >
+  <head>
+    <variable name="v"/>
+  </head>
+  <results>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#float">1.3e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.3e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">+1</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">+1</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.3e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.3e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">01.0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">01.0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">01</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">01</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.0e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.0e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">+1.0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">+1.0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.0e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.0e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">1.0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">1.0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
+      </binding>
+    </result>
+  </results>
+</sparql>

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/no-distinct-opt.srx
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/no-distinct-opt.srx?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/no-distinct-opt.srx (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/no-distinct-opt.srx Thu Nov  3 17:32:36 2011
@@ -1,35 +1,35 @@
-<?xml version="1.0"?>
-<sparql
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
-    xmlns="http://www.w3.org/2005/sparql-results#" >
-  <head>
-    <variable name="v"/>
-  </head>
-  <results>
-    <result>
-      <binding name="v">
-        <uri>http://example/s</uri>
-      </binding>
-    </result>
-    <result>
-    </result>
-    <result>
-      <binding name="v">
-        <uri>http://example/r</uri>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <uri>http://example/s</uri>
-      </binding>
-    </result>
-    <result>
-    </result>
-    <result>
-      <binding name="v">
-        <uri>http://example/r</uri>
-      </binding>
-    </result>
-  </results>
-</sparql>
+<?xml version="1.0"?>
+<sparql
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
+    xmlns="http://www.w3.org/2005/sparql-results#" >
+  <head>
+    <variable name="v"/>
+  </head>
+  <results>
+    <result>
+      <binding name="v">
+        <uri>http://example/s</uri>
+      </binding>
+    </result>
+    <result>
+    </result>
+    <result>
+      <binding name="v">
+        <uri>http://example/r</uri>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <uri>http://example/s</uri>
+      </binding>
+    </result>
+    <result>
+    </result>
+    <result>
+      <binding name="v">
+        <uri>http://example/r</uri>
+      </binding>
+    </result>
+  </results>
+</sparql>

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/no-distinct-str.srx
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/no-distinct-str.srx?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/no-distinct-str.srx (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/no-distinct-str.srx Thu Nov  3 17:32:36 2011
@@ -1,101 +1,101 @@
-<?xml version="1.0"?>
-<sparql
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
-    xmlns="http://www.w3.org/2005/sparql-results#" >
-  <head>
-    <variable name="v"/>
-  </head>
-  <results>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#string">ABC</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#string">ABC</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal xml:lang="en">ABC</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal xml:lang="en">ABC</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal>ABC</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal>ABC</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#string"></literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#string"></literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal xml:lang="en">abc</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal xml:lang="en">abc</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal xml:lang="en"></literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal xml:lang="en"></literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal>abc</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal>abc</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal></literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal></literal>
-      </binding>
-    </result>
-  </results>
-</sparql>
+<?xml version="1.0"?>
+<sparql
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
+    xmlns="http://www.w3.org/2005/sparql-results#" >
+  <head>
+    <variable name="v"/>
+  </head>
+  <results>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string">ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string">ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en">ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en">ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal>ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal>ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string"></literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string"></literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en">abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en">abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en"></literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en"></literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal>abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal>abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal></literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal></literal>
+      </binding>
+    </result>
+  </results>
+</sparql>

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/EngineMain/data-1.ttl
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/EngineMain/data-1.ttl?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/EngineMain/data-1.ttl (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/EngineMain/data-1.ttl Thu Nov  3 17:32:36 2011
@@ -1,3 +1,3 @@
-@prefix :  <http://example/> .
-
-:x :p ("A" "B" "C") .
+@prefix :  <http://example/> .
+
+:x :p ("A" "B" "C") .

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/EngineMain/filter-1.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/EngineMain/filter-1.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/EngineMain/filter-1.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/EngineMain/filter-1.rq Thu Nov  3 17:32:36 2011
@@ -1,8 +1,8 @@
-PREFIX : <http://example/>
-PREFIX list: <http://jena.hpl.hp.com/ARQ/list#>
-
-SELECT *
-{
-  ?list list:index (?index "B")
-  FILTER (?index = 1)
-}
+PREFIX : <http://example/>
+PREFIX list: <http://jena.hpl.hp.com/ARQ/list#>
+
+SELECT *
+{
+  ?list list:index (?index "B")
+  FILTER (?index = 1)
+}

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/EngineMain/filter-1.srx
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/EngineMain/filter-1.srx?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/EngineMain/filter-1.srx (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/EngineMain/filter-1.srx Thu Nov  3 17:32:36 2011
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
-<sparql xmlns="http://www.w3.org/2005/sparql-results#">
-  <head>
-    <variable name="list"/>
-    <variable name="index"/>
-  </head>
-  <results>
-    <result>
-      <binding name="list">
-        <bnode>b0</bnode>
-      </binding>
-      <binding name="index">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
-      </binding>
-    </result>
-  </results>
-</sparql>
+<?xml version="1.0"?>
+<sparql xmlns="http://www.w3.org/2005/sparql-results#">
+  <head>
+    <variable name="list"/>
+    <variable name="index"/>
+  </head>
+  <results>
+    <result>
+      <binding name="list">
+        <bnode>b0</bnode>
+      </binding>
+      <binding name="index">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
+      </binding>
+    </result>
+  </results>
+</sparql>

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/EngineMain/manifest.ttl
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/EngineMain/manifest.ttl?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/EngineMain/manifest.ttl (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/EngineMain/manifest.ttl Thu Nov  3 17:32:36 2011
@@ -1,18 +1,18 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rdfs:	<http://www.w3.org/2000/01/rdf-schema#> .
-@prefix mf:     <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
-@prefix mfx:    <http://jena.hpl.hp.com/2005/05/test-manifest-extra#> .
-@prefix qt:     <http://www.w3.org/2001/sw/DataAccess/tests/test-query#> .
-
-<>  rdf:type mf:Manifest ;
-    rdfs:label "Engine-Main" ;
-    mf:entries
-    ( 
-      [  mf:name    "Filter placement in BGPs with property function" ;
-         rdf:type   mfx:TestQuery ; 
-         mf:action
-            [ qt:query  <filter-1.rq> ;
-              qt:data   <data-1.ttl> ] ;
-        mf:result  <filter-1.srx>
-      ]
-    ).
+@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs:	<http://www.w3.org/2000/01/rdf-schema#> .
+@prefix mf:     <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
+@prefix mfx:    <http://jena.hpl.hp.com/2005/05/test-manifest-extra#> .
+@prefix qt:     <http://www.w3.org/2001/sw/DataAccess/tests/test-query#> .
+
+<>  rdf:type mf:Manifest ;
+    rdfs:label "Engine-Main" ;
+    mf:entries
+    ( 
+      [  mf:name    "Filter placement in BGPs with property function" ;
+         rdf:type   mfx:TestQuery ; 
+         mf:action
+            [ qt:query  <filter-1.rq> ;
+              qt:data   <data-1.ttl> ] ;
+        mf:result  <filter-1.srx>
+      ]
+    ).

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/EngineRef/dummy.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/EngineRef/dummy.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/EngineRef/dummy.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/EngineRef/dummy.rq Thu Nov  3 17:32:36 2011
@@ -1 +1 @@
-SELECT * {}
+SELECT * {}

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/EngineRef/dummy.srj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/EngineRef/dummy.srj?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/EngineRef/manifest.ttl
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/EngineRef/manifest.ttl?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/EngineRef/manifest.ttl (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/EngineRef/manifest.ttl Thu Nov  3 17:32:36 2011
@@ -1,19 +1,19 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rdfs:	<http://www.w3.org/2000/01/rdf-schema#> .
-@prefix mf:     <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
-@prefix mfx:    <http://jena.hpl.hp.com/2005/05/test-manifest-extra#> .
-@prefix qt:     <http://www.w3.org/2001/sw/DataAccess/tests/test-query#> .
-
-<>  rdf:type mf:Manifest ;
-    rdfs:label "Engine-Ref" ;
-    mf:entries
-    ( 
-      [  mf:name    "Test (ref)" ;
-         # TestSyntax, TestSerialization, TestBadSyntax, TestQuery
-         rdf:type   mfx:TestQuery ; 
-         mf:action
-            [ qt:query  <dummy.rq> ;
-              qt:data   <data.ttl> ] ;
-        mf:result  <dummy.srj>
-      ]
-    ).
+@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs:	<http://www.w3.org/2000/01/rdf-schema#> .
+@prefix mf:     <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
+@prefix mfx:    <http://jena.hpl.hp.com/2005/05/test-manifest-extra#> .
+@prefix qt:     <http://www.w3.org/2001/sw/DataAccess/tests/test-query#> .
+
+<>  rdf:type mf:Manifest ;
+    rdfs:label "Engine-Ref" ;
+    mf:entries
+    ( 
+      [  mf:name    "Test (ref)" ;
+         # TestSyntax, TestSerialization, TestBadSyntax, TestQuery
+         rdf:type   mfx:TestQuery ; 
+         mf:action
+            [ qt:query  <dummy.rq> ;
+              qt:data   <data.ttl> ] ;
+        mf:result  <dummy.srj>
+      ]
+    ).

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/data-1.ttl
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/data-1.ttl?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/data-1.ttl (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/data-1.ttl Thu Nov  3 17:32:36 2011
@@ -1,9 +1,9 @@
-@prefix : <http://example/> .
-@prefix  rdfs:   <http://www.w3.org/2000/01/rdf-schema#> .
-
-:x1 rdfs:label "a"  .
-:x2 rdfs:label "z" .
-:x3 rdfs:label "aaaZZZbbb" .
-:x4 rdfs:label "zzz" .
-
-:y1 :p "zzz" .
+@prefix : <http://example/> .
+@prefix  rdfs:   <http://www.w3.org/2000/01/rdf-schema#> .
+
+:x1 rdfs:label "a"  .
+:x2 rdfs:label "z" .
+:x3 rdfs:label "aaaZZZbbb" .
+:x4 rdfs:label "zzz" .
+
+:y1 :p "zzz" .

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/data-2.ttl
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/data-2.ttl?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/data-2.ttl (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/data-2.ttl Thu Nov  3 17:32:36 2011
@@ -1,9 +1,9 @@
-@prefix : <http://example/> .
-@prefix  rdfs:   <http://www.w3.org/2000/01/rdf-schema#> .
-
-:x1 rdfs:label "a"  .
-:x2 rdfs:label "z" .
-:x3 :label         2 .
-:x4 :p         rdfs:Class .
-
-:y1 :p "zzz" .
+@prefix : <http://example/> .
+@prefix  rdfs:   <http://www.w3.org/2000/01/rdf-schema#> .
+
+:x1 rdfs:label "a"  .
+:x2 rdfs:label "z" .
+:x3 :label         2 .
+:x4 :p         rdfs:Class .
+
+:y1 :p "zzz" .

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/ex-label-1.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/ex-label-1.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/ex-label-1.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/ex-label-1.rq Thu Nov  3 17:32:36 2011
@@ -1,6 +1,6 @@
-PREFIX  jext:    <java:arq.examples.propertyfunction.>
-
-SELECT ?x 
-{
-    ?x jext:labelSearch "zzz" .
-}
+PREFIX  jext:    <java:arq.examples.propertyfunction.>
+
+SELECT ?x 
+{
+    ?x jext:labelSearch "zzz" .
+}

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/ex-localname-1.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/ex-localname-1.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/ex-localname-1.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/ex-localname-1.rq Thu Nov  3 17:32:36 2011
@@ -1,9 +1,9 @@
-PREFIX     :    <http://example/> 
-PREFIX jext:    <java:arq.examples.propertyfunction.>
-PREFIX  xsd:    <http://www.w3.org/2001/XMLSchema#>
-
-SELECT ?p ?localname
-{
-   ?x ?p ?v .
-   ?p jext:localname ?localname .
-}
+PREFIX     :    <http://example/> 
+PREFIX jext:    <java:arq.examples.propertyfunction.>
+PREFIX  xsd:    <http://www.w3.org/2001/XMLSchema#>
+
+SELECT ?p ?localname
+{
+   ?x ?p ?v .
+   ?p jext:localname ?localname .
+}

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/ex-localname-2.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/ex-localname-2.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/ex-localname-2.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/ex-localname-2.rq Thu Nov  3 17:32:36 2011
@@ -1,10 +1,10 @@
-PREFIX     :    <http://example/> 
-PREFIX jext:    <java:arq.examples.propertyfunction.>
-PREFIX  xsd:    <http://www.w3.org/2001/XMLSchema#>
-
-SELECT ?p ?localname
-{
-   ?x ?p ?v .
-   ?p jext:localname ?localname .
-   ?p jext:localname ?localname .   # This is a check now (all bound)
-}
+PREFIX     :    <http://example/> 
+PREFIX jext:    <java:arq.examples.propertyfunction.>
+PREFIX  xsd:    <http://www.w3.org/2001/XMLSchema#>
+
+SELECT ?p ?localname
+{
+   ?x ?p ?v .
+   ?p jext:localname ?localname .
+   ?p jext:localname ?localname .   # This is a check now (all bound)
+}

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/ex-localname-3.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/ex-localname-3.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/ex-localname-3.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/ex-localname-3.rq Thu Nov  3 17:32:36 2011
@@ -1,9 +1,9 @@
-PREFIX     :    <http://example/> 
-PREFIX jext:    <java:arq.examples.propertyfunction.>
-PREFIX  xsd:    <http://www.w3.org/2001/XMLSchema#>
-
-SELECT ?x ?p
-{
-   ?x ?p ?v .
-   ?p jext:localname "label" .
-}
+PREFIX     :    <http://example/> 
+PREFIX jext:    <java:arq.examples.propertyfunction.>
+PREFIX  xsd:    <http://www.w3.org/2001/XMLSchema#>
+
+SELECT ?x ?p
+{
+   ?x ?p ?v .
+   ?p jext:localname "label" .
+}

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/ex-localname-4.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/ex-localname-4.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/ex-localname-4.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/ex-localname-4.rq Thu Nov  3 17:32:36 2011
@@ -1,8 +1,8 @@
-PREFIX     :    <http://example/> 
-PREFIX jext:    <java:arq.examples.propertyfunction.>
-PREFIX  xsd:    <http://www.w3.org/2001/XMLSchema#>
-
-SELECT ?p
-{
-   ?p jext:localname "label"^^xsd:string .
-}
+PREFIX     :    <http://example/> 
+PREFIX jext:    <java:arq.examples.propertyfunction.>
+PREFIX  xsd:    <http://www.w3.org/2001/XMLSchema#>
+
+SELECT ?p
+{
+   ?p jext:localname "label"^^xsd:string .
+}

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/ex-localname-5.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/ex-localname-5.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/ex-localname-5.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/ex-localname-5.rq Thu Nov  3 17:32:36 2011
@@ -1,9 +1,9 @@
-PREFIX     :    <http://example/> 
-PREFIX jext:    <java:arq.examples.propertyfunction.>
-PREFIX  xsd:    <http://www.w3.org/2001/XMLSchema#>
-
-SELECT ?x ?p
-{
-   ?x ?p ?v .
-   ?p jext:localname "label"^^:unknown
-}
+PREFIX     :    <http://example/> 
+PREFIX jext:    <java:arq.examples.propertyfunction.>
+PREFIX  xsd:    <http://www.w3.org/2001/XMLSchema#>
+
+SELECT ?x ?p
+{
+   ?x ?p ?v .
+   ?p jext:localname "label"^^:unknown
+}

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/ex-uppercase-1.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/ex-uppercase-1.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/ex-uppercase-1.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/ex-uppercase-1.rq Thu Nov  3 17:32:36 2011
@@ -1,8 +1,8 @@
-PREFIX      :    <http://example/>
-PREFIX  jext:    <java:arq.examples.propertyfunction.>
-
-SELECT ?v ?uc 
-{
-    [] :p ?v .
-    ?v jext:uppercase ?uc
-}
+PREFIX      :    <http://example/>
+PREFIX  jext:    <java:arq.examples.propertyfunction.>
+
+SELECT ?v ?uc 
+{
+    [] :p ?v .
+    ?v jext:uppercase ?uc
+}

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/ex-uppercase-2.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/ex-uppercase-2.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/ex-uppercase-2.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/ex-uppercase-2.rq Thu Nov  3 17:32:36 2011
@@ -1,8 +1,8 @@
-PREFIX      :    <http://example/>
-PREFIX  jext:    <java:arq.examples.propertyfunction.>
-
-SELECT ?v
-{
-    [] ?p ?v .
-    ?v jext:uppercase "ZZZ" .
-}
+PREFIX      :    <http://example/>
+PREFIX  jext:    <java:arq.examples.propertyfunction.>
+
+SELECT ?v
+{
+    [] ?p ?v .
+    ?v jext:uppercase "ZZZ" .
+}

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/manifest.ttl
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/manifest.ttl?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/manifest.ttl (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/manifest.ttl Thu Nov  3 17:32:36 2011
@@ -1,61 +1,61 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rdfs:	<http://www.w3.org/2000/01/rdf-schema#> .
-@prefix mf:     <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
-@prefix mfx:    <http://jena.hpl.hp.com/2005/05/test-manifest-extra#> .
-@prefix qt:     <http://www.w3.org/2001/sw/DataAccess/tests/test-query#> .
-
-<>  rdf:type mf:Manifest ;
-    rdfs:label "src-examples" ;
-    mf:entries
-    ( 
-      [  mf:name    "Example label - 1" ;
-         mf:action
-           [ qt:query  <ex-label-1.rq> ;
-             qt:data   <data-1.ttl> ] ;
-         mf:result  <result-label-1.srj>
-      ]
-
-      [  mf:name    "Example uppercase - 1" ;
-         mf:action
-           [ qt:query  <ex-uppercase-1.rq> ;
-             qt:data   <data-1.ttl> ] ;
-         mf:result  <result-uppercase-1.srj>
-      ]
-      [  mf:name    "Example uppercase - 2" ;
-         mf:action
-           [ qt:query  <ex-uppercase-2.rq> ;
-             qt:data   <data-1.ttl> ] ;
-         mf:result  <result-uppercase-2.srj>
-      ]
-      [  mf:name    "Example localname - 1" ;
-         mf:action
-           [ qt:query  <ex-localname-1.rq> ;
-             qt:data   <data-2.ttl> ] ;
-         mf:result  <result-localname-1.srj>
-      ]
-      [  mf:name    "Example localname - 2" ;
-         mf:action
-           [ qt:query  <ex-localname-2.rq> ;
-             qt:data   <data-2.ttl> ] ;
-         mf:result  <result-localname-2.srj>
-      ]
-      [  mf:name    "Example localname - 3" ;
-         mf:action
-           [ qt:query  <ex-localname-3.rq> ;
-             qt:data   <data-2.ttl> ] ;
-         mf:result  <result-localname-3.srj>
-      ]
-      [  mf:name    "Example localname - 4" ;
-         mf:action
-           [ qt:query  <ex-localname-4.rq> ;
-             qt:data   <data-2.ttl> ] ;
-         mf:result  <result-localname-4.srj>
-      ]
-      [  mf:name    "Example localname - 5" ;
-         mf:action
-           [ qt:query  <ex-localname-5.rq> ;
-             qt:data   <data-2.ttl> ] ;
-         mf:result  <result-localname-5.srj>
-      ]
-
-    ).
+@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs:	<http://www.w3.org/2000/01/rdf-schema#> .
+@prefix mf:     <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
+@prefix mfx:    <http://jena.hpl.hp.com/2005/05/test-manifest-extra#> .
+@prefix qt:     <http://www.w3.org/2001/sw/DataAccess/tests/test-query#> .
+
+<>  rdf:type mf:Manifest ;
+    rdfs:label "src-examples" ;
+    mf:entries
+    ( 
+      [  mf:name    "Example label - 1" ;
+         mf:action
+           [ qt:query  <ex-label-1.rq> ;
+             qt:data   <data-1.ttl> ] ;
+         mf:result  <result-label-1.srj>
+      ]
+
+      [  mf:name    "Example uppercase - 1" ;
+         mf:action
+           [ qt:query  <ex-uppercase-1.rq> ;
+             qt:data   <data-1.ttl> ] ;
+         mf:result  <result-uppercase-1.srj>
+      ]
+      [  mf:name    "Example uppercase - 2" ;
+         mf:action
+           [ qt:query  <ex-uppercase-2.rq> ;
+             qt:data   <data-1.ttl> ] ;
+         mf:result  <result-uppercase-2.srj>
+      ]
+      [  mf:name    "Example localname - 1" ;
+         mf:action
+           [ qt:query  <ex-localname-1.rq> ;
+             qt:data   <data-2.ttl> ] ;
+         mf:result  <result-localname-1.srj>
+      ]
+      [  mf:name    "Example localname - 2" ;
+         mf:action
+           [ qt:query  <ex-localname-2.rq> ;
+             qt:data   <data-2.ttl> ] ;
+         mf:result  <result-localname-2.srj>
+      ]
+      [  mf:name    "Example localname - 3" ;
+         mf:action
+           [ qt:query  <ex-localname-3.rq> ;
+             qt:data   <data-2.ttl> ] ;
+         mf:result  <result-localname-3.srj>
+      ]
+      [  mf:name    "Example localname - 4" ;
+         mf:action
+           [ qt:query  <ex-localname-4.rq> ;
+             qt:data   <data-2.ttl> ] ;
+         mf:result  <result-localname-4.srj>
+      ]
+      [  mf:name    "Example localname - 5" ;
+         mf:action
+           [ qt:query  <ex-localname-5.rq> ;
+             qt:data   <data-2.ttl> ] ;
+         mf:result  <result-localname-5.srj>
+      ]
+
+    ).

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/result-example-1.srj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/result-example-1.srj?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/result-label-1.srj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/result-label-1.srj?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/result-localname-1.srj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/result-localname-1.srj?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/result-localname-2.srj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/result-localname-2.srj?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/result-localname-3.srj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/result-localname-3.srj?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/result-localname-4.srj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/result-localname-4.srj?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/result-localname-5.srj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/result-localname-5.srj?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/result-uppercase-1.srj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/result-uppercase-1.srj?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/result-uppercase-2.srj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Examples/result-uppercase-2.srj?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Expr/data-1.ttl
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Expr/data-1.ttl?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Expr/data-1.ttl (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Expr/data-1.ttl Thu Nov  3 17:32:36 2011
@@ -1,3 +1,3 @@
-@prefix : <http://example.org/#> .
-
-:x :p :q .
+@prefix : <http://example.org/#> .
+
+:x :p :q .

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Expr/manifest.ttl
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Expr/manifest.ttl?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Expr/manifest.ttl (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Expr/manifest.ttl Thu Nov  3 17:32:36 2011
@@ -1,38 +1,38 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rdfs:	<http://www.w3.org/2000/01/rdf-schema#> .
-@prefix mf:     <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
-@prefix qt:     <http://www.w3.org/2001/sw/DataAccess/tests/test-query#> .
-
-<>  rdf:type mf:Manifest ;
-    rdfs:label "Expressions" ;
-    mf:entries
-    ( 
-      [  mf:name    "Expr 1 - FILTER true" ;
-         mf:action
-            [ qt:query  <q-expr-1.rq> ;
-              qt:data   <data-1.ttl> ] ;
-        mf:result  <result-expr-1.ttl>
-      ]
-      [  mf:name    "Expr 2 - FILTER false" ;
-         mf:action
-            [ qt:query  <q-expr-2.rq> ;
-              qt:data   <data-1.ttl> ] ;
-        mf:result  <result-expr-2.ttl>
-      ]
-      [  mf:name    "Expr 3 - Triple pattern and FILTER true" ;
-         mf:action
-            [ qt:query  <q-expr-3.rq> ;
-              qt:data   <data-1.ttl> ] ;
-        mf:result  <result-expr-3.srx>
-      ]
-
-      [  mf:name    "Expr 4 - Triple pattern and FILTER false" ;
-         mf:action
-            [ qt:query  <q-expr-4.rq> ;
-              qt:data   <data-1.ttl> ] ;
-        mf:result  <result-expr-4.srx>
-      ]
-
-	  # Strings and non-strings.
- 
-    ).
+@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs:	<http://www.w3.org/2000/01/rdf-schema#> .
+@prefix mf:     <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
+@prefix qt:     <http://www.w3.org/2001/sw/DataAccess/tests/test-query#> .
+
+<>  rdf:type mf:Manifest ;
+    rdfs:label "Expressions" ;
+    mf:entries
+    ( 
+      [  mf:name    "Expr 1 - FILTER true" ;
+         mf:action
+            [ qt:query  <q-expr-1.rq> ;
+              qt:data   <data-1.ttl> ] ;
+        mf:result  <result-expr-1.ttl>
+      ]
+      [  mf:name    "Expr 2 - FILTER false" ;
+         mf:action
+            [ qt:query  <q-expr-2.rq> ;
+              qt:data   <data-1.ttl> ] ;
+        mf:result  <result-expr-2.ttl>
+      ]
+      [  mf:name    "Expr 3 - Triple pattern and FILTER true" ;
+         mf:action
+            [ qt:query  <q-expr-3.rq> ;
+              qt:data   <data-1.ttl> ] ;
+        mf:result  <result-expr-3.srx>
+      ]
+
+      [  mf:name    "Expr 4 - Triple pattern and FILTER false" ;
+         mf:action
+            [ qt:query  <q-expr-4.rq> ;
+              qt:data   <data-1.ttl> ] ;
+        mf:result  <result-expr-4.srx>
+      ]
+
+	  # Strings and non-strings.
+ 
+    ).

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Expr/q-expr-1.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Expr/q-expr-1.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Expr/q-expr-1.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Expr/q-expr-1.rq Thu Nov  3 17:32:36 2011
@@ -1,2 +1,2 @@
-SELECT * WHERE { FILTER (true) }
-
+SELECT * WHERE { FILTER (true) }
+

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Expr/q-expr-2.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Expr/q-expr-2.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Expr/q-expr-2.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Expr/q-expr-2.rq Thu Nov  3 17:32:36 2011
@@ -1,2 +1,2 @@
-SELECT * WHERE { FILTER (false) }
-
+SELECT * WHERE { FILTER (false) }
+

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Expr/q-expr-3.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Expr/q-expr-3.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Expr/q-expr-3.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Expr/q-expr-3.rq Thu Nov  3 17:32:36 2011
@@ -1,7 +1,7 @@
-PREFIX : <http://example.org/#> 
-
-SELECT *
-{ :x :p _:a .
-  FILTER ( true )
-}
-
+PREFIX : <http://example.org/#> 
+
+SELECT *
+{ :x :p _:a .
+  FILTER ( true )
+}
+

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Expr/q-expr-4.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Expr/q-expr-4.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Expr/q-expr-4.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Expr/q-expr-4.rq Thu Nov  3 17:32:36 2011
@@ -1,7 +1,7 @@
-PREFIX : <http://example.org/#> 
-
-SELECT *
-{ :x :p _:a .
-  FILTER ( false )
-}
-
+PREFIX : <http://example.org/#> 
+
+SELECT *
+{ :x :p _:a .
+  FILTER ( false )
+}
+

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Expr/result-expr-1.ttl
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Expr/result-expr-1.ttl?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Expr/result-expr-1.ttl (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Expr/result-expr-1.ttl Thu Nov  3 17:32:36 2011
@@ -1,6 +1,6 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-[]    rdf:type      rs:ResultSet ;
-      rs:solution   [ 
-                    ] .
+@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
+@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+
+[]    rdf:type      rs:ResultSet ;
+      rs:solution   [ 
+                    ] .

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Expr/result-expr-2.ttl
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Expr/result-expr-2.ttl?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Expr/result-expr-2.ttl (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Expr/result-expr-2.ttl Thu Nov  3 17:32:36 2011
@@ -1,4 +1,4 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-[]    rdf:type      rs:ResultSet .
+@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
+@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+
+[]    rdf:type      rs:ResultSet .