jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r1197234 [12/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/ Exp...
Date Thu, 03 Nov 2011 17:33:04 GMT
Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-01-results.ttl
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-01-results.ttl?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-01-results.ttl (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-01-results.ttl Thu Nov  3 17:32:36 2011
@@ -1,18 +1,18 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix :        <http://example.org/ns#> .
-@prefix fn:      <http://example.org/functions#> .
-
-[]    rdf:type    rs:ResultSet ;
-      rs:resultVariable  "z" ;
-      .
-##       rs:solution
-##                   [ rs:binding  [ rs:value    4 ;
-##                                   rs:variable  "z"
-##                                 ]
-##                   ] ;
-##       rs:solution
-##                   [ rs:binding  [ rs:value    2 ;
-##                                   rs:variable  "z"
-##                                 ]
-##                   ] .
+@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
+@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix :        <http://example.org/ns#> .
+@prefix fn:      <http://example.org/functions#> .
+
+[]    rdf:type    rs:ResultSet ;
+      rs:resultVariable  "z" ;
+      .
+##       rs:solution
+##                   [ rs:binding  [ rs:value    4 ;
+##                                   rs:variable  "z"
+##                                 ]
+##                   ] ;
+##       rs:solution
+##                   [ rs:binding  [ rs:value    2 ;
+##                                   rs:variable  "z"
+##                                 ]
+##                   ] .

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-01.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-01.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-01.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-01.rq Thu Nov  3 17:32:36 2011
@@ -1,8 +1,8 @@
-PREFIX  : <http://example.org/ns#>
-PREFIX  fn: <http://example.org/functions#>
-SELECT  ?z
-WHERE
-    { ?x :p ?z . 
-      FILTER fn:noSuchFunction(?z) .
-    }
+PREFIX  : <http://example.org/ns#>
+PREFIX  fn: <http://example.org/functions#>
+SELECT  ?z
+WHERE
+    { ?x :p ?z . 
+      FILTER fn:noSuchFunction(?z) .
+    }
  
\ No newline at end of file

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

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-02.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-02.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-02.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-02.rq Thu Nov  3 17:32:36 2011
@@ -1,7 +1,7 @@
-PREFIX  : <http://example.org/ns#>
-PREFIX  fn: <http://example.org/functions#>
-SELECT  ?z
-WHERE
-    { ?x :p ?z . 
-      FILTER fn:unknown(?z) .
-    }
+PREFIX  : <http://example.org/ns#>
+PREFIX  fn: <http://example.org/functions#>
+SELECT  ?z
+WHERE
+    { ?x :p ?z . 
+      FILTER fn:unknown(?z) .
+    }

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-03-results.ttl
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-03-results.ttl?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-03-results.ttl (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-03-results.ttl Thu Nov  3 17:32:36 2011
@@ -1,17 +1,17 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix :        <http://example.org/ns#> .
-@prefix fn:      <http://example.org/functions#> .
-
-[]    rdf:type    rs:ResultSet ;
-      rs:resultVariable  "z" ;
-      rs:solution
-                  [ rs:binding  [ rs:value    4 ;
-                                  rs:variable  "z"
-                                ]
-                  ] ;
-      rs:solution
-                  [ rs:binding  [ rs:value    2 ;
-                                  rs:variable  "z"
-                                ]
-                  ] .
+@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
+@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix :        <http://example.org/ns#> .
+@prefix fn:      <http://example.org/functions#> .
+
+[]    rdf:type    rs:ResultSet ;
+      rs:resultVariable  "z" ;
+      rs:solution
+                  [ rs:binding  [ rs:value    4 ;
+                                  rs:variable  "z"
+                                ]
+                  ] ;
+      rs:solution
+                  [ rs:binding  [ rs:value    2 ;
+                                  rs:variable  "z"
+                                ]
+                  ] .

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-03.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-03.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-03.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-03.rq Thu Nov  3 17:32:36 2011
@@ -1,8 +1,8 @@
-PREFIX  :        <http://example.org/ns#>
-PREFIX  jfn:     <http://jena.hpl.hp.com/ARQ/function#>
-
-SELECT  ?z
-WHERE
-    { ?x :p ?z . 
-      FILTER jfn:evenInteger(?z) .
-    }
+PREFIX  :        <http://example.org/ns#>
+PREFIX  jfn:     <http://jena.hpl.hp.com/ARQ/function#>
+
+SELECT  ?z
+WHERE
+    { ?x :p ?z . 
+      FILTER jfn:evenInteger(?z) .
+    }

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-04-results.ttl
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-04-results.ttl?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-04-results.ttl (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-04-results.ttl Thu Nov  3 17:32:36 2011
@@ -1,17 +1,17 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix :        <http://example.org/ns#> .
-@prefix fn:      <http://example.org/functions#> .
-
-[]    rdf:type    rs:ResultSet ;
-      rs:resultVariable  "z" ;
-      rs:solution
-                  [ rs:binding  [ rs:value    4 ;
-                                  rs:variable  "z"
-                                ]
-                  ] ;
-      rs:solution
-                  [ rs:binding  [ rs:value    2 ;
-                                  rs:variable  "z"
-                                ]
-                  ] .
+@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
+@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix :        <http://example.org/ns#> .
+@prefix fn:      <http://example.org/functions#> .
+
+[]    rdf:type    rs:ResultSet ;
+      rs:resultVariable  "z" ;
+      rs:solution
+                  [ rs:binding  [ rs:value    4 ;
+                                  rs:variable  "z"
+                                ]
+                  ] ;
+      rs:solution
+                  [ rs:binding  [ rs:value    2 ;
+                                  rs:variable  "z"
+                                ]
+                  ] .

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-04.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-04.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-04.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-04.rq Thu Nov  3 17:32:36 2011
@@ -1,8 +1,8 @@
-PREFIX  :       <http://example.org/ns#>
-PREFIX  jfn:    <http://jena.hpl.hp.com/ARQ/function#>
-
-SELECT  ?z
-WHERE
-    { ?x :p ?z . 
-      FILTER jfn:evenInteger(?z) .
-    }
+PREFIX  :       <http://example.org/ns#>
+PREFIX  jfn:    <http://jena.hpl.hp.com/ARQ/function#>
+
+SELECT  ?z
+WHERE
+    { ?x :p ?z . 
+      FILTER jfn:evenInteger(?z) .
+    }

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-sha1sum-1.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-sha1sum-1.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-sha1sum-1.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-sha1sum-1.rq Thu Nov  3 17:32:36 2011
@@ -1,12 +1,12 @@
-PREFIX  rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-PREFIX  foaf:   <http://xmlns.com/foaf/0.1/>
-PREFIX  jfn:    <http://jena.hpl.hp.com/ARQ/function#>
-
-SELECT ?name
-{ ?x a foaf:Person ;
-     foaf:mbox ?mbox .
-  FILTER ( jfn:sha1sum(?mbox) = jfn:sha1sum("mailto:person@example.org") )
-  ?x foaf:name ?name .
-}
-
-
+PREFIX  rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX  foaf:   <http://xmlns.com/foaf/0.1/>
+PREFIX  jfn:    <http://jena.hpl.hp.com/ARQ/function#>
+
+SELECT ?name
+{ ?x a foaf:Person ;
+     foaf:mbox ?mbox .
+  FILTER ( jfn:sha1sum(?mbox) = jfn:sha1sum("mailto:person@example.org") )
+  ?x foaf:name ?name .
+}
+
+

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-sha1sum-2.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-sha1sum-2.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-sha1sum-2.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/func-sha1sum-2.rq Thu Nov  3 17:32:36 2011
@@ -1,13 +1,13 @@
-PREFIX  rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-PREFIX  foaf:   <http://xmlns.com/foaf/0.1/>
-PREFIX  jfn:    <http://jena.hpl.hp.com/ARQ/function#>
-
-SELECT ?name
-{ ?x a foaf:Person ;
-     foaf:mbox ?mbox2 .
-  ?y a foaf:Person ;
-     foaf:mbox ?mbox1 .
-  FILTER ( jfn:sha1sum(?mbox1) = jfn:sha1sum(?mbox2) )
-  FILTER ( ?x != ?y )
-  ?x foaf:name ?name .
-}
+PREFIX  rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX  foaf:   <http://xmlns.com/foaf/0.1/>
+PREFIX  jfn:    <http://jena.hpl.hp.com/ARQ/function#>
+
+SELECT ?name
+{ ?x a foaf:Person ;
+     foaf:mbox ?mbox2 .
+  ?y a foaf:Person ;
+     foaf:mbox ?mbox1 .
+  FILTER ( jfn:sha1sum(?mbox1) = jfn:sha1sum(?mbox2) )
+  FILTER ( ?x != ?y )
+  ?x foaf:name ?name .
+}

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/lang-1-results.srx
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/lang-1-results.srx?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/lang-1-results.srx (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/lang-1-results.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 ordered="false" distinct="false">
-    <result>
-      <binding name="v">
-        <literal xml:lang="en">foo</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal xml:lang="en-gb">foo</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 ordered="false" distinct="false">
+    <result>
+      <binding name="v">
+        <literal xml:lang="en">foo</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en-gb">foo</literal>
+      </binding>
+    </result>
+  </results>
+</sparql>

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/lang-2-results.srx
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/lang-2-results.srx?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/lang-2-results.srx (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/lang-2-results.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 ordered="false" distinct="false">
-    <result>
-      <binding name="v">
-        <literal>foo</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="fr">foo</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal xml:lang="xx-en">foo</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 ordered="false" distinct="false">
+    <result>
+      <binding name="v">
+        <literal>foo</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="fr">foo</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="xx-en">foo</literal>
+      </binding>
+    </result>
+  </results>
+</sparql>

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/localname-1.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/localname-1.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/localname-1.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/localname-1.rq Thu Nov  3 17:32:36 2011
@@ -1,8 +1,8 @@
-PREFIX  jfn:  <http://jena.hpl.hp.com/ARQ/function#>
-PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-PREFIX     :  <http://example.org/> 
-
-SELECT ?s
-{ ?s ?p ?o
-  FILTER ( jfn:localname(?p) = "list")
-}
+PREFIX  jfn:  <http://jena.hpl.hp.com/ARQ/function#>
+PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX     :  <http://example.org/> 
+
+SELECT ?s
+{ ?s ?p ?o
+  FILTER ( jfn:localname(?p) = "list")
+}

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

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/manifest.ttl
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/manifest.ttl?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/manifest.ttl (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/manifest.ttl Thu Nov  3 17:32:36 2011
@@ -1,140 +1,140 @@
-@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 "Function" ;
-    mf:entries
-    ( 
-     [  mf:name    "Function - unknown" ;
-         mf:action
-            [ qt:query  <func-01.rq> ;
-              qt:data   <data-1.ttl> ] ;
-         mf:result  <func-01-results.ttl>
-      ]
-      [  mf:name    "Function - known, registered" ;
-         mf:action
-            [ qt:query  <func-02.rq> ;
-              qt:data   <data-1.ttl> ] ;
-         mf:result  <func-02-results.ttl>
-      ]
-
-      [  mf:name    "Function - loaded as <java:>" ;
-         mf:action
-            [ qt:query  <func-03.rq> ;
-              qt:data   <data-1.ttl> ] ;
-         mf:result  <func-03-results.ttl>
-      ]
-
-      [  mf:name    "Function - loaded via known library prefix" ;
-         mf:action
-            [ qt:query  <func-04.rq> ;
-              qt:data   <data-1.ttl> ] ;
-         mf:result  <func-04-results.ttl>
-      ]
-
-      [  mf:name    "Lang 1" ;
-         mf:action
-            [ qt:query  <q-lang-1.rq> ;
-              qt:data   <data-2.ttl> ] ;
-        mf:result  <lang-1-results.srx>
-      ]
-      [  mf:name    "Lang 2" ;
-         mf:action
-            [ qt:query  <q-lang-2.rq> ;
-              qt:data   <data-2.ttl> ] ;
-        mf:result  <lang-2-results.srx>
-      ]
-
-      [  mf:name    "sha1sum 1" ;
-         mf:action
-            [ qt:query  <func-sha1sum-1.rq> ;
-              qt:data   <data-3.ttl> ] ;
-        mf:result  <sha1sum-1-results.srx>
-      ]
-
-      [  mf:name    "sha1sum 2" ;
-         mf:action
-            [ qt:query  <func-sha1sum-2.rq> ;
-              qt:data   <data-3.ttl> ] ;
-        mf:result  <sha1sum-2-results.srx>
-      ]
-
-      [  mf:name    "substring - 1" ;
-         mf:action
-            [ qt:query  <substring-1.rq> ;
-              qt:data   <data-6.ttl> ] ;
-        mf:result  <substring-1.srx>
-      ]
-
-      [  mf:name    "substring - 2" ;
-         mf:action
-            [ qt:query  <substring-2.rq> ;
-              qt:data   <data-6.ttl> ] ;
-        mf:result  <substring-2.srx>
-      ]
-
-      [  mf:name    "substring - 3" ;
-         mf:action
-            [ qt:query  <substring-3.rq> ;
-              qt:data   <data-6.ttl> ] ;
-        mf:result  <substring-3.srx>
-      ]
-
-      [  mf:name    "strlen - 1" ;
-         mf:action
-            [ qt:query  <strlen-1.rq> ;
-              qt:data   <data-6.ttl> ] ;
-        mf:result  <strlen-1.srj>
-      ]
-
-      [  mf:name    "strlen - 2" ;
-         mf:action
-            [ qt:query  <strlen-2.rq> ;
-              qt:data   <data-6.ttl> ] ;
-        mf:result  <strlen-2.srj>
-      ]
-
-      [ mf:name     "Localname - 1" ;
-        mf:action
-            [ qt:query  <localname-1.rq> ;
-              qt:data   <data-5.ttl> ] ;
-        mf:result  <localname-1.srj>
-      ]
-
-      [ mf:name     "Namespace - 1" ;
-        mf:action
-            [ qt:query  <namespace-1.rq> ;
-              qt:data   <data-5.ttl> ] ;
-        mf:result  <namespace-1.srj>
-      ]
-
-      [ mf:name     "Concat - 1" ;
-        mf:action
-            [ qt:query  <concat-1.arq> ;
-              qt:data   <data-0.ttl> ] ;
-        mf:result  <concat-1.srj>
-      ]
-
-      [ mf:name     "Concat - 2" ;
-        mf:action
-            [ qt:query  <concat-2.arq> ;
-              qt:data   <data-0.ttl> ] ;
-        mf:result  <concat-2.srj>
-      ]
-
-      [ mf:name     "strjoin - 1" ;
-        mf:action
-            [ qt:query  <strjoin-1.arq> ;
-              qt:data   <data-0.ttl> ] ;
-        mf:result  <strjoin-1.srj>
-      ]
-
-      [ mf:name     "strjoin - 2" ;
-        mf:action
-            [ qt:query  <strjoin-2.arq> ;
-              qt:data   <data-0.ttl> ] ;
-        mf:result  <strjoin-2.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 qt:     <http://www.w3.org/2001/sw/DataAccess/tests/test-query#> .
+
+<>  rdf:type mf:Manifest ;
+    rdfs:label "Function" ;
+    mf:entries
+    ( 
+     [  mf:name    "Function - unknown" ;
+         mf:action
+            [ qt:query  <func-01.rq> ;
+              qt:data   <data-1.ttl> ] ;
+         mf:result  <func-01-results.ttl>
+      ]
+      [  mf:name    "Function - known, registered" ;
+         mf:action
+            [ qt:query  <func-02.rq> ;
+              qt:data   <data-1.ttl> ] ;
+         mf:result  <func-02-results.ttl>
+      ]
+
+      [  mf:name    "Function - loaded as <java:>" ;
+         mf:action
+            [ qt:query  <func-03.rq> ;
+              qt:data   <data-1.ttl> ] ;
+         mf:result  <func-03-results.ttl>
+      ]
+
+      [  mf:name    "Function - loaded via known library prefix" ;
+         mf:action
+            [ qt:query  <func-04.rq> ;
+              qt:data   <data-1.ttl> ] ;
+         mf:result  <func-04-results.ttl>
+      ]
+
+      [  mf:name    "Lang 1" ;
+         mf:action
+            [ qt:query  <q-lang-1.rq> ;
+              qt:data   <data-2.ttl> ] ;
+        mf:result  <lang-1-results.srx>
+      ]
+      [  mf:name    "Lang 2" ;
+         mf:action
+            [ qt:query  <q-lang-2.rq> ;
+              qt:data   <data-2.ttl> ] ;
+        mf:result  <lang-2-results.srx>
+      ]
+
+      [  mf:name    "sha1sum 1" ;
+         mf:action
+            [ qt:query  <func-sha1sum-1.rq> ;
+              qt:data   <data-3.ttl> ] ;
+        mf:result  <sha1sum-1-results.srx>
+      ]
+
+      [  mf:name    "sha1sum 2" ;
+         mf:action
+            [ qt:query  <func-sha1sum-2.rq> ;
+              qt:data   <data-3.ttl> ] ;
+        mf:result  <sha1sum-2-results.srx>
+      ]
+
+      [  mf:name    "substring - 1" ;
+         mf:action
+            [ qt:query  <substring-1.rq> ;
+              qt:data   <data-6.ttl> ] ;
+        mf:result  <substring-1.srx>
+      ]
+
+      [  mf:name    "substring - 2" ;
+         mf:action
+            [ qt:query  <substring-2.rq> ;
+              qt:data   <data-6.ttl> ] ;
+        mf:result  <substring-2.srx>
+      ]
+
+      [  mf:name    "substring - 3" ;
+         mf:action
+            [ qt:query  <substring-3.rq> ;
+              qt:data   <data-6.ttl> ] ;
+        mf:result  <substring-3.srx>
+      ]
+
+      [  mf:name    "strlen - 1" ;
+         mf:action
+            [ qt:query  <strlen-1.rq> ;
+              qt:data   <data-6.ttl> ] ;
+        mf:result  <strlen-1.srj>
+      ]
+
+      [  mf:name    "strlen - 2" ;
+         mf:action
+            [ qt:query  <strlen-2.rq> ;
+              qt:data   <data-6.ttl> ] ;
+        mf:result  <strlen-2.srj>
+      ]
+
+      [ mf:name     "Localname - 1" ;
+        mf:action
+            [ qt:query  <localname-1.rq> ;
+              qt:data   <data-5.ttl> ] ;
+        mf:result  <localname-1.srj>
+      ]
+
+      [ mf:name     "Namespace - 1" ;
+        mf:action
+            [ qt:query  <namespace-1.rq> ;
+              qt:data   <data-5.ttl> ] ;
+        mf:result  <namespace-1.srj>
+      ]
+
+      [ mf:name     "Concat - 1" ;
+        mf:action
+            [ qt:query  <concat-1.arq> ;
+              qt:data   <data-0.ttl> ] ;
+        mf:result  <concat-1.srj>
+      ]
+
+      [ mf:name     "Concat - 2" ;
+        mf:action
+            [ qt:query  <concat-2.arq> ;
+              qt:data   <data-0.ttl> ] ;
+        mf:result  <concat-2.srj>
+      ]
+
+      [ mf:name     "strjoin - 1" ;
+        mf:action
+            [ qt:query  <strjoin-1.arq> ;
+              qt:data   <data-0.ttl> ] ;
+        mf:result  <strjoin-1.srj>
+      ]
+
+      [ mf:name     "strjoin - 2" ;
+        mf:action
+            [ qt:query  <strjoin-2.arq> ;
+              qt:data   <data-0.ttl> ] ;
+        mf:result  <strjoin-2.srj>
+      ]
+    ).

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/namespace-1.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/namespace-1.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/namespace-1.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/namespace-1.rq Thu Nov  3 17:32:36 2011
@@ -1,8 +1,8 @@
-PREFIX  jfn:  <http://jena.hpl.hp.com/ARQ/function#>
-PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-PREFIX     :  <http://example.org/> 
-
-SELECT DISTINCT ?p
-{ ?s ?p ?o
-  FILTER ( jfn:namespace(?p) = str(rdf:) )
-}
+PREFIX  jfn:  <http://jena.hpl.hp.com/ARQ/function#>
+PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX     :  <http://example.org/> 
+
+SELECT DISTINCT ?p
+{ ?s ?p ?o
+  FILTER ( jfn:namespace(?p) = str(rdf:) )
+}

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

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/q-lang-1.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/q-lang-1.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/q-lang-1.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/q-lang-1.rq Thu Nov  3 17:32:36 2011
@@ -1,7 +1,7 @@
-PREFIX  jfn:  <http://jena.hpl.hp.com/ARQ/function#>
-PREFIX  rdfs: <http://www.w3.org/2000/01/rdf-schema#>
-
-SELECT ?v
-{ ?x ?p ?v .
-  FILTER jfn:langeq(?v, "EN" )
-}
+PREFIX  jfn:  <http://jena.hpl.hp.com/ARQ/function#>
+PREFIX  rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+
+SELECT ?v
+{ ?x ?p ?v .
+  FILTER jfn:langeq(?v, "EN" )
+}

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/q-lang-2.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/q-lang-2.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/q-lang-2.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/q-lang-2.rq Thu Nov  3 17:32:36 2011
@@ -1,6 +1,6 @@
-PREFIX  jfn:  <http://jena.hpl.hp.com/ARQ/function#>
-
-SELECT ?v
-{ ?x ?p ?v .
-  FILTER ( ! jfn:langeq(?v, "en" ) )
-}
+PREFIX  jfn:  <http://jena.hpl.hp.com/ARQ/function#>
+
+SELECT ?v
+{ ?x ?p ?v .
+  FILTER ( ! jfn:langeq(?v, "en" ) )
+}

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/sha1sum-1-results.srx
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/sha1sum-1-results.srx?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/sha1sum-1-results.srx (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/sha1sum-1-results.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="name"/>
-  </head>
-  <results ordered="false" distinct="false">
-    <result>
-      <binding name="name">
-        <literal>P1</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="name">
-        <literal>P1 (alt)</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="name"/>
+  </head>
+  <results ordered="false" distinct="false">
+    <result>
+      <binding name="name">
+        <literal>P1</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="name">
+        <literal>P1 (alt)</literal>
+      </binding>
+    </result>
+  </results>
+</sparql>

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/sha1sum-2-results.srx
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/sha1sum-2-results.srx?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/sha1sum-2-results.srx (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/sha1sum-2-results.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="name"/>
-  </head>
-  <results ordered="false" distinct="false">
-    <result>
-      <binding name="name">
-        <literal>P1</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="name">
-        <literal>P1 (alt)</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="name"/>
+  </head>
+  <results ordered="false" distinct="false">
+    <result>
+      <binding name="name">
+        <literal>P1</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="name">
+        <literal>P1 (alt)</literal>
+      </binding>
+    </result>
+  </results>
+</sparql>

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/strjoin-1.arq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/strjoin-1.arq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/strjoin-1.arq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/strjoin-1.arq Thu Nov  3 17:32:36 2011
@@ -1,4 +1,4 @@
-PREFIX fn:      <http://www.w3.org/2005/xpath-functions#>
-PREFIX  afn:     <http://jena.hpl.hp.com/ARQ/function#>
-
-SELECT ?X { let ( ?X := afn:strjoin("--", <http://example/> , 'a' , 1 ) ) }
+PREFIX fn:      <http://www.w3.org/2005/xpath-functions#>
+PREFIX  afn:     <http://jena.hpl.hp.com/ARQ/function#>
+
+SELECT ?X { let ( ?X := afn:strjoin("--", <http://example/> , 'a' , 1 ) ) }

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

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/strjoin-2.arq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/strjoin-2.arq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/strjoin-2.arq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/strjoin-2.arq Thu Nov  3 17:32:36 2011
@@ -1,7 +1,7 @@
-PREFIX fn:      <http://www.w3.org/2005/xpath-functions#>
-PREFIX  afn:     <http://jena.hpl.hp.com/ARQ/function#>
-
-SELECT * { 
-    let ( ?X := afn:strjoin(",") )
-    let ( ?Y := afn:strjoin(",", 'a') )
- }
+PREFIX fn:      <http://www.w3.org/2005/xpath-functions#>
+PREFIX  afn:     <http://jena.hpl.hp.com/ARQ/function#>
+
+SELECT * { 
+    let ( ?X := afn:strjoin(",") )
+    let ( ?Y := afn:strjoin(",", 'a') )
+ }

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

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/strlen-1.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/strlen-1.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/strlen-1.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/strlen-1.rq Thu Nov  3 17:32:36 2011
@@ -1,7 +1,7 @@
-PREFIX  jfn:  <http://jena.hpl.hp.com/ARQ/function#>
-PREFIX  : <http://example/> 
-
-SELECT ?p ?v
-{ :x ?p ?v . 
-  FILTER ( jfn:strlen(?v) = 1 )
-}
+PREFIX  jfn:  <http://jena.hpl.hp.com/ARQ/function#>
+PREFIX  : <http://example/> 
+
+SELECT ?p ?v
+{ :x ?p ?v . 
+  FILTER ( jfn:strlen(?v) = 1 )
+}

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

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/strlen-2.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/strlen-2.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/strlen-2.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/strlen-2.rq Thu Nov  3 17:32:36 2011
@@ -1,7 +1,7 @@
-PREFIX  jfn:  <http://jena.hpl.hp.com/ARQ/function#>
-PREFIX  : <http://example/> 
-
-SELECT ?p ?v
-{ :x ?p ?v . 
-  FILTER ( jfn:strlen(?v) = 0 )
-}
+PREFIX  jfn:  <http://jena.hpl.hp.com/ARQ/function#>
+PREFIX  : <http://example/> 
+
+SELECT ?p ?v
+{ :x ?p ?v . 
+  FILTER ( jfn:strlen(?v) = 0 )
+}

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

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/substring-1.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/substring-1.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/substring-1.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/substring-1.rq Thu Nov  3 17:32:36 2011
@@ -1,7 +1,7 @@
-PREFIX  jfn:  <http://jena.hpl.hp.com/ARQ/function#>
-PREFIX  : <http://example/> 
-
-SELECT ?p ?v
-{ :x ?p ?v . 
-  FILTER ( jfn:substring(?v,1,2) < "g")
-}
+PREFIX  jfn:  <http://jena.hpl.hp.com/ARQ/function#>
+PREFIX  : <http://example/> 
+
+SELECT ?p ?v
+{ :x ?p ?v . 
+  FILTER ( jfn:substring(?v,1,2) < "g")
+}

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/substring-1.srx
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/substring-1.srx?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/substring-1.srx (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/substring-1.srx Thu Nov  3 17:32:36 2011
@@ -1,20 +1,20 @@
-<?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="p"/>
-    <variable name="v"/>
-  </head>
-  <results ordered="false" distinct="false">
-    <result>
-      <binding name="p">
-        <uri>http://example/p3</uri>
-      </binding>
-      <binding name="v">
-        <literal>bar</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="p"/>
+    <variable name="v"/>
+  </head>
+  <results ordered="false" distinct="false">
+    <result>
+      <binding name="p">
+        <uri>http://example/p3</uri>
+      </binding>
+      <binding name="v">
+        <literal>bar</literal>
+      </binding>
+    </result>
+  </results>
+</sparql>

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/substring-2.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/substring-2.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/substring-2.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/substring-2.rq Thu Nov  3 17:32:36 2011
@@ -1,7 +1,7 @@
-PREFIX  jfn:  <http://jena.hpl.hp.com/ARQ/function#>
-PREFIX  : <http://example/> 
-
-SELECT ?p ?v
-{ :x ?p ?v . 
-  FILTER ( jfn:substr(?v,1) = "ar")
-}
+PREFIX  jfn:  <http://jena.hpl.hp.com/ARQ/function#>
+PREFIX  : <http://example/> 
+
+SELECT ?p ?v
+{ :x ?p ?v . 
+  FILTER ( jfn:substr(?v,1) = "ar")
+}

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/substring-2.srx
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/substring-2.srx?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/substring-2.srx (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/substring-2.srx Thu Nov  3 17:32:36 2011
@@ -1,20 +1,20 @@
-<?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="p"/>
-    <variable name="v"/>
-  </head>
-  <results ordered="false" distinct="false">
-    <result>
-      <binding name="p">
-        <uri>http://example/p3</uri>
-      </binding>
-      <binding name="v">
-        <literal>bar</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="p"/>
+    <variable name="v"/>
+  </head>
+  <results ordered="false" distinct="false">
+    <result>
+      <binding name="p">
+        <uri>http://example/p3</uri>
+      </binding>
+      <binding name="v">
+        <literal>bar</literal>
+      </binding>
+    </result>
+  </results>
+</sparql>

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/substring-3.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/substring-3.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/substring-3.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/substring-3.rq Thu Nov  3 17:32:36 2011
@@ -1,7 +1,7 @@
-PREFIX  jfn:  <http://jena.hpl.hp.com/ARQ/function#>
-PREFIX  : <http://example/> 
-
-SELECT ?p ?v
-{ :x ?p ?v . 
-  FILTER ( jfn:substr(?v,9) )
-}
+PREFIX  jfn:  <http://jena.hpl.hp.com/ARQ/function#>
+PREFIX  : <http://example/> 
+
+SELECT ?p ?v
+{ :x ?p ?v . 
+  FILTER ( jfn:substr(?v,9) )
+}

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/substring-3.srx
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/substring-3.srx?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/substring-3.srx (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Function/substring-3.srx Thu Nov  3 17:32:36 2011
@@ -1,12 +1,12 @@
-<?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="p"/>
-    <variable name="v"/>
-  </head>
-  <results ordered="false" distinct="false">
-  </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="p"/>
+    <variable name="v"/>
+  </head>
+  <results ordered="false" distinct="false">
+  </results>
+</sparql>

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/General/bad-lex-1.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/General/bad-lex-1.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/General/bad-lex-1.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/General/bad-lex-1.rq Thu Nov  3 17:32:36 2011
@@ -1,7 +1,7 @@
-PREFIX  :	    <http://example/ns#>
-PREFIX  xsd:    <http://www.w3.org/2001/XMLSchema#>
-
-# Bad lexicial form in query
-SELECT *
-{ ?x :p ?v . FILTER (?v >= "2"^^xsd:negativeInteger)
-}
+PREFIX  :	    <http://example/ns#>
+PREFIX  xsd:    <http://www.w3.org/2001/XMLSchema#>
+
+# Bad lexicial form in query
+SELECT *
+{ ?x :p ?v . FILTER (?v >= "2"^^xsd:negativeInteger)
+}

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/General/bad-lex-1.ttl
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/General/bad-lex-1.ttl?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/General/bad-lex-1.ttl (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/General/bad-lex-1.ttl Thu Nov  3 17:32:36 2011
@@ -1,9 +1,9 @@
-@prefix  :	    <http://example/ns#> .
-@prefix  xsd:    <http://www.w3.org/2001/XMLSchema#> .
-
-:x1 :p  4 .
-:x2 :p  -4 .
-:x3 :p  "-4"^^xsd:negativeInteger .
-## :x4 :p  "4"^^xsd:negativeInteger .      # Bad data.
-
-
+@prefix  :	    <http://example/ns#> .
+@prefix  xsd:    <http://www.w3.org/2001/XMLSchema#> .
+
+:x1 :p  4 .
+:x2 :p  -4 .
+:x3 :p  "-4"^^xsd:negativeInteger .
+## :x4 :p  "4"^^xsd:negativeInteger .      # Bad data.
+
+

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/General/bad-lex-2.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/General/bad-lex-2.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/General/bad-lex-2.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/General/bad-lex-2.rq Thu Nov  3 17:32:36 2011
@@ -1,9 +1,9 @@
-PREFIX  :	    <http://example/ns#>
-PREFIX  xsd:    <http://www.w3.org/2001/XMLSchema#>
-
-# Bad lexical form in data
-SELECT *
-{ 
-    ?x :p ?v . 
-    FILTER (?v >= "2"^^xsd:positiveInteger)
-}
+PREFIX  :	    <http://example/ns#>
+PREFIX  xsd:    <http://www.w3.org/2001/XMLSchema#>
+
+# Bad lexical form in data
+SELECT *
+{ 
+    ?x :p ?v . 
+    FILTER (?v >= "2"^^xsd:positiveInteger)
+}

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/General/bad-lex-2.ttl
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/General/bad-lex-2.ttl?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/General/bad-lex-2.ttl (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/General/bad-lex-2.ttl Thu Nov  3 17:32:36 2011
@@ -1,9 +1,9 @@
-@prefix  :	    <http://example/ns#> .
-@prefix  xsd:    <http://www.w3.org/2001/XMLSchema#> .
-
-:x1 :p  4 .
-:x2 :p  -4 .
-:x3 :p  "-4"^^xsd:negativeInteger .
-:x4 :p  "4"^^xsd:negativeInteger .      # Bad data.
-
-
+@prefix  :	    <http://example/ns#> .
+@prefix  xsd:    <http://www.w3.org/2001/XMLSchema#> .
+
+:x1 :p  4 .
+:x2 :p  -4 .
+:x3 :p  "-4"^^xsd:negativeInteger .
+:x4 :p  "4"^^xsd:negativeInteger .      # Bad data.
+
+

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/General/manifest.ttl
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/General/manifest.ttl?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/General/manifest.ttl (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/General/manifest.ttl Thu Nov  3 17:32:36 2011
@@ -1,24 +1,24 @@
-@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 "General" ;
-    # TestSyntax, TestSerialization, TestBadSyntax, TestQuery
-    mf:entries
-    ( 
-      [  mf:name    "Bad lexical form - query" ;
-         mf:action
-            [ qt:query  <bad-lex-1.rq> ;
-              qt:data   <bad-lex-1.ttl> ] ;
-        #mf:result  <RESULT>
-      ]
-      [  mf:name    "Bad lexical form - data" ;
-         mf:action
-            [ qt:query  <bad-lex-2.rq> ;
-              qt:data   <bad-lex-2.ttl> ] ;
-        # mf:result  <RESULT>
-      ]
-    ).
+@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 "General" ;
+    # TestSyntax, TestSerialization, TestBadSyntax, TestQuery
+    mf:entries
+    ( 
+      [  mf:name    "Bad lexical form - query" ;
+         mf:action
+            [ qt:query  <bad-lex-1.rq> ;
+              qt:data   <bad-lex-1.ttl> ] ;
+        #mf:result  <RESULT>
+      ]
+      [  mf:name    "Bad lexical form - data" ;
+         mf:action
+            [ qt:query  <bad-lex-2.rq> ;
+              qt:data   <bad-lex-2.ttl> ] ;
+        # mf:result  <RESULT>
+      ]
+    ).

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/avg-01.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/avg-01.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/avg-01.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/avg-01.rq Thu Nov  3 17:32:36 2011
@@ -1,7 +1,7 @@
-PREFIX : <http://example/>
-PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-
-SELECT (avg(?v) AS ?V)
-{
-    ?x :p ?v
-}
+PREFIX : <http://example/>
+PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+
+SELECT (avg(?v) AS ?V)
+{
+    ?x :p ?v
+}

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-01.arq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-01.arq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-01.arq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-01.arq Thu Nov  3 17:32:36 2011
@@ -1,7 +1,7 @@
-PREFIX : <http://example/>
-PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-
-SELECT count(*)
-{
-    ?x rdf:type :X .
-}
+PREFIX : <http://example/>
+PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+
+SELECT count(*)
+{
+    ?x rdf:type :X .
+}

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-01.srx
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-01.srx?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-01.srx (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-01.srx Thu Nov  3 17:32:36 2011
@@ -1,16 +1,16 @@
-<?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=".1"/>
-  </head>
-  <results>
-    <result>
-      <binding name=".1">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">5</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=".1"/>
+  </head>
+  <results>
+    <result>
+      <binding name=".1">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">5</literal>
+      </binding>
+    </result>
+  </results>
+</sparql>

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-02.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-02.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-02.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-02.rq Thu Nov  3 17:32:36 2011
@@ -1,7 +1,7 @@
-PREFIX : <http://example/>
-PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-
-SELECT (count(*) AS ?count)
-{
-    ?x rdf:type :X .
-}
+PREFIX : <http://example/>
+PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+
+SELECT (count(*) AS ?count)
+{
+    ?x rdf:type :X .
+}

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-02.srx
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-02.srx?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-02.srx (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-02.srx Thu Nov  3 17:32:36 2011
@@ -1,16 +1,16 @@
-<?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="count"/>
-  </head>
-  <results>
-    <result>
-      <binding name="count">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">5</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="count"/>
+  </head>
+  <results>
+    <result>
+      <binding name="count">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">5</literal>
+      </binding>
+    </result>
+  </results>
+</sparql>

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-03.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-03.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-03.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-03.rq Thu Nov  3 17:32:36 2011
@@ -1,9 +1,9 @@
-PREFIX : <http://example/>
-PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-
-SELECT ?p (count(*) AS ?count)
-{
-    ?x rdf:type :X .
-    ?x :p ?p .
-}
-GROUP BY ?p
+PREFIX : <http://example/>
+PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+
+SELECT ?p (count(*) AS ?count)
+{
+    ?x rdf:type :X .
+    ?x :p ?p .
+}
+GROUP BY ?p

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-03.srx
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-03.srx?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-03.srx (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-03.srx Thu Nov  3 17:32:36 2011
@@ -1,36 +1,36 @@
-<?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="p"/>
-    <variable name="count"/>
-  </head>
-  <results>
-    <result>
-      <binding name="p">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-      <binding name="count">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="p">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">4</literal>
-      </binding>
-      <binding name="count">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="p">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">5</literal>
-      </binding>
-      <binding name="count">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</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="p"/>
+    <variable name="count"/>
+  </head>
+  <results>
+    <result>
+      <binding name="p">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
+      </binding>
+      <binding name="count">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="p">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">4</literal>
+      </binding>
+      <binding name="count">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="p">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">5</literal>
+      </binding>
+      <binding name="count">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
+      </binding>
+    </result>
+  </results>
+</sparql>

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-04.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-04.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-04.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-04.rq Thu Nov  3 17:32:36 2011
@@ -1,10 +1,10 @@
-PREFIX : <http://example/>
-PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-
-SELECT ?p (count(*) AS ?count)
-{
-    ?x rdf:type :X .
-    ?x :p ?p .
-    ?x :n ?n .
-}
-GROUP BY ?p
+PREFIX : <http://example/>
+PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+
+SELECT ?p (count(*) AS ?count)
+{
+    ?x rdf:type :X .
+    ?x :p ?p .
+    ?x :n ?n .
+}
+GROUP BY ?p

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-04.srx
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-04.srx?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-04.srx (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-04.srx Thu Nov  3 17:32:36 2011
@@ -1,36 +1,36 @@
-<?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="p"/>
-    <variable name="count"/>
-  </head>
-  <results>
-    <result>
-      <binding name="p">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-      <binding name="count">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="p">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">4</literal>
-      </binding>
-      <binding name="count">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="p">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">5</literal>
-      </binding>
-      <binding name="count">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</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="p"/>
+    <variable name="count"/>
+  </head>
+  <results>
+    <result>
+      <binding name="p">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
+      </binding>
+      <binding name="count">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="p">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">4</literal>
+      </binding>
+      <binding name="count">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="p">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">5</literal>
+      </binding>
+      <binding name="count">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</literal>
+      </binding>
+    </result>
+  </results>
+</sparql>

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-05.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-05.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-05.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-05.rq Thu Nov  3 17:32:36 2011
@@ -1,12 +1,12 @@
-PREFIX  rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-PREFIX  :       <http://example/>
-PREFIX  dc:     <http://purl.org/dc/elements/1.1/>
-
-SELECT ?p (count(*) AS ?c) (count(distinct *) AS ?cd) 
-{
-    # UNION is asymmetric in what it generates
-    { ?x rdf:type :X . } UNION { ?x rdf:type :X . FILTER (?x != :x2 )}
-    # and :x2 :p 2 with ":p 2" occuring twice.
-    ?x :p ?p .
-}
-GROUP BY ?p
+PREFIX  rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX  :       <http://example/>
+PREFIX  dc:     <http://purl.org/dc/elements/1.1/>
+
+SELECT ?p (count(*) AS ?c) (count(distinct *) AS ?cd) 
+{
+    # UNION is asymmetric in what it generates
+    { ?x rdf:type :X . } UNION { ?x rdf:type :X . FILTER (?x != :x2 )}
+    # and :x2 :p 2 with ":p 2" occuring twice.
+    ?x :p ?p .
+}
+GROUP BY ?p

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-05.srx
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-05.srx?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-05.srx (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-05.srx Thu Nov  3 17:32:36 2011
@@ -1,46 +1,46 @@
-<?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="p"/>
-    <variable name="c"/>
-    <variable name="cd"/>
-  </head>
-  <results>
-    <result>
-      <binding name="p">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-      <binding name="c">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</literal>
-      </binding>
-      <binding name="cd">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="p">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">4</literal>
-      </binding>
-      <binding name="c">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-      <binding name="cd">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="p">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">5</literal>
-      </binding>
-      <binding name="c">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">4</literal>
-      </binding>
-      <binding name="cd">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</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="p"/>
+    <variable name="c"/>
+    <variable name="cd"/>
+  </head>
+  <results>
+    <result>
+      <binding name="p">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
+      </binding>
+      <binding name="c">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</literal>
+      </binding>
+      <binding name="cd">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="p">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">4</literal>
+      </binding>
+      <binding name="c">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
+      </binding>
+      <binding name="cd">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="p">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">5</literal>
+      </binding>
+      <binding name="c">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">4</literal>
+      </binding>
+      <binding name="cd">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
+      </binding>
+    </result>
+  </results>
+</sparql>

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-06.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-06.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-06.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-06.rq Thu Nov  3 17:32:36 2011
@@ -1,13 +1,13 @@
-PREFIX  rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-PREFIX  :       <http://example/>
-PREFIX  dc:     <http://purl.org/dc/elements/1.1/>
-
-SELECT ?p (count(?n) AS ?num) (count(distinct ?n) AS ?numD)
-{
-    # UNION is asymmetric in what it generates
-    { ?x rdf:type :X . } UNION { ?x rdf:type :X . FILTER (?x != :x2 )}
-    # and :x2 :p 2 with ":p 2" occuring twice.
-    OPTIONAL { ?x :p ?p . }
-    OPTIONAL { ?x :n ?n . }
-}
-GROUP BY ?p
+PREFIX  rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX  :       <http://example/>
+PREFIX  dc:     <http://purl.org/dc/elements/1.1/>
+
+SELECT ?p (count(?n) AS ?num) (count(distinct ?n) AS ?numD)
+{
+    # UNION is asymmetric in what it generates
+    { ?x rdf:type :X . } UNION { ?x rdf:type :X . FILTER (?x != :x2 )}
+    # and :x2 :p 2 with ":p 2" occuring twice.
+    OPTIONAL { ?x :p ?p . }
+    OPTIONAL { ?x :n ?n . }
+}
+GROUP BY ?p

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-06.srx
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-06.srx?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-06.srx (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-06.srx Thu Nov  3 17:32:36 2011
@@ -1,46 +1,46 @@
-<?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="p"/>
-    <variable name="num"/>
-    <variable name="numD"/>
-  </head>
-  <results>
-    <result>
-      <binding name="p">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-      <binding name="num">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</literal>
-      </binding>
-      <binding name="numD">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="p">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">4</literal>
-      </binding>
-      <binding name="num">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">4</literal>
-      </binding>
-      <binding name="numD">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="p">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">5</literal>
-      </binding>
-      <binding name="num">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">6</literal>
-      </binding>
-      <binding name="numD">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</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="p"/>
+    <variable name="num"/>
+    <variable name="numD"/>
+  </head>
+  <results>
+    <result>
+      <binding name="p">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
+      </binding>
+      <binding name="num">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</literal>
+      </binding>
+      <binding name="numD">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="p">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">4</literal>
+      </binding>
+      <binding name="num">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">4</literal>
+      </binding>
+      <binding name="numD">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="p">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">5</literal>
+      </binding>
+      <binding name="num">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">6</literal>
+      </binding>
+      <binding name="numD">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
+      </binding>
+    </result>
+  </results>
+</sparql>

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-07.srx
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-07.srx?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-07.srx (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-07.srx Thu Nov  3 17:32:36 2011
@@ -1,20 +1,20 @@
-<?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="c1"/>
-    <variable name="c2"/>
-  </head>
-  <results>
-    <result>
-      <binding name="c1">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">5</literal>
-      </binding>
-      <binding name="c2">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">5</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="c1"/>
+    <variable name="c2"/>
+  </head>
+  <results>
+    <result>
+      <binding name="c1">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">5</literal>
+      </binding>
+      <binding name="c2">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">5</literal>
+      </binding>
+    </result>
+  </results>
+</sparql>

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-10.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-10.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-10.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-10.rq Thu Nov  3 17:32:36 2011
@@ -1,7 +1,7 @@
-PREFIX  rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-PREFIX  :       <http://example/>
-
-SELECT (count(*) AS ?c)
-{
-    :xx :noMatch ?z .
-}
+PREFIX  rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX  :       <http://example/>
+
+SELECT (count(*) AS ?c)
+{
+    :xx :noMatch ?z .
+}

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

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-11.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-11.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-11.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-11.rq Thu Nov  3 17:32:36 2011
@@ -1,8 +1,8 @@
-PREFIX  rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-PREFIX  :       <http://example/>
-
-SELECT (count(distinct *) AS ?c)
-{
-    :xx :noMatch ?z .
-}
-GROUP BY ?z
+PREFIX  rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX  :       <http://example/>
+
+SELECT (count(distinct *) AS ?c)
+{
+    :xx :noMatch ?z .
+}
+GROUP BY ?z

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

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-12.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-12.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-12.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-12.rq Thu Nov  3 17:32:36 2011
@@ -1,7 +1,7 @@
-PREFIX  rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-PREFIX  :       <http://example/>
-
-SELECT (count(?z) AS ?c)
-{
-    :xx :noMatch ?z .
-}
+PREFIX  rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX  :       <http://example/>
+
+SELECT (count(?z) AS ?c)
+{
+    :xx :noMatch ?z .
+}

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

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-13.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-13.rq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-13.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-13.rq Thu Nov  3 17:32:36 2011
@@ -1,8 +1,8 @@
-PREFIX  rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-PREFIX  :       <http://example/>
-
-SELECT (count(distinct ?a) AS ?c)
-{
-    :xx :noMatch ?z .
-}
-GROUP BY ?a
+PREFIX  rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX  :       <http://example/>
+
+SELECT (count(distinct ?a) AS ?c)
+{
+    :xx :noMatch ?z .
+}
+GROUP BY ?a

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

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-20.arq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-20.arq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-20.arq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-20.arq Thu Nov  3 17:32:36 2011
@@ -1,11 +1,11 @@
-PREFIX : <http://example/>
-PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-
-SELECT count(*)
-{
-    # UNION is asymmetric in what it generates
-    { ?x rdf:type :X . } UNION { ?x rdf:type :X . FILTER (?x != :x2 )}
-    # and :x2 :p 2 with ":p 2" occuring twice.
-    OPTIONAL { ?x :p ?p . }
-    OPTIONAL { ?x :n ?n . }
-}
+PREFIX : <http://example/>
+PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+
+SELECT count(*)
+{
+    # UNION is asymmetric in what it generates
+    { ?x rdf:type :X . } UNION { ?x rdf:type :X . FILTER (?x != :x2 )}
+    # and :x2 :p 2 with ":p 2" occuring twice.
+    OPTIONAL { ?x :p ?p . }
+    OPTIONAL { ?x :n ?n . }
+}

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-20.srx
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-20.srx?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-20.srx (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-20.srx Thu Nov  3 17:32:36 2011
@@ -1,16 +1,16 @@
-<?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=".1"/>
-  </head>
-  <results>
-    <result>
-      <binding name=".1">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">13</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=".1"/>
+  </head>
+  <results>
+    <result>
+      <binding name=".1">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">13</literal>
+      </binding>
+    </result>
+  </results>
+</sparql>

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-21.arq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-21.arq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-21.arq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-21.arq Thu Nov  3 17:32:36 2011
@@ -1,11 +1,11 @@
-PREFIX : <http://example/>
-PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-
-SELECT count(distinct ?p)
-{
-    # UNION is asymmetric in what it generates
-    { ?x rdf:type :X . } UNION { ?x rdf:type :X . FILTER (?x != :x2 )}
-    # and :x2 :p 2 with ":p 2" occuring twice.
-    OPTIONAL { ?x :p ?p . }
-    OPTIONAL { ?x :n ?n . }
-}
+PREFIX : <http://example/>
+PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+
+SELECT count(distinct ?p)
+{
+    # UNION is asymmetric in what it generates
+    { ?x rdf:type :X . } UNION { ?x rdf:type :X . FILTER (?x != :x2 )}
+    # and :x2 :p 2 with ":p 2" occuring twice.
+    OPTIONAL { ?x :p ?p . }
+    OPTIONAL { ?x :n ?n . }
+}

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-22.arq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-22.arq?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-22.arq (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-22.arq Thu Nov  3 17:32:36 2011
@@ -1,12 +1,12 @@
-PREFIX : <http://example/>
-PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-
-SELECT ?p (count(?n) as ?num)
-{
-    # UNION is asymmetric in what it generates
-    { ?x rdf:type :X . } UNION { ?x rdf:type :X . FILTER (?x != :x2 )}
-    # and :x2 :p 2 with ":p 2" occuring twice.
-    OPTIONAL { ?x :p ?p . }
-    OPTIONAL { ?x :n ?n . }
-}
-GROUP BY ?p
+PREFIX : <http://example/>
+PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+
+SELECT ?p (count(?n) as ?num)
+{
+    # UNION is asymmetric in what it generates
+    { ?x rdf:type :X . } UNION { ?x rdf:type :X . FILTER (?x != :x2 )}
+    # and :x2 :p 2 with ":p 2" occuring twice.
+    OPTIONAL { ?x :p ?p . }
+    OPTIONAL { ?x :n ?n . }
+}
+GROUP BY ?p

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-22.srx
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-22.srx?rev=1197234&r1=1197233&r2=1197234&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-22.srx (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-22.srx Thu Nov  3 17:32:36 2011
@@ -1,33 +1,33 @@
-<?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="p"/>
-    <variable name="num"/>
-  </head>
-  <results>
-    <result>
-      <binding name="p">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">4</literal>
-      </binding>
-      <binding name="num">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">4</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="num">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="p">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">5</literal>
-      </binding>
-      <binding name="num">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">6</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="p"/>
+    <variable name="num"/>
+  </head>
+  <results>
+    <result>
+      <binding name="p">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">4</literal>
+      </binding>
+      <binding name="num">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">4</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="num">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="p">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">5</literal>
+      </binding>
+      <binding name="num">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">6</literal>
+      </binding>
+    </result>
+  </results>
+</sparql>



Mime
View raw message