You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2013/03/15 15:18:59 UTC
[15/22] fixed the remaining license headers (RAT works now)
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/dataset/dataset-12.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/dataset/dataset-12.ttl b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/dataset/dataset-12.ttl
deleted file mode 100644
index 72c4c76..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/dataset/dataset-12.ttl
+++ /dev/null
@@ -1,148 +0,0 @@
-@prefix : <http://example/> .
-@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 xsd: <http://www.w3.org/2001/XMLSchema#> .
-
-[] rdf:type rs:ResultSet ;
- rs:resultVariable "p" ;
- rs:resultVariable "g" ;
- rs:resultVariable "s" ;
- rs:resultVariable "o" ;
- rs:solution [ rs:binding [ rs:value "2"^^xsd:integer ;
- rs:variable "o"
- ] ;
- rs:binding [ rs:value :x ;
- rs:variable "s"
- ] ;
- rs:binding [ rs:value :q ;
- rs:variable "p"
- ] ;
- rs:binding [ rs:value <data-g2.ttl> ;
- rs:variable "g"
- ]
- ] ;
- rs:solution [ rs:binding [ rs:value :x ;
- rs:variable "s"
- ] ;
- rs:binding [ rs:value "1"^^xsd:integer ;
- rs:variable "o"
- ] ;
- rs:binding [ rs:value :p ;
- rs:variable "p"
- ]
- ] ;
- rs:solution [ rs:binding [ rs:value <data-g1.ttl> ;
- rs:variable "g"
- ] ;
- rs:binding [ rs:value "1"^^xsd:integer ;
- rs:variable "o"
- ] ;
- rs:binding [ rs:value :x ;
- rs:variable "s"
- ] ;
- rs:binding [ rs:value :p ;
- rs:variable "p"
- ]
- ] ;
- rs:solution [ rs:binding [ rs:value :p ;
- rs:variable "p"
- ] ;
- rs:binding [ rs:value [] ;
- rs:variable "s"
- ] ;
- rs:binding [ rs:value <data-g3.ttl> ;
- rs:variable "g"
- ] ;
- rs:binding [ rs:value "9"^^xsd:integer ;
- rs:variable "o"
- ]
- ] ;
- rs:solution [ rs:binding [ rs:value "2"^^xsd:integer ;
- rs:variable "o"
- ] ;
- rs:binding [ rs:value [] ;
- rs:variable "s"
- ] ;
- rs:binding [ rs:value :q ;
- rs:variable "p"
- ]
- ] ;
- rs:solution [ rs:binding [ rs:value :p ;
- rs:variable "p"
- ] ;
- rs:binding [ rs:value [] ;
- rs:variable "s"
- ] ;
- rs:binding [ rs:value "1"^^xsd:integer ;
- rs:variable "o"
- ]
- ] ;
- rs:solution [ rs:binding [ rs:value <data-g4.ttl> ;
- rs:variable "g"
- ] ;
- rs:binding [ rs:value "2"^^xsd:integer ;
- rs:variable "o"
- ] ;
- rs:binding [ rs:value [] ;
- rs:variable "s"
- ] ;
- rs:binding [ rs:value :q ;
- rs:variable "p"
- ]
- ] ;
- rs:solution [ rs:binding [ rs:value "2"^^xsd:integer ;
- rs:variable "o"
- ] ;
- rs:binding [ rs:value :q ;
- rs:variable "p"
- ] ;
- rs:binding [ rs:value :x ;
- rs:variable "s"
- ]
- ] ;
- rs:solution [ rs:binding [ rs:value <data-g1.ttl> ;
- rs:variable "g"
- ] ;
- rs:binding [ rs:value "9"^^xsd:integer ;
- rs:variable "o"
- ] ;
- rs:binding [ rs:value :a ;
- rs:variable "s"
- ] ;
- rs:binding [ rs:value :p ;
- rs:variable "p"
- ]
- ] ;
- rs:solution [ rs:binding [ rs:value [] ;
- rs:variable "s"
- ] ;
- rs:binding [ rs:value :p ;
- rs:variable "p"
- ] ;
- rs:binding [ rs:value "9"^^xsd:integer ;
- rs:variable "o"
- ]
- ] ;
- rs:solution [ rs:binding [ rs:value <data-g3.ttl> ;
- rs:variable "g"
- ] ;
- rs:binding [ rs:value "1"^^xsd:integer ;
- rs:variable "o"
- ] ;
- rs:binding [ rs:value :p ;
- rs:variable "p"
- ] ;
- rs:binding [ rs:value [] ;
- rs:variable "s"
- ]
- ] ;
- rs:solution [ rs:binding [ rs:value :a ;
- rs:variable "s"
- ] ;
- rs:binding [ rs:value :p ;
- rs:variable "p"
- ] ;
- rs:binding [ rs:value "9"^^xsd:integer ;
- rs:variable "o"
- ]
- ] .
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/dataset/dataset-12b.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/dataset/dataset-12b.rq b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/dataset/dataset-12b.rq
deleted file mode 100755
index 02318c8..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/dataset/dataset-12b.rq
+++ /dev/null
@@ -1,16 +0,0 @@
-PREFIX : <http://example/>
-
-SELECT *
-FROM <data-g1-dup.ttl>
-FROM <data-g2-dup.ttl>
-FROM <data-g3-dup.ttl>
-FROM <data-g4-dup.ttl>
-FROM NAMED <data-g1.ttl>
-FROM NAMED <data-g2.ttl>
-FROM NAMED <data-g3.ttl>
-FROM NAMED <data-g4.ttl>
-{
- { ?s ?p ?o }
- UNION
- { GRAPH ?g { ?s ?p ?o } }
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/dataset/manifest.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/dataset/manifest.ttl b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/dataset/manifest.ttl
deleted file mode 100755
index cdafd09..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/dataset/manifest.ttl
+++ /dev/null
@@ -1,177 +0,0 @@
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix : <http://www.w3.org/2001/sw/DataAccess/tests/data-r2/dataset/manifest#> .
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix dawgt: <http://www.w3.org/2001/sw/DataAccess/tests/test-dawg#> .
-@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:comment "Tests for GRAPH" ;
- mf:entries
- (
- :dawg-dataset-01
- :dawg-dataset-02
- :dawg-dataset-03
- :dawg-dataset-04
- :dawg-dataset-05
- :dawg-dataset-06
- :dawg-dataset-07
- :dawg-dataset-08
- :dawg-dataset-09
- :dawg-dataset-10
- :dawg-dataset-11
- :dawg-dataset-12
- :dawg-dataset-09b
- :dawg-dataset-10b
- :dawg-dataset-12b
- ).
-
-:dawg-dataset-01 rdf:type mf:QueryEvaluationTest ;
- mf:name "dataset-01" ;
- rdfs:comment "Data: default dataset / Query: default dataset" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes> ;
- mf:action
- [ qt:query <dataset-01.rq> ] ;
- mf:result <dataset-01.ttl> ;
- .
-
-:dawg-dataset-02 rdf:type mf:QueryEvaluationTest ;
- mf:name "dataset-02" ;
- rdfs:comment "Data: named dataset / Query: default dataset" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes> ;
- mf:action
- [ qt:query <dataset-02.rq> ] ;
- mf:result <dataset-02.ttl> ;
- .
-
-:dawg-dataset-03 rdf:type mf:QueryEvaluationTest ;
- mf:name "dataset-03" ;
- rdfs:comment "Data: named dataset / Query: named dataset dataset" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes> ;
- mf:action
- [ qt:query <dataset-03.rq> ] ;
- mf:result <dataset-03.ttl> ;
- .
-
-:dawg-dataset-04 rdf:type mf:QueryEvaluationTest ;
- mf:name "dataset-04" ;
- rdfs:comment "Data: named dataset / Query: default dataset" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes> ;
- mf:action
- [ qt:query <dataset-04.rq> ] ;
- mf:result <dataset-04.ttl> ;
- .
-
-:dawg-dataset-05 rdf:type mf:QueryEvaluationTest ;
- mf:name "dataset-05" ;
- rdfs:comment "Data: default and named / Query: default dataset" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes> ;
- mf:action
- [ qt:query <dataset-05.rq> ] ;
- mf:result <dataset-05.ttl> ;
- .
-
-:dawg-dataset-06 rdf:type mf:QueryEvaluationTest ;
- mf:name "dataset-06" ;
- rdfs:comment "Data: default and named / Query: named dataset" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes> ;
- mf:action
- [ qt:query <dataset-06.rq> ] ;
- mf:result <dataset-06.ttl> ;
- .
-
-:dawg-dataset-07 rdf:type mf:QueryEvaluationTest ;
- mf:name "dataset-07" ;
- rdfs:comment "Data: default and named / Query: all data by UNION" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes> ;
- mf:action
- [ qt:query <dataset-07.rq> ] ;
- mf:result <dataset-07.ttl> ;
- .
-
-:dawg-dataset-08 rdf:type mf:QueryEvaluationTest ;
- mf:name "dataset-08" ;
- rdfs:comment "Data: default and named / Query: common subjects" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes> ;
- mf:action
- [ qt:query <dataset-08.rq> ] ;
- mf:result <dataset-08.ttl> ;
- .
-
-:dawg-dataset-09 rdf:type mf:QueryEvaluationTest ;
- mf:name "dataset-09" ;
- rdfs:comment "Data: default and named (bnodes) / Query: common subjects" ;
- dawgt:approval dawgt:Withdrawn ;
- #dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes> ;
- mf:action
- [ qt:query <dataset-09.rq> ] ;
- mf:result <dataset-09.ttl> ;
- .
-
-:dawg-dataset-09b rdf:type mf:QueryEvaluationTest ;
- mf:name "dataset-09b" ;
- rdfs:comment "Data: default and named (bnodes) / Query: common subjects" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://www.w3.org/2007/10/09-dawg-minutes.html> ;
- mf:action
- [ qt:query <dataset-09b.rq> ] ;
- mf:result <dataset-09.ttl> ;
- .
-
-:dawg-dataset-10 rdf:type mf:QueryEvaluationTest ;
- mf:name "dataset-10" ;
- rdfs:comment "Data: default and named (same data, with bnodes) / Query: common subjects" ;
- dawgt:approval dawgt:Withdrawn ;
- #dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes> ;
- mf:action
- [ qt:query <dataset-10.rq> ] ;
- mf:result <dataset-10.ttl> ;
- .
-
-:dawg-dataset-10b rdf:type mf:QueryEvaluationTest ;
- mf:name "dataset-10b" ;
- rdfs:comment "Data: default and named (same data, with bnodes) / Query: common subjects" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://www.w3.org/2007/10/09-dawg-minutes.html> ;
- mf:action
- [ qt:query <dataset-10b.rq> ] ;
- mf:result <dataset-10.ttl> ;
- .
-
-:dawg-dataset-11 rdf:type mf:QueryEvaluationTest ;
- mf:name "dataset-11" ;
- rdfs:comment "Data: default and named (several) / Query: get everything" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0118/04-dawg-minutes.html> ;
- mf:action
- [ qt:query <dataset-11.rq> ] ;
- mf:result <dataset-11.ttl> ;
- .
-
-:dawg-dataset-12 rdf:type mf:QueryEvaluationTest ;
- mf:name "dataset-12" ;
- rdfs:comment "Data: default (several) and named (several) / Query: get everything" ;
- dawgt:approval dawgt:Withdrawn ;
- #dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0118/04-dawg-minutes.html> ;
- mf:action
- [ qt:query <dataset-12.rq> ] ;
- mf:result <dataset-12.ttl> ;
- .
-
-:dawg-dataset-12b rdf:type mf:QueryEvaluationTest ;
- mf:name "dataset-12b" ;
- rdfs:comment "Data: default (several) and named (several) / Query: get everything" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://www.w3.org/2007/10/09-dawg-minutes.html> ;
- mf:action
- [ qt:query <dataset-12b.rq> ] ;
- mf:result <dataset-12.ttl> ;
- .
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/dataset/manifest.ttl.bak
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/dataset/manifest.ttl.bak b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/dataset/manifest.ttl.bak
deleted file mode 100755
index f00873c..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/dataset/manifest.ttl.bak
+++ /dev/null
@@ -1,143 +0,0 @@
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix dawgt: <http://www.w3.org/2001/sw/DataAccess/tests/test-dawg#> .
-@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:comment "Tests for GRAPH" ;
- mf:entries
- (
- <#dawg-dataset-01>
- <#dawg-dataset-02>
- <#dawg-dataset-03>
- <#dawg-dataset-04>
- <#dawg-dataset-05>
- <#dawg-dataset-06>
- <#dawg-dataset-07>
- <#dawg-dataset-08>
- <#dawg-dataset-09>
- <#dawg-dataset-10>
- <#dawg-dataset-11>
- <#dawg-dataset-12>
- ).
-
-<#dawg-dataset-01> rdf:type mf:QueryEvaluationTest ;
- mf:name "dataset-01" ;
- rdfs:comment "Data: default dataset / Query: default dataset" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes> ;
- mf:action
- [ qt:query <dataset-01.rq> ] ;
- mf:result <dataset-01.ttl> ;
- .
-
-<#dawg-dataset-02> rdf:type mf:QueryEvaluationTest ;
- mf:name "dataset-02" ;
- rdfs:comment "Data: named dataset / Query: default dataset" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes> ;
- mf:action
- [ qt:query <dataset-02.rq> ] ;
- mf:result <dataset-02.ttl> ;
- .
-
-<#dawg-dataset-03> rdf:type mf:QueryEvaluationTest ;
- mf:name "dataset-03" ;
- rdfs:comment "Data: named dataset / Query: named dataset dataset" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes> ;
- mf:action
- [ qt:query <dataset-03.rq> ] ;
- mf:result <dataset-03.ttl> ;
- .
-
-<#dawg-dataset-04> rdf:type mf:QueryEvaluationTest ;
- mf:name "dataset-04" ;
- rdfs:comment "Data: named dataset / Query: default dataset" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes> ;
- mf:action
- [ qt:query <dataset-04.rq> ] ;
- mf:result <dataset-04.ttl> ;
- .
-
-<#dawg-dataset-05> rdf:type mf:QueryEvaluationTest ;
- mf:name "dataset-05" ;
- rdfs:comment "Data: default and named / Query: default dataset" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes> ;
- mf:action
- [ qt:query <dataset-05.rq> ] ;
- mf:result <dataset-05.ttl> ;
- .
-
-<#dawg-dataset-06> rdf:type mf:QueryEvaluationTest ;
- mf:name "dataset-06" ;
- rdfs:comment "Data: default and named / Query: named dataset" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes> ;
- mf:action
- [ qt:query <dataset-06.rq> ] ;
- mf:result <dataset-06.ttl> ;
- .
-
-<#dawg-dataset-07> rdf:type mf:QueryEvaluationTest ;
- mf:name "dataset-07" ;
- rdfs:comment "Data: default and named / Query: all data by UNION" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes> ;
- mf:action
- [ qt:query <dataset-07.rq> ] ;
- mf:result <dataset-07.ttl> ;
- .
-
-<#dawg-dataset-08> rdf:type mf:QueryEvaluationTest ;
- mf:name "dataset-08" ;
- rdfs:comment "Data: default and named / Query: common subjects" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes> ;
- mf:action
- [ qt:query <dataset-08.rq> ] ;
- mf:result <dataset-08.ttl> ;
- .
-
-<#dawg-dataset-09> rdf:type mf:QueryEvaluationTest ;
- mf:name "dataset-09" ;
- rdfs:comment "Data: default and named (bnodes) / Query: common subjects" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes> ;
- mf:action
- [ qt:query <dataset-09.rq> ] ;
- mf:result <dataset-09.ttl> ;
- .
-
-<#dawg-dataset-10> rdf:type mf:QueryEvaluationTest ;
- mf:name "dataset-10" ;
- rdfs:comment "Data: default and named (same data, with bnodes) / Query: common subjects" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes> ;
- mf:action
- [ qt:query <dataset-10.rq> ] ;
- mf:result <dataset-10.ttl> ;
- .
-
-<#dawg-dataset-11> rdf:type mf:QueryEvaluationTest ;
- mf:name "dataset-11" ;
- rdfs:comment "Data: default and named (several) / Query: get everything" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes> ;
- mf:action
- [ qt:query <dataset-11.rq> ] ;
- mf:result <dataset-11.ttl> ;
- .
-
-<#dawg-dataset-12> rdf:type mf:QueryEvaluationTest ;
- mf:name "dataset-12" ;
- rdfs:comment "Data: default (several) and named (several) / Query: get everything" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes> ;
- mf:action
- [ qt:query <dataset-12.rq> ] ;
- mf:result <dataset-12.ttl> ;
- .
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/data-all.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/data-all.ttl b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/data-all.ttl
deleted file mode 100644
index a5a0f22..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/data-all.ttl
+++ /dev/null
@@ -1,74 +0,0 @@
-## data-num.ttl
-@prefix : <http://example/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-
-:x1 :p1 "1"^^xsd:integer .
-:x1 :p2 "1"^^xsd:integer .
-
-:x2 :p1 "1"^^xsd:integer .
-:x2 :p2 "1"^^xsd:integer .
-
-:x3 :p1 "01"^^xsd:integer .
-:x3 :p2 "01"^^xsd:integer .
-
-:x4 :p1 "+1"^^xsd:integer .
-:x4 :p2 "+1"^^xsd:integer .
-
-:y1 :p1 "1.0"^^xsd:decimal .
-:y1 :p2 "1.0"^^xsd:decimal .
-
-:y2 :p1 "+1.0"^^xsd:decimal .
-:y2 :p2 "+1.0"^^xsd:decimal .
-
-:y3 :p1 "01.0"^^xsd:decimal .
-:y3 :p2 "01.0"^^xsd:decimal .
-
-:z1 :p1 "1.0e0"^^xsd:double .
-:z1 :p2 "1.0e0"^^xsd:double .
-
-:z2 :p1 "1.0e0"^^xsd:double .
-:z2 :p2 "1.0e0"^^xsd:double .
-
-:z3 :p1 "1.3e0"^^xsd:double .
-:z3 :p2 "1.3e0"^^xsd:double .
-
-:z4 :p1 "1.3e0"^^xsd:double .
-:z5 :p1 "1.3e0"^^xsd:float .
-
-## data-str.ttl
-
-:x1 :p "abc" .
-:x1 :q "abc" .
-
-:x2 :p "abc"@en .
-:x2 :q "abc"@en .
-
-:x3 :p "ABC" .
-:x3 :q "ABC" .
-
-:x4 :p "ABC"@en .
-:x4 :q "ABC"@en .
-
-
-:x5 :p "abc"^^xsd:string .
-:x5 :q "abc"^^xsd:string .
-:x6 :p "ABC"^^xsd:string .
-:x6 :q "ABC"^^xsd:string .
-
-:x7 :p "" .
-:x7 :q "" .
-
-:x8 :p ""@en .
-:x8 :q ""@en .
-
-:x9 :p ""^^xsd:string .
-:x9 :q ""^^xsd:string .
-
-## data-node.ttl
-
-:x1 :p1 :z1 .
-:x1 :p1 _:a .
-
-:x1 :p2 :z1 .
-:x1 :p2 _:a .
-
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/data-node.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/data-node.ttl b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/data-node.ttl
deleted file mode 100644
index 0166e4c..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/data-node.ttl
+++ /dev/null
@@ -1,9 +0,0 @@
-@prefix : <http://example/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-
-:x1 :p1 :z1 .
-:x1 :p1 _:a .
-
-:x1 :p2 :z1 .
-:x1 :p2 _:a .
-
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/data-num.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/data-num.ttl b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/data-num.ttl
deleted file mode 100644
index b5e4e03..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/data-num.ttl
+++ /dev/null
@@ -1,35 +0,0 @@
-@prefix : <http://example/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-
-:x1 :p1 "1"^^xsd:integer .
-:x1 :p2 "1"^^xsd:integer .
-
-:x2 :p1 "1"^^xsd:integer .
-:x2 :p2 "1"^^xsd:integer .
-
-:x3 :p1 "01"^^xsd:integer .
-:x3 :p2 "01"^^xsd:integer .
-
-:x4 :p1 "+1"^^xsd:integer .
-:x4 :p2 "+1"^^xsd:integer .
-
-:y1 :p1 "1.0"^^xsd:decimal .
-:y1 :p2 "1.0"^^xsd:decimal .
-
-:y2 :p1 "+1.0"^^xsd:decimal .
-:y2 :p2 "+1.0"^^xsd:decimal .
-
-:y3 :p1 "01.0"^^xsd:decimal .
-:y3 :p2 "01.0"^^xsd:decimal .
-
-:z1 :p1 "1.0e0"^^xsd:double .
-:z1 :p2 "1.0e0"^^xsd:double .
-
-:z2 :p1 "1.0e0"^^xsd:double .
-:z2 :p2 "1.0e0"^^xsd:double .
-
-:z3 :p1 "1.3e0"^^xsd:double .
-:z3 :p2 "1.3e0"^^xsd:double .
-
-:z4 :p1 "1.3e0"^^xsd:double .
-:z5 :p1 "1.3e0"^^xsd:float .
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/data-opt.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/data-opt.ttl b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/data-opt.ttl
deleted file mode 100644
index 1326d21..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/data-opt.ttl
+++ /dev/null
@@ -1,13 +0,0 @@
-@prefix : <http://example/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-
-:x1 :p1 :z1 .
-:x1 :p1 :z2 .
-:x1 :p1 _:a .
-
-:x1 :p2 :z1 .
-:x1 :p2 :z2 .
-:x1 :p2 _:a .
-
-:z1 :q :r .
-_:a :q :s .
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/data-star.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/data-star.ttl b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/data-star.ttl
deleted file mode 100755
index 5aed9bb..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/data-star.ttl
+++ /dev/null
@@ -1,8 +0,0 @@
-@prefix : <http://example/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-
-:x1 :p "abc" .
-:x1 :q "abc" .
-:x2 :p "abc" .
-
-
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/data-str.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/data-str.ttl b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/data-str.ttl
deleted file mode 100644
index 6c0dbb2..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/data-str.ttl
+++ /dev/null
@@ -1,29 +0,0 @@
-@prefix : <http://example/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-
-:x1 :p "abc" .
-:x1 :q "abc" .
-
-:x2 :p "abc"@en .
-:x2 :q "abc"@en .
-
-:x3 :p "ABC" .
-:x3 :q "ABC" .
-
-:x4 :p "ABC"@en .
-:x4 :q "ABC"@en .
-
-
-:x5 :p "abc"^^xsd:string .
-:x5 :q "abc"^^xsd:string .
-:x6 :p "ABC"^^xsd:string .
-:x6 :q "ABC"^^xsd:string .
-
-:x7 :p "" .
-:x7 :q "" .
-
-:x8 :p ""@en .
-:x8 :q ""@en .
-
-:x9 :p ""^^xsd:string .
-:x9 :q ""^^xsd:string .
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-1-results.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-1-results.srx b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-1-results.srx
deleted file mode 100644
index 96cc0ff..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-1-results.srx
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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#integer">1</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.3</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>
- <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">01</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#double">+1.3e0</literal>
- </binding>
- </result>
- <result>
- <binding name="v">
- <literal datatype="http://www.w3.org/2001/XMLSchema#float">1.3e0</literal>
- </binding>
- </result>
- </results>
-</sparql>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-1.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-1.rq b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-1.rq
deleted file mode 100644
index 3b18221..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-1.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX : <http://example/>
-PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
-
-SELECT DISTINCT ?v
-{
- ?x ?p ?v .
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-2.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-2.rq b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-2.rq
deleted file mode 100644
index f423c60..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-2.rq
+++ /dev/null
@@ -1,8 +0,0 @@
-PREFIX : <http://example/>
-PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
-
-SELECT DISTINCT ?v
-{
- :x1 ?p ?o
- OPTIONAL { ?o :q ?v }
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-all.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-all.srx b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-all.srx
deleted file mode 100644
index 963d208..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-all.srx
+++ /dev/null
@@ -1,111 +0,0 @@
-<?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>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-node.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-node.srx b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-node.srx
deleted file mode 100644
index 7f88f2b..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-node.srx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-num.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-num.srx b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-num.srx
deleted file mode 100644
index 71b81a6..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-num.srx
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-opt.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-opt.srx b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-opt.srx
deleted file mode 100644
index daf6272..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-opt.srx
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-star-1.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-star-1.rq b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-star-1.rq
deleted file mode 100755
index 3b13dbf..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-star-1.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX : <http://example/>
-PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
-SELECT DISTINCT *
-WHERE {
- { ?s :p ?o } UNION { ?s :q ?o }
-}
-
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-star-1.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-star-1.srx b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-star-1.srx
deleted file mode 100755
index 7a1172e..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-star-1.srx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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="s"/>
- <variable name="o"/>
- </head>
- <results>
- <result>
- <binding name="s"><uri>http://example/x1</uri></binding>
- <binding name="o"><literal>abc</literal></binding>
- </result>
- <result>
- <binding name="s"><uri>http://example/x2</uri></binding>
- <binding name="o"><literal>abc</literal></binding>
- </result>
- </results>
-</sparql>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-str.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-str.srx b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-str.srx
deleted file mode 100644
index a836754..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/distinct-str.srx
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/manifest.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/manifest.ttl b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/manifest.ttl
deleted file mode 100755
index 96bd4bd..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/manifest.ttl
+++ /dev/null
@@ -1,128 +0,0 @@
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix : <http://www.w3.org/2001/sw/DataAccess/tests/data-r2/distinct/manifest#> .
-@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#> .
-@prefix dawgt: <http://www.w3.org/2001/sw/DataAccess/tests/test-dawg#> .
-
-<> 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
- :distinct-star-1
- ) .
-
-:distinct-star-1 rdf:type mf:QueryEvaluationTest ;
- mf:name "SELECT DISTINCT *" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0060/2007-08-07-dawg-minutes.html> ;
- mf:action
- [ qt:query <distinct-star-1.rq> ;
- qt:data <data-star.ttl> ] ;
- mf:result <distinct-star-1.srx> .
-
-:no-distinct-1 rdf:type mf:QueryEvaluationTest ;
- mf:name "Numbers: No distinct" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://www.w3.org/2007/07/17-dawg-minutes> ;
- mf:action
- [ qt:query <no-distinct-1.rq> ;
- qt:data <data-num.ttl> ] ;
- mf:result <no-distinct-num.srx> .
-
-:distinct-1 rdf:type mf:QueryEvaluationTest ;
- mf:name "Numbers: Distinct" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://www.w3.org/2007/07/17-dawg-minutes> ;
- mf:action
- [ qt:query <distinct-1.rq> ;
- qt:data <data-num.ttl> ] ;
- mf:result <distinct-num.srx> .
-
-:no-distinct-2 rdf:type mf:QueryEvaluationTest ;
- mf:name "Strings: No distinct" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://www.w3.org/2007/07/17-dawg-minutes> ;
- mf:action
- [ qt:query <no-distinct-1.rq> ;
- qt:data <data-str.ttl> ] ;
- mf:result <no-distinct-str.srx> .
-
-:distinct-2 rdf:type mf:QueryEvaluationTest ;
- mf:name "Strings: Distinct" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://www.w3.org/2007/07/17-dawg-minutes> ;
- mf:action
- [ qt:query <distinct-1.rq> ;
- qt:data <data-str.ttl> ] ;
- mf:result <distinct-str.srx> .
-
-:no-distinct-3 rdf:type mf:QueryEvaluationTest ;
- mf:name "Nodes: No distinct" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://www.w3.org/2007/07/17-dawg-minutes> ;
- mf:action
- [ qt:query <no-distinct-1.rq> ;
- qt:data <data-node.ttl> ] ;
- mf:result <no-distinct-node.srx> .
-
-:distinct-3 rdf:type mf:QueryEvaluationTest ;
- mf:name "Nodes: Distinct" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://www.w3.org/2007/07/17-dawg-minutes> ;
- mf:action
- [ qt:query <distinct-1.rq> ;
- qt:data <data-node.ttl> ] ;
- mf:result <distinct-node.srx> .
-
-:no-distinct-4 rdf:type mf:QueryEvaluationTest ;
- mf:name "Opt: No distinct" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://www.w3.org/2007/07/17-dawg-minutes> ;
- mf:action
- [ qt:query <no-distinct-2.rq> ;
- qt:data <data-opt.ttl> ] ;
- mf:result <no-distinct-opt.srx> .
-
-:distinct-4 rdf:type mf:QueryEvaluationTest ;
- mf:name "Opt: Distinct" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://www.w3.org/2007/07/17-dawg-minutes> ;
- mf:action
- [ qt:query <distinct-2.rq> ;
- qt:data <data-opt.ttl> ] ;
- mf:result <distinct-opt.srx> .
-
-
-
-:no-distinct-9 rdf:type mf:QueryEvaluationTest ;
- mf:name "All: No distinct" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://www.w3.org/2007/07/17-dawg-minutes> ;
- mf:action
- [ qt:query <no-distinct-1.rq> ;
- ##qt:data <data-num.ttl> , <data-str.ttl> , <data-node.ttl>
- qt:data <data-all.ttl>
- ] ;
- mf:result <no-distinct-all.srx> .
-
-:distinct-9 rdf:type mf:QueryEvaluationTest ;
- mf:name "All: Distinct" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://www.w3.org/2007/07/17-dawg-minutes> ;
- mf:action
- [ qt:query <distinct-1.rq> ;
- ##qt:data <data-num.ttl> , <data-str.ttl> , <data-node.ttl>
- qt:data <data-all.ttl>
- ] ;
- mf:result <distinct-all.srx> .
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/manifest.ttl.bak
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/manifest.ttl.bak b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/manifest.ttl.bak
deleted file mode 100755
index a1262aa..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/manifest.ttl.bak
+++ /dev/null
@@ -1,127 +0,0 @@
-@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#> .
-@prefix dawgt: <http://www.w3.org/2001/sw/DataAccess/tests/test-dawg#> .
-
-<> 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>
- <#distinct-star-1>
- ) .
-
-<#distinct-star-1> rdf:type mf:QueryEvaluationTest ;
- mf:name "SELECT DISTINCT *" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0060/2007-08-07-dawg-minutes.html> ;
- mf:action
- [ qt:query <distinct-star-1.rq> ;
- qt:data <data-star.ttl> ] ;
- mf:result <distinct-star-1.srx> .
-
-<#no-distinct-1> rdf:type mf:QueryEvaluationTest ;
- mf:name "Numbers: No distinct" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://www.w3.org/2007/07/17-dawg-minutes> ;
- mf:action
- [ qt:query <no-distinct-1.rq> ;
- qt:data <data-num.ttl> ] ;
- mf:result <no-distinct-num.srx> .
-
-<#distinct-1> rdf:type mf:QueryEvaluationTest ;
- mf:name "Numbers: Distinct" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://www.w3.org/2007/07/17-dawg-minutes> ;
- mf:action
- [ qt:query <distinct-1.rq> ;
- qt:data <data-num.ttl> ] ;
- mf:result <distinct-num.srx> .
-
-<#no-distinct-2> rdf:type mf:QueryEvaluationTest ;
- mf:name "Strings: No distinct" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://www.w3.org/2007/07/17-dawg-minutes> ;
- mf:action
- [ qt:query <no-distinct-1.rq> ;
- qt:data <data-str.ttl> ] ;
- mf:result <no-distinct-str.srx> .
-
-<#distinct-2> rdf:type mf:QueryEvaluationTest ;
- mf:name "Strings: Distinct" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://www.w3.org/2007/07/17-dawg-minutes> ;
- mf:action
- [ qt:query <distinct-1.rq> ;
- qt:data <data-str.ttl> ] ;
- mf:result <distinct-str.srx> .
-
-<#no-distinct-3> rdf:type mf:QueryEvaluationTest ;
- mf:name "Nodes: No distinct" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://www.w3.org/2007/07/17-dawg-minutes> ;
- mf:action
- [ qt:query <no-distinct-1.rq> ;
- qt:data <data-node.ttl> ] ;
- mf:result <no-distinct-node.srx> .
-
-<#distinct-3> rdf:type mf:QueryEvaluationTest ;
- mf:name "Nodes: Distinct" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://www.w3.org/2007/07/17-dawg-minutes> ;
- mf:action
- [ qt:query <distinct-1.rq> ;
- qt:data <data-node.ttl> ] ;
- mf:result <distinct-node.srx> .
-
-<#no-distinct-4> rdf:type mf:QueryEvaluationTest ;
- mf:name "Opt: No distinct" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://www.w3.org/2007/07/17-dawg-minutes> ;
- mf:action
- [ qt:query <no-distinct-2.rq> ;
- qt:data <data-opt.ttl> ] ;
- mf:result <no-distinct-opt.srx> .
-
-<#distinct-4> rdf:type mf:QueryEvaluationTest ;
- mf:name "Opt: Distinct" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://www.w3.org/2007/07/17-dawg-minutes> ;
- mf:action
- [ qt:query <distinct-2.rq> ;
- qt:data <data-opt.ttl> ] ;
- mf:result <distinct-opt.srx> .
-
-
-
-<#no-distinct-9> rdf:type mf:QueryEvaluationTest ;
- mf:name "All: No distinct" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://www.w3.org/2007/07/17-dawg-minutes> ;
- mf:action
- [ qt:query <no-distinct-1.rq> ;
- ##qt:data <data-num.ttl> , <data-str.ttl> , <data-node.ttl>
- qt:data <data-all.ttl>
- ] ;
- mf:result <no-distinct-all.srx> .
-
-<#distinct-9> rdf:type mf:QueryEvaluationTest ;
- mf:name "All: Distinct" ;
- dawgt:approval dawgt:Approved ;
- dawgt:approvedBy <http://www.w3.org/2007/07/17-dawg-minutes> ;
- mf:action
- [ qt:query <distinct-1.rq> ;
- ##qt:data <data-num.ttl> , <data-str.ttl> , <data-node.ttl>
- qt:data <data-all.ttl>
- ] ;
- mf:result <distinct-all.srx> .
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/no-distinct-1.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/no-distinct-1.rq b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/no-distinct-1.rq
deleted file mode 100644
index e5724ce..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/no-distinct-1.rq
+++ /dev/null
@@ -1,4 +0,0 @@
-SELECT ?v
-{
- ?x ?p ?v .
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/no-distinct-2.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/no-distinct-2.rq b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/no-distinct-2.rq
deleted file mode 100644
index 9fb8303..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/no-distinct-2.rq
+++ /dev/null
@@ -1,8 +0,0 @@
-PREFIX : <http://example/>
-PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
-
-SELECT ?v
-{
- :x1 ?p ?o
- OPTIONAL { ?o :q ?v }
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/no-distinct-all.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/no-distinct-all.srx b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/no-distinct-all.srx
deleted file mode 100644
index 7b8d113..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/no-distinct-all.srx
+++ /dev/null
@@ -1,231 +0,0 @@
-<?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>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/no-distinct-node.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/no-distinct-node.srx b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/no-distinct-node.srx
deleted file mode 100644
index 3672629..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/no-distinct-node.srx
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/no-distinct-num.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/no-distinct-num.srx b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/no-distinct-num.srx
deleted file mode 100644
index 052f74e..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/no-distinct-num.srx
+++ /dev/null
@@ -1,121 +0,0 @@
-<?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>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/no-distinct-opt.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/no-distinct-opt.srx b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/no-distinct-opt.srx
deleted file mode 100644
index 1a88d33..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/no-distinct-opt.srx
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/no-distinct-str.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/no-distinct-str.srx b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/no-distinct-str.srx
deleted file mode 100644
index da0974b..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/distinct/no-distinct-str.srx
+++ /dev/null
@@ -1,101 +0,0 @@
-<?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>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/data-builtin-1.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/data-builtin-1.ttl b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/data-builtin-1.ttl
deleted file mode 100755
index b8bc876..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/data-builtin-1.ttl
+++ /dev/null
@@ -1,20 +0,0 @@
-@prefix : <http://example.org/things#> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-
-:xi1 :p "1"^^xsd:integer .
-:xi2 :p "1"^^xsd:integer .
-:xi3 :p "01"^^xsd:integer .
-
-:xd1 :p "1.0e0"^^xsd:double .
-:xd2 :p "1.0"^^xsd:double .
-:xd3 :p "1"^^xsd:double .
-
-:xt1 :p "zzz"^^:myType .
-
-:xp1 :p "zzz" .
-:xp2 :p "1" .
-:xp2 :p "" .
-
-:xu :p :z .
-
-:xb :p _:a .
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/data-builtin-2.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/data-builtin-2.ttl b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/data-builtin-2.ttl
deleted file mode 100755
index 0067750..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/data-builtin-2.ttl
+++ /dev/null
@@ -1,14 +0,0 @@
-@prefix : <http://example/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-
-:x1 :p "string" .
-:x2 :p "string"^^xsd:string .
-:x3 :p "string"@en .
-:x4 :p "lex"^^:unknownType .
-:x5 :p "1234"^^xsd:integer .
-:x6 :p <http://example/iri> .
-:x7 :p _:bNode .
-
-
-
-
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/data-langMatches-de.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/data-langMatches-de.ttl b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/data-langMatches-de.ttl
deleted file mode 100644
index a0365df..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/data-langMatches-de.ttl
+++ /dev/null
@@ -1,8 +0,0 @@
-# data-langMatches-de.ttl
-# $Id: data-langMatches-de.ttl,v 1.2 2007/08/11 18:30:56 eric Exp $
-
-@prefix : <http://example.org/#> .
-
-:x :p3 "abc"@de .
-:x :p4 "abc"@de-de .
-:x :p5 "abc"@de-latn-de .
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/data-langMatches.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/data-langMatches.ttl b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/data-langMatches.ttl
deleted file mode 100755
index 646c866..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/data-langMatches.ttl
+++ /dev/null
@@ -1,7 +0,0 @@
-@prefix : <http://example.org/#> .
-
-:x :p1 "abc" .
-:x :p2 <abc> .
-:x :p3 "abc"@en .
-:x :p4 "abc"@en-gb .
-:x :p5 "abc"@fr .
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/lang-case-insensitive-eq.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/lang-case-insensitive-eq.srx b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/lang-case-insensitive-eq.srx
deleted file mode 100755
index 6669f5f..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/lang-case-insensitive-eq.srx
+++ /dev/null
@@ -1,98 +0,0 @@
-<sparql
- xmlns="http://www.w3.org/2005/sparql-results#">
- <head>
- <variable
- name="x1" />
- <variable
- name="v1" />
- <variable
- name="x2" />
- <variable
- name="v2" />
- </head>
- <results
-
- >
- <result>
- <binding
- name="x1">
- <uri>http://example/x2</uri>
- </binding>
- <binding
- name="v1">
- <literal
- xml:lang="en">xyz</literal>
- </binding>
- <binding
- name="x2">
- <uri>http://example/x2</uri>
- </binding>
- <binding
- name="v2">
- <literal
- xml:lang="en">xyz</literal>
- </binding>
- </result>
- <result>
- <binding
- name="x1">
- <uri>http://example/x2</uri>
- </binding>
- <binding
- name="v1">
- <literal
- xml:lang="en">xyz</literal>
- </binding>
- <binding
- name="x2">
- <uri>http://example/x3</uri>
- </binding>
- <binding
- name="v2">
- <literal
- xml:lang="EN">xyz</literal>
- </binding>
- </result>
- <result>
- <binding
- name="x1">
- <uri>http://example/x3</uri>
- </binding>
- <binding
- name="v1">
- <literal
- xml:lang="EN">xyz</literal>
- </binding>
- <binding
- name="x2">
- <uri>http://example/x2</uri>
- </binding>
- <binding
- name="v2">
- <literal
- xml:lang="en">xyz</literal>
- </binding>
- </result>
- <result>
- <binding
- name="x1">
- <uri>http://example/x3</uri>
- </binding>
- <binding
- name="v1">
- <literal
- xml:lang="EN">xyz</literal>
- </binding>
- <binding
- name="x2">
- <uri>http://example/x3</uri>
- </binding>
- <binding
- name="v2">
- <literal
- xml:lang="EN">xyz</literal>
- </binding>
- </result>
- </results>
-</sparql>
-
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/lang-case-insensitive-ne.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/lang-case-insensitive-ne.srx b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/lang-case-insensitive-ne.srx
deleted file mode 100755
index cc2ee17..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/lang-case-insensitive-ne.srx
+++ /dev/null
@@ -1,17 +0,0 @@
-<sparql
- xmlns="http://www.w3.org/2005/sparql-results#">
- <head>
- <variable
- name="x1" />
- <variable
- name="v1" />
- <variable
- name="x2" />
- <variable
- name="v2" />
- </head>
- <results
-
- />
-</sparql>
-
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/lang-case-sensitivity-eq.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/lang-case-sensitivity-eq.rq b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/lang-case-sensitivity-eq.rq
deleted file mode 100755
index f611e5c..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/lang-case-sensitivity-eq.rq
+++ /dev/null
@@ -1,11 +0,0 @@
-# Test: 'xyz'@en = 'xyz'@EN
-# $Id: lang-case-sensitivity-eq.rq,v 1.1 2007/06/24 23:15:38 lfeigenb Exp $
-
-PREFIX : <http://example/>
-
-SELECT *
-{
- ?x1 :p ?v1 .
- ?x2 :p ?v2 .
- FILTER ( ?v1 = ?v2 )
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/lang-case-sensitivity-ne.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/lang-case-sensitivity-ne.rq b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/lang-case-sensitivity-ne.rq
deleted file mode 100755
index ae5a484..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/lang-case-sensitivity-ne.rq
+++ /dev/null
@@ -1,12 +0,0 @@
-# Test: 'xyz'@en != 'xyz'@EN
-# $Id: lang-case-sensitivity-ne.rq,v 1.1 2007/06/24 23:15:38 lfeigenb Exp $
-
-PREFIX : <http://example/>
-PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
-
-SELECT *
-{
- ?x1 :p ?v1 .
- ?x2 :p ?v2 .
- FILTER ( ?v1 != ?v2 )
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/lang-case-sensitivity.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/lang-case-sensitivity.ttl b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/lang-case-sensitivity.ttl
deleted file mode 100755
index 062b5d6..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/lang-case-sensitivity.ttl
+++ /dev/null
@@ -1,7 +0,0 @@
-# Data: minimal test of plain literal language sensitivity
-# $Id: lang-case-sensitivity.ttl,v 1.1 2007/06/24 23:15:38 lfeigenb Exp $
-
-@prefix : <http://example/> .
-
-:x2 :p "xyz"@en .
-:x3 :p "xyz"@EN .