You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2013/02/20 08:42:47 UTC

[9/45] properly ignored files

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/expr-2.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/expr-2.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/expr-2.rq
deleted file mode 100644
index 80fd3fa..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/expr-2.rq
+++ /dev/null
@@ -1,9 +0,0 @@
-PREFIX  dc: <http://purl.org/dc/elements/1.1/>
-PREFIX  x: <http://example.org/ns#>
-SELECT  ?title ?price
-WHERE
-    { ?book dc:title ?title . 
-      OPTIONAL
-        { ?book x:price ?price } . 
-      FILTER (?price < 15)  .
-    }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/expr-3-result.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/expr-3-result.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/expr-3-result.ttl
deleted file mode 100644
index a3cf2a5..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/expr-3-result.ttl
+++ /dev/null
@@ -1,22 +0,0 @@
-@prefix dc:      <http://purl.org/dc/elements/1.1/> .
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix x:       <http://example.org/ns#> .
-@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  "title" ;
-      rs:resultVariable  "price" ;
-      rs:solution
-                  [ rs:binding  [ rs:value    "TITLE 3" ;
-                                  rs:variable  "title"
-                                ]
-                  ] ;
-      rs:solution
-                  [ rs:binding  [ rs:value    "TITLE 1" ;
-                                  rs:variable  "title"
-                                ] ;
-                    rs:binding  [ rs:value    "10"^^xsd:integer ;
-                                  rs:variable  "price"
-                                ]
-                  ] .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/expr-3.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/expr-3.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/expr-3.rq
deleted file mode 100644
index 0e33c6c..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/expr-3.rq
+++ /dev/null
@@ -1,9 +0,0 @@
-PREFIX  dc: <http://purl.org/dc/elements/1.1/>
-PREFIX  x: <http://example.org/ns#>
-SELECT  ?title ?price
-WHERE
-    { ?book dc:title ?title . 
-      OPTIONAL
-        { ?book x:price ?price } . 
-      FILTER ( ( ! bound(?price) ) || ( ?price < 15 ) ) .
-    }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/expr-4-result.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/expr-4-result.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/expr-4-result.ttl
deleted file mode 100644
index c0c97b2..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/expr-4-result.ttl
+++ /dev/null
@@ -1,24 +0,0 @@
-@prefix dc:      <http://purl.org/dc/elements/1.1/> .
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix x:       <http://example.org/ns#> .
-@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  "title" ;
-      rs:resultVariable  "price" ;
-      rs:solution
-                  [ rs:binding  [ rs:value    "TITLE 1" ;
-                                  rs:variable  "title"
-                                ] 
-                  ] ;
-      rs:solution
-                  [ rs:binding  [ rs:value    "TITLE 3" ;
-                                  rs:variable  "title"
-                                ]
-                  ] ;
-      rs:solution
-                  [ rs:binding  [ rs:value    "TITLE 2" ;
-                                  rs:variable  "title"
-                                ]
-                  ] .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/expr-4.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/expr-4.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/expr-4.rq
deleted file mode 100644
index 6e29887..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/expr-4.rq
+++ /dev/null
@@ -1,10 +0,0 @@
-PREFIX  dc: <http://purl.org/dc/elements/1.1/>
-PREFIX  x: <http://example.org/ns#>
-SELECT  ?title ?price
-WHERE
-    { ?book dc:title ?title . 
-      OPTIONAL
-        { ?book x:price ?price . 
-          FILTER (?price < 15 && ?title = "TITLE 2") .
-        } .
-    }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/expr-5-result-not-simplified.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/expr-5-result-not-simplified.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/expr-5-result-not-simplified.ttl
deleted file mode 100644
index c0c97b2..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/expr-5-result-not-simplified.ttl
+++ /dev/null
@@ -1,24 +0,0 @@
-@prefix dc:      <http://purl.org/dc/elements/1.1/> .
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix x:       <http://example.org/ns#> .
-@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  "title" ;
-      rs:resultVariable  "price" ;
-      rs:solution
-                  [ rs:binding  [ rs:value    "TITLE 1" ;
-                                  rs:variable  "title"
-                                ] 
-                  ] ;
-      rs:solution
-                  [ rs:binding  [ rs:value    "TITLE 3" ;
-                                  rs:variable  "title"
-                                ]
-                  ] ;
-      rs:solution
-                  [ rs:binding  [ rs:value    "TITLE 2" ;
-                                  rs:variable  "title"
-                                ]
-                  ] .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/expr-5-result-simplified.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/expr-5-result-simplified.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/expr-5-result-simplified.ttl
deleted file mode 100644
index 4797fc8..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/expr-5-result-simplified.ttl
+++ /dev/null
@@ -1,27 +0,0 @@
-@prefix dc:      <http://purl.org/dc/elements/1.1/> .
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix x:       <http://example.org/ns#> .
-@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  "title" ;
-      rs:resultVariable  "price" ;
-      rs:solution
-                  [ rs:binding  [ rs:value    "TITLE 2" ;
-                                  rs:variable  "title"
-                                ] ;
-                    rs:binding  [ rs:value    "20"^^xsd:integer ;
-                                  rs:variable  "price"
-                                ]
-                  ] ;
-      rs:solution
-                  [ rs:binding  [ rs:value    "TITLE 3" ;
-                                  rs:variable  "title"
-                                ]
-                  ] ;
-      rs:solution
-                  [ rs:binding  [ rs:value    "TITLE 1" ;
-                                  rs:variable  "title"
-                                ]
-                  ] .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/expr-5.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/expr-5.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/expr-5.rq
deleted file mode 100644
index 4faca4f..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/expr-5.rq
+++ /dev/null
@@ -1,13 +0,0 @@
-PREFIX  dc: <http://purl.org/dc/elements/1.1/>
-PREFIX  x: <http://example.org/ns#>
-SELECT  ?title ?price
-WHERE
-    { ?book dc:title ?title . 
-      OPTIONAL
-        {
-          { 
-            ?book x:price ?price . 
-            FILTER (?title = "TITLE 2") .
-          }
-        } .
-    }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/manifest.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/manifest.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/manifest.ttl
deleted file mode 100644
index 1b1d977..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/manifest.ttl
+++ /dev/null
@@ -1,68 +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/optional-filter/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:comment "OPTIONAL with inner and outer FILTERs" ;
-    mf:entries
-    (:dawg-optional-filter-001 :dawg-optional-filter-002 :dawg-optional-filter-003 :dawg-optional-filter-004 :dawg-optional-filter-005-simplified :dawg-optional-filter-005-not-simplified).
-
-:dawg-optional-filter-001 a mf:QueryEvaluationTest ;
-      mf:name    "OPTIONAL-FILTER" ;
-      rdfs:comment "FILTER inside an OPTIONAL does not block an entire solution" ;
-      mf:action
-          [ qt:query  <expr-1.rq> ;
-            qt:data   <data-1.ttl> ] ;
-      mf:result  <expr-1-result.ttl> ;
-       dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/att-0082/2007-06-12-dawg-minutes.html> ;
-      dawgt:approval dawgt:Approved .
-
-:dawg-optional-filter-002 a mf:QueryEvaluationTest ;
-      mf:name    "OPTIONAL - Outer FILTER" ;
-      rdfs:comment "FILTER outside an OPTIONAL tests bound and unbound variables" ; 
-       mf:action
-          [ qt:query  <expr-2.rq> ;
-            qt:data   <data-1.ttl> ] ;
-       mf:result  <expr-2-result.ttl> ;
-       dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/att-0082/2007-06-12-dawg-minutes.html> ;
-       dawgt:approval dawgt:Approved .
-
-
-:dawg-optional-filter-003 a mf:QueryEvaluationTest ;
-      mf:name    "OPTIONAL - Outer FILTER with BOUND" ;
-      rdfs:comment "Use !bound to only run outer FILTERs against variables bound in an OPTIONAL" ;
-       mf:action
-          [ qt:query  <expr-3.rq> ;
-            qt:data   <data-1.ttl> ] ;
-       mf:result  <expr-3-result.ttl> ;
-       dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/att-0082/2007-06-12-dawg-minutes.html> ;
-       dawgt:approval dawgt:Approved .
-
-:dawg-optional-filter-004 a mf:QueryEvaluationTest ;
-      mf:name    "OPTIONAL - Inner FILTER with negative EBV for outer variables" ;
-      rdfs:comment "FILTER inside an OPTIONAL does not corrupt the entire solution" ;
-       mf:action
-          [ qt:query  <expr-4.rq> ;
-            qt:data   <data-1.ttl> ] ;
-       mf:result  <expr-4-result.ttl> ;
-       dawgt:approval dawgt:Approved ;
-       dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007OctDec/att-0006/02-dawg-minutes.html> .
-
-:dawg-optional-filter-005-simplified a mf:QueryEvaluationTest ;
-      mf:name    "dawg-optional-filter-005-simplified";
-      rdfs:comment "Double curly braces get simplified to single curly braces early on, before filters are scoped";
-       mf:action
-          [ qt:query  <expr-5.rq> ;
-            qt:data   <data-1.ttl> ] ;
-       mf:result  <expr-5-result-simplified.ttl> .
-
-:dawg-optional-filter-005-not-simplified a mf:QueryEvaluationTest ;
-      mf:name    "dawg-optional-filter-005-not-simplified";
-      rdfs:comment "Double curly braces do NOT get simplified to single curly braces early on, before filters are scoped";
-       mf:action
-          [ qt:query  <expr-5.rq> ;
-            qt:data   <data-1.ttl> ] ;
-       mf:result  <expr-5-result-not-simplified.ttl> .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/manifest.ttl.bak
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/manifest.ttl.bak b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/manifest.ttl.bak
deleted file mode 100644
index fa737b3..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional-filter/manifest.ttl.bak
+++ /dev/null
@@ -1,42 +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:comment "OPTIONAL with inner and outer FILTERs" ;
-    mf:entries
-    (<#dawg-optional-filter-001> <#dawg-optional-filter-002> <#dawg-optional-filter-003> ).
-
-<#dawg-optional-filter-001> a mf:QueryEvaluationTest ;
-      mf:name    "OPTIONAL-FILTER" ;
-      rdfs:comment "FILTER inside an OPTIONAL does not block an entire solution" ;
-      mf:action
-          [ qt:query  <expr-1.rq> ;
-            qt:data   <data-1.ttl> ] ;
-      mf:result  <expr-1-result.ttl> ;
-       dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/att-0082/2007-06-12-dawg-minutes.html> ;
-      dawgt:approval dawgt:Approved .
-
-<#dawg-optional-filter-002> a mf:QueryEvaluationTest ;
-      mf:name    "OPTIONAL - Outer FILTER" ;
-      rdfs:comment "FILTER outside an OPTIONAL tests bound and unbound variables" ; 
-       mf:action
-          [ qt:query  <expr-2.rq> ;
-            qt:data   <data-1.ttl> ] ;
-       mf:result  <expr-2-result.ttl> ;
-       dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/att-0082/2007-06-12-dawg-minutes.html> ;
-       dawgt:approval dawgt:Approved .
-
-
-<#dawg-optional-filter-003> a mf:QueryEvaluationTest ;
-      mf:name    "OPTIONAL - Outer FILTER with BOUND" ;
-      rdfs:comment "Use !bound to only run outer FILTERs against variables bound in an OPTIONAL" ;
-       mf:action
-          [ qt:query  <expr-3.rq> ;
-            qt:data   <data-1.ttl> ] ;
-       mf:result  <expr-3-result.ttl> ;
-       dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/att-0082/2007-06-12-dawg-minutes.html> ;
-       dawgt:approval dawgt:Approved .
-

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/complex-data-1.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/complex-data-1.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/complex-data-1.ttl
deleted file mode 100644
index 0c3b1f6..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/complex-data-1.ttl
+++ /dev/null
@@ -1,21 +0,0 @@
-@prefix foaf:       <http://xmlns.com/foaf/0.1/> .
-
-<tag:alice@example:foafUri> 
-    foaf:mbox   <ma...@example.net>;
-    foaf:name   "Alice";
-    foaf:nick   "WhoMe?";
-    foaf:depiction   <http://example.com/alice.png> .
-
-<tag:bert@example:foafUri> 
-    foaf:mbox   <ma...@example.net> ;
-    foaf:nick   "BigB" ;
-    foaf:name   "Bert" .
-
-<tag:eve@example:foafUri> 
-    foaf:mbox   <ma...@example.net> ;
-    foaf:firstName   "Eve" .
-
-<tag:john@example:foafUri>
-    foaf:mbox   <ma...@example.net> ;
-    foaf:nick   "jDoe";
-    foaf:isPrimaryTopicOf <http://example.com/people/johnDoe> .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/complex-data-2.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/complex-data-2.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/complex-data-2.ttl
deleted file mode 100644
index 7521627..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/complex-data-2.ttl
+++ /dev/null
@@ -1,32 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix foaf:       <http://xmlns.com/foaf/0.1/> .
-@prefix ex:        <http://example.org/things#> .
-@prefix xsd:        <http://www.w3.org/2001/XMLSchema#> .
-
-_:a rdf:type foaf:Person ;
-    foaf:name "Eve" ;
-    ex:empId "9"^^xsd:integer .
-		
-_:b rdf:type foaf:Person ;
-    foaf:name "Alice" ;
-    ex:empId "29"^^xsd:integer ;
-    ex:healthplan ex:HealthPlanD.
-		
-_:c rdf:type foaf:Person ;
-    foaf:name "Fred" ;
-    ex:empId "27"^^xsd:integer .
-
-_:e foaf:name "Bob" ;
-    ex:empId "23"^^xsd:integer ;
-    ex:healthplan ex:HealthPlanC.
-
-_:f foaf:name "Bob" ;
-    ex:empId "30"^^xsd:integer;
-    ex:healthplan ex:HealthPlanB.
-
-_:g rdf:type foaf:Person; 
-    ex:ssn "000000000";
-    foaf:name   "Bert";
-    ex:department "DeptA" ;
-    ex:healthplan ex:HealthPlanA.
-    

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/data.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/data.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/data.ttl
deleted file mode 100644
index 19c0854..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/data.ttl
+++ /dev/null
@@ -1,11 +0,0 @@
-@prefix foaf:       <http://xmlns.com/foaf/0.1/> .
-
-_:a foaf:mbox   <ma...@example.net> .
-_:a foaf:name   "Alice" .
-_:a foaf:nick   "WhoMe?" .
-
-_:b foaf:mbox   <ma...@example.net> .
-_:b foaf:name   "Bert" .
-
-_:e foaf:mbox   <ma...@example.net> .
-_:e foaf:nick   "DuckSoup" .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/manifest.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/manifest.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/manifest.ttl
deleted file mode 100644
index ae76b45..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/manifest.ttl
+++ /dev/null
@@ -1,99 +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/optional/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:comment "OPTIONAL test cases" ;
-    mf:entries
-    (:dawg-optional-001 
-     :dawg-optional-002 
-     :dawg-union-001 
-     :dawg-optional-complex-1
-     :dawg-optional-complex-2
-     :dawg-optional-complex-3
-     :dawg-optional-complex-4 ).
-
-:dawg-optional-complex-1 a mf:QueryEvaluationTest ;
-    mf:name    "Complex optional semantics: 1" ;
-    rdfs:comment
-            "Complex optional: LeftJoin(LeftJoin(BGP(..),{..}),Join(BGP(..),Union(..,..)))" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0096/21-dawg-minutes.html> ;
-    mf:action
-    [ qt:query  <q-opt-complex-1.rq> ;
-      qt:data   <complex-data-1.ttl> ] ;
-    mf:result  <result-opt-complex-1.ttl> .
-
-:dawg-optional-complex-2 a mf:QueryEvaluationTest ;
-    mf:name    "Complex optional semantics: 2" ;
-    rdfs:comment
-            "Complex optional: LeftJoin(Join(BGP(..),Graph(var,{..})),Union(..,..))" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0096/21-dawg-minutes.html> ;
-    mf:action
-    [ qt:query  <q-opt-complex-2.rq> ;
-      qt:graphData <complex-data-1.ttl>;
-      qt:data   <complex-data-2.ttl> ] ;
-    mf:result  <result-opt-complex-2.ttl> .
-
-:dawg-optional-complex-3 a mf:QueryEvaluationTest ;
-    mf:name    "Complex optional semantics: 3" ;
-    rdfs:comment
-            "Complex optional: LeftJoin(Join(BGP(..),Graph(var,{..})),LeftJoin(BGP(..),{..}))" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0096/21-dawg-minutes.html> ;
-    mf:action
-    [ qt:query  <q-opt-complex-3.rq> ;
-      qt:graphData <complex-data-1.ttl>;
-      qt:data   <complex-data-2.ttl> ] ;
-    mf:result  <result-opt-complex-3.ttl> .
-
-:dawg-optional-complex-4 a mf:QueryEvaluationTest ;
-    mf:name    "Complex optional semantics: 4" ;
-    rdfs:comment
-            "Complex optional: LeftJoin(Join(BGP(..),Union(..,..)),Join(BGP(..),Graph(varOrIRI,{..})))" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0096/21-dawg-minutes.html> ;
-    mf:action
-    [ qt:query  <q-opt-complex-4.rq> ;
-      qt:graphData <complex-data-1.ttl>;
-      qt:data   <complex-data-2.ttl> ] ;
-    mf:result  <result-opt-complex-4.ttl> .
-
-:dawg-optional-001 a mf:QueryEvaluationTest ;
-    mf:name    "One optional clause" ;
-    rdfs:comment
-            "One optional clause" ;
-    mf:action
-	[ qt:query  <q-opt-1.rq> ;
-	  qt:data   <data.ttl> ] ;
-    mf:result  <result-opt-1.ttl> ;
-    dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-    dawgt:approval dawgt:Approved .
-
-
-:dawg-optional-002 a mf:QueryEvaluationTest ;
-    mf:name    "Two optional clauses" ;
-    rdfs:comment
-	"One optional clause" ;
-    mf:action
-	[ qt:query  <q-opt-2.rq> ;
-	  qt:data   <data.ttl> ] ;
-    mf:result  <result-opt-2.ttl> ;
-    dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-    dawgt:approval dawgt:Approved .
-
-
-:dawg-union-001 a mf:QueryEvaluationTest ;
-    mf:name     "Union is not optional" ;
-    rdfs:comment "Union is not optional" ;
-    mf:action
-        [ qt:query  <q-opt-3.rq> ;
-          qt:data   <data.ttl> ] ;
-    mf:result  <result-opt-3.ttl> ;
-    dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-    dawgt:approval dawgt:Approved .
-

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/manifest.ttl.bak
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/manifest.ttl.bak b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/manifest.ttl.bak
deleted file mode 100644
index 0eee7f0..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/manifest.ttl.bak
+++ /dev/null
@@ -1,45 +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:comment "OPTIONAL test cases" ;
-    mf:entries
-    (<#dawg-optional-001> <#dawg-optional-002> <#dawg-union-001> ).
-
-<#dawg-optional-001> a mf:QueryEvaluationTest ;
-    mf:name    "One optional clause" ;
-    rdfs:comment
-            "One optional clause" ;
-    mf:action
-	[ qt:query  <q-opt-1.rq> ;
-	  qt:data   <data.ttl> ] ;
-    mf:result  <result-opt-1.ttl> ;
-    dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-    dawgt:approval dawgt:Approved .
-
-
-<#dawg-optional-002> a mf:QueryEvaluationTest ;
-    mf:name    "Two optional clauses" ;
-    rdfs:comment
-	"One optional clause" ;
-    mf:action
-	[ qt:query  <q-opt-2.rq> ;
-	  qt:data   <data.ttl> ] ;
-    mf:result  <result-opt-2.ttl> ;
-    dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-    dawgt:approval dawgt:Approved .
-
-
-<#dawg-union-001> a mf:QueryEvaluationTest ;
-    mf:name     "Union is not optional" ;
-    rdfs:comment "Union is not optional" ;
-    mf:action
-        [ qt:query  <q-opt-3.rq> ;
-          qt:data   <data.ttl> ] ;
-    mf:result  <result-opt-3.ttl> ;
-    dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-    dawgt:approval dawgt:Approved .
-

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/q-opt-1.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/q-opt-1.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/q-opt-1.rq
deleted file mode 100644
index a171bed..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/q-opt-1.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX  foaf:   <http://xmlns.com/foaf/0.1/>
-
-SELECT ?mbox ?name
-   {
-     ?x foaf:mbox ?mbox .
-     OPTIONAL { ?x foaf:name  ?name } .
-   }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/q-opt-2.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/q-opt-2.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/q-opt-2.rq
deleted file mode 100644
index a0f9998..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/q-opt-2.rq
+++ /dev/null
@@ -1,8 +0,0 @@
-PREFIX  foaf:   <http://xmlns.com/foaf/0.1/>
-
-SELECT ?mbox ?name ?nick
-   {
-     ?x foaf:mbox ?mbox .
-     OPTIONAL { ?x foaf:name  ?name } .
-     OPTIONAL { ?x foaf:nick  ?nick } .
-   }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/q-opt-3.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/q-opt-3.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/q-opt-3.rq
deleted file mode 100644
index a500712..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/q-opt-3.rq
+++ /dev/null
@@ -1,8 +0,0 @@
-PREFIX  foaf:   <http://xmlns.com/foaf/0.1/>
-
-SELECT ?mbox ?name
-   {
-     { ?x foaf:mbox ?mbox }
-   UNION 
-     { ?x foaf:mbox ?mbox . ?x foaf:name  ?name }
-   }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/q-opt-complex-1.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/q-opt-complex-1.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/q-opt-complex-1.rq
deleted file mode 100644
index 1b91d97..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/q-opt-complex-1.rq
+++ /dev/null
@@ -1,11 +0,0 @@
-PREFIX  foaf:   <http://xmlns.com/foaf/0.1/>
-SELECT ?person ?nick ?page ?img ?name ?firstN
-{ 
-    ?person foaf:nick ?nick
-    OPTIONAL { ?person foaf:isPrimaryTopicOf ?page } 
-    OPTIONAL { 
-        ?person foaf:name ?name 
-        { ?person foaf:depiction ?img } UNION 
-        { ?person foaf:firstName ?firstN } 
-    } FILTER ( bound(?page) || bound(?img) || bound(?firstN) ) 
-} 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/q-opt-complex-2.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/q-opt-complex-2.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/q-opt-complex-2.rq
deleted file mode 100644
index 4a84cd6..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/q-opt-complex-2.rq
+++ /dev/null
@@ -1,16 +0,0 @@
-PREFIX  foaf:   <http://xmlns.com/foaf/0.1/>
-PREFIX    ex:   <http://example.org/things#>
-SELECT ?id ?ssn
-WHERE 
-{ 
-    ?person 
-        a foaf:Person;
-        foaf:name ?name . 
-    GRAPH ?x { 
-        [] foaf:name ?name;
-           foaf:nick ?nick
-    } 
-    OPTIONAL { 
-        { ?person ex:empId ?id } UNION { ?person ex:ssn ?ssn } 
-    } 
-} 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/q-opt-complex-3.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/q-opt-complex-3.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/q-opt-complex-3.rq
deleted file mode 100644
index 3b9d510..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/q-opt-complex-3.rq
+++ /dev/null
@@ -1,17 +0,0 @@
-PREFIX  foaf:   <http://xmlns.com/foaf/0.1/>
-PREFIX    ex:   <http://example.org/things#>
-SELECT ?name ?nick ?plan ?dept
-WHERE 
-{ 
-    ?person 
-        a foaf:Person;
-        foaf:name ?name . 
-    GRAPH ?x { 
-        [] foaf:name ?name;
-           foaf:nick ?nick
-    } 
-    OPTIONAL { 
-        ?person ex:healthplan ?plan 
-        OPTIONAL { ?person ex:department ?dept } 
-    } 
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/q-opt-complex-4.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/q-opt-complex-4.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/q-opt-complex-4.rq
deleted file mode 100644
index c843a07..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/q-opt-complex-4.rq
+++ /dev/null
@@ -1,15 +0,0 @@
-PREFIX  foaf:   <http://xmlns.com/foaf/0.1/>
-PREFIX    ex:   <http://example.org/things#>
-SELECT ?name ?plan ?dept ?img 
-WHERE 
-{ 
-    ?person foaf:name ?name  
-    { ?person ex:healthplan ?plan } UNION { ?person ex:department ?dept } 
-    OPTIONAL { 
-        ?person a foaf:Person
-        GRAPH ?g { 
-            [] foaf:name ?name;
-               foaf:depiction ?img 
-        } 
-    } 
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/result-opt-1.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/result-opt-1.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/result-opt-1.ttl
deleted file mode 100644
index 6f3d582..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/result-opt-1.ttl
+++ /dev/null
@@ -1,25 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix foaf:    <http://xmlns.com/foaf/0.1/> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-[]    rdf:type      rs:ResultSet ;
-      rs:resultVariable  "mbox" ;
-      rs:resultVariable  "name" ;
-      rs:solution   [ rs:binding    [ rs:value      "Alice" ;
-                                      rs:variable   "name"
-                                    ] ;
-                      rs:binding    [ rs:value      <ma...@example.net> ;
-                                      rs:variable   "mbox"
-                                    ]
-                    ] ;
-      rs:solution   [ rs:binding    [ rs:value      <ma...@example.net> ;
-                                      rs:variable   "mbox"
-                                    ]
-                    ] ;
-      rs:solution   [ rs:binding    [ rs:value      "Bert" ;
-                                      rs:variable   "name"
-                                    ] ;
-                      rs:binding    [ rs:value      <ma...@example.net> ;
-                                      rs:variable   "mbox"
-                                    ]
-                    ] .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/result-opt-2.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/result-opt-2.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/result-opt-2.ttl
deleted file mode 100644
index 5f64573..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/result-opt-2.ttl
+++ /dev/null
@@ -1,32 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix foaf:    <http://xmlns.com/foaf/0.1/> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-[]    rdf:type      rs:ResultSet ;
-      rs:resultVariable  "mbox" ;
-      rs:resultVariable  "nick" ;
-      rs:resultVariable  "name" ;
-      rs:solution   [ rs:binding    [ rs:value      <ma...@example.net> ;
-                                      rs:variable   "mbox"
-                                    ] ;
-                      rs:binding    [ rs:value      "DuckSoup" ;
-                                      rs:variable   "nick"
-                                    ]
-                    ] ;
-      rs:solution   [ rs:binding    [ rs:value      <ma...@example.net> ;
-                                      rs:variable   "mbox"
-                                    ] ;
-                      rs:binding    [ rs:value      "Alice" ;
-                                      rs:variable   "name"
-                                    ] ;
-                      rs:binding    [ rs:value      "WhoMe?" ;
-                                      rs:variable   "nick"
-                                    ]
-                    ] ;
-      rs:solution   [ rs:binding    [ rs:value      <ma...@example.net> ;
-                                      rs:variable   "mbox"
-                                    ] ;
-                      rs:binding    [ rs:value      "Bert" ;
-                                      rs:variable   "name"
-                                    ]
-                    ] .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/result-opt-3.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/result-opt-3.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/result-opt-3.ttl
deleted file mode 100644
index 211bbe0..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/result-opt-3.ttl
+++ /dev/null
@@ -1,33 +0,0 @@
-@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 foaf:    <http://xmlns.com/foaf/0.1/> .
-
-[]    rdf:type      rs:ResultSet ;
-      rs:resultVariable  "mbox" ;
-      rs:resultVariable  "name" ;
-      rs:solution   [ rs:binding    [ rs:value      <ma...@example.net> ;
-                                      rs:variable   "mbox"
-                                    ] ;
-                      rs:binding    [ rs:value      "Alice" ;
-                                      rs:variable   "name"
-                                    ]
-                    ] ;
-      rs:solution   [ rs:binding    [ rs:value      <ma...@example.net> ;
-                                      rs:variable   "mbox"
-                                    ]
-                    ] ;
-      rs:solution   [ rs:binding    [ rs:value      <ma...@example.net> ;
-                                      rs:variable   "mbox"
-                                    ]
-                    ] ;
-      rs:solution   [ rs:binding    [ rs:value      "Bert" ;
-                                      rs:variable   "name"
-                                    ] ;
-                      rs:binding    [ rs:value      <ma...@example.net> ;
-                                      rs:variable   "mbox"
-                                    ]
-                    ] ;
-      rs:solution   [ rs:binding    [ rs:value      <ma...@example.net> ;
-                                      rs:variable   "mbox"
-                                    ]
-                    ] .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/result-opt-complex-1.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/result-opt-complex-1.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/result-opt-complex-1.ttl
deleted file mode 100644
index 51c80cb..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/result-opt-complex-1.ttl
+++ /dev/null
@@ -1,34 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix foaf:    <http://xmlns.com/foaf/0.1/> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-[]    rdf:type      rs:ResultSet ;
-      rs:resultVariable  "person" ;
-      rs:resultVariable  "nick" ;
-      rs:resultVariable  "page" ;
-      rs:resultVariable  "img" ;
-      rs:resultVariable  "name" ;
-      rs:resultVariable  "firstN" ;
-      rs:solution   [ rs:binding    [ rs:value      <tag:alice@example:foafUri> ;
-                                      rs:variable   "person"
-                                    ] ;
-                      rs:binding    [ rs:value      "WhoMe?" ;
-                                      rs:variable   "nick"
-                                    ];
-                      rs:binding    [ rs:value      <http://example.com/alice.png> ;
-                                      rs:variable   "img"
-                                    ];
-                      rs:binding    [ rs:value      "Alice" ;
-                                      rs:variable   "name"
-                                    ]
-                    ] ;
-      rs:solution   [ rs:binding    [ rs:value      <tag:john@example:foafUri> ;
-                                      rs:variable   "person"
-                                    ] ;
-                      rs:binding    [ rs:value      "jDoe" ;
-                                      rs:variable   "nick"
-                                    ];
-                      rs:binding    [ rs:value      <http://example.com/people/johnDoe> ;
-                                      rs:variable   "page"
-                                    ]
-                    ] .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/result-opt-complex-2.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/result-opt-complex-2.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/result-opt-complex-2.ttl
deleted file mode 100644
index 36e3f26..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/result-opt-complex-2.ttl
+++ /dev/null
@@ -1,16 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix foaf:    <http://xmlns.com/foaf/0.1/> .
-@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  "id" ;
-      rs:resultVariable  "ssn" ;
-      rs:solution   [ rs:binding    [ rs:value      "29"^^xsd:integer ;
-                                      rs:variable   "id"
-                                    ] 
-                    ] ;
-      rs:solution   [ rs:binding    [ rs:value      "000000000" ;
-                                      rs:variable   "ssn"
-                                    ]
-                    ] .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/result-opt-complex-3.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/result-opt-complex-3.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/result-opt-complex-3.ttl
deleted file mode 100644
index 03d2f66..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/result-opt-complex-3.ttl
+++ /dev/null
@@ -1,33 +0,0 @@
-@prefix ex:      <http://example.org/things#> .
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix foaf:    <http://xmlns.com/foaf/0.1/> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-[]    rdf:type      rs:ResultSet ;
-      rs:resultVariable  "name" ;
-      rs:resultVariable  "nick" ;
-      rs:resultVariable  "plan" ;
-      rs:resultVariable  "dept" ;
-      rs:solution   [ rs:binding    [ rs:value      "Alice" ;
-                                      rs:variable   "name"
-                                    ] ;
-                      rs:binding    [ rs:value      "WhoMe?" ;
-                                      rs:variable   "nick"
-                                    ];
-                      rs:binding    [ rs:value      ex:HealthPlanD ;
-                                      rs:variable   "plan"
-                                    ]
-                    ] ;
-      rs:solution  _:a . _:a  rs:binding    [ rs:value      "Bert" ;
-                                      rs:variable   "name"
-                                    ] ;
-                      rs:binding    [ rs:value      "BigB" ;
-                                      rs:variable   "nick"
-                                    ];
-                      rs:binding    [ rs:value      ex:HealthPlanA ;
-                                      rs:variable   "plan"
-                                    ];
-                      rs:binding    [ rs:value      "DeptA" ;
-                                      rs:variable   "dept"
-                                    ]
-                    .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/result-opt-complex-4.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/result-opt-complex-4.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/result-opt-complex-4.ttl
deleted file mode 100644
index 141d855..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/optional/result-opt-complex-4.ttl
+++ /dev/null
@@ -1,48 +0,0 @@
-@prefix ex:      <http://example.org/things#>.
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix foaf:    <http://xmlns.com/foaf/0.1/> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-[]    rdf:type      rs:ResultSet ;
-      rs:resultVariable  "img" ;
-      rs:resultVariable  "name" ;
-      rs:resultVariable  "plan" ;
-      rs:resultVariable  "dept" ;
-      rs:solution   [ rs:binding    [ rs:value       <http://example.com/alice.png> ;
-                                      rs:variable   "img"
-                                    ] ;
-                      rs:binding    [ rs:value      "Alice" ;
-                                      rs:variable   "name"
-                                    ];
-                      rs:binding    [ rs:value       ex:HealthPlanD;
-                                      rs:variable   "plan"
-                                    ]
-                    ] ;
-      rs:solution   [ rs:binding    [ rs:value      "Bob" ;
-                                      rs:variable   "name"
-                                    ];
-                      rs:binding    [ rs:value       ex:HealthPlanC;
-                                      rs:variable   "plan"
-                                    ]
-                    ] ;
-      rs:solution   [ rs:binding    [ rs:value      "Bob" ;
-                                      rs:variable   "name"
-                                    ];
-                      rs:binding    [ rs:value       ex:HealthPlanB;
-                                      rs:variable   "plan"
-                                    ]
-                    ] ;
-      rs:solution   [ rs:binding    [ rs:value      "Bert" ;
-                                      rs:variable   "name"
-                                    ];
-                      rs:binding    [ rs:value      "DeptA" ;
-                                      rs:variable   "dept"
-                                    ]
-                    ] ;
-      rs:solution   [ rs:binding    [ rs:value      "Bert" ;
-                                      rs:variable   "name"
-                                    ];
-                      rs:binding    [ rs:value       ex:HealthPlanA ;
-                                      rs:variable   "plan"
-                                    ];
-                    ]                     .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/reduced/manifest.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/reduced/manifest.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/reduced/manifest.ttl
deleted file mode 100644
index 253e225..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/reduced/manifest.ttl
+++ /dev/null
@@ -1,38 +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/reduced/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 "REDUCED" ;
-    mf:entries
-    ( 
-      :reduced-1
-      :reduced-2
-    ) .
-
-:reduced-1 rdf:type mf:QueryEvaluationTest ;
-    mf:resultCardinality mf:LaxCardinality ;
-    mf:name    "SELECT REDUCED *" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007OctDec/att-0069/13-dawg-minutes.html> ;
-    #dawgt:approval dawgt:NotApproved ;
-    
-    mf:action
-            [ qt:query <reduced-1.rq> ;
-              qt:data <reduced-star.ttl> ] ;
-    mf:result <reduced-1.srx> .
-
-:reduced-2 rdf:type mf:QueryEvaluationTest ;
-    mf:resultCardinality mf:LaxCardinality ;
-    mf:name    "SELECT REDUCED ?x with strings" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007OctDec/att-0069/13-dawg-minutes.html> ;
-    #dawgt:approval dawgt:NotApproved ;
-    mf:action
-            [ qt:query  <reduced-2.rq> ;
-              qt:data   <reduced-str.ttl> ] ;
-    mf:result  <reduced-2.srx> .
-

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/reduced/reduced-1.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/reduced/reduced-1.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/reduced/reduced-1.rq
deleted file mode 100644
index cb065ae..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/reduced/reduced-1.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX :         <http://example/> 
-PREFIX xsd:      <http://www.w3.org/2001/XMLSchema#> 
-SELECT REDUCED * 
-WHERE { 
-  { ?s :p ?o } UNION { ?s :q ?o }
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/reduced/reduced-1.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/reduced/reduced-1.srx b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/reduced/reduced-1.srx
deleted file mode 100644
index 99ca0fa..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/reduced/reduced-1.srx
+++ /dev/null
@@ -1,24 +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/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/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/reduced/reduced-2.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/reduced/reduced-2.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/reduced/reduced-2.rq
deleted file mode 100644
index bb900a9..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/reduced/reduced-2.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX :      <http://example/> 
-PREFIX xsd:   <http://www.w3.org/2001/XMLSchema#>
-
-SELECT REDUCED ?v
-{
-    ?x ?p ?v .
-}

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/reduced/reduced-2.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/reduced/reduced-2.srx b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/reduced/reduced-2.srx
deleted file mode 100644
index da0974b..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/reduced/reduced-2.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/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/reduced/reduced-star.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/reduced/reduced-star.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/reduced/reduced-star.ttl
deleted file mode 100644
index 5aed9bb..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/reduced/reduced-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/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/reduced/reduced-str.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/reduced/reduced-str.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/reduced/reduced-str.ttl
deleted file mode 100644
index 6c0dbb2..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/reduced/reduced-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/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/manifest.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/manifest.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/manifest.ttl
deleted file mode 100644
index d351908..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/manifest.ttl
+++ /dev/null
@@ -1,57 +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/regex/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:comment "SPARQL regex test cases" ;
-    mf:entries (
-      :dawg-regex-001 :dawg-regex-002 :dawg-regex-003 :dawg-regex-004
-    ).
-
-:dawg-regex-001 a mf:QueryEvaluationTest ;
-      mf:name    "regex-query-001" ;
-      dawgt:approval dawgt:Approved ;
-      dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0029.html> ;
-      rdfs:comment
-            "Simple unanchored match test" ;
-        mf:action
-            [ qt:query  <regex-query-001.rq> ;
-              qt:data   <regex-data-01.ttl> ] ;
-        mf:result  <regex-result-001.ttl> .
-
-:dawg-regex-002 a mf:QueryEvaluationTest ;
-      mf:name    "regex-query-002" ;
-      dawgt:approval dawgt:Approved ;
-      dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0029.html> ;
-      rdfs:comment
-          "Case insensitive unanchored match test" ;
-      mf:action
-          [ qt:query  <regex-query-002.rq> ;
-            qt:data   <regex-data-01.ttl> ] ;
-      mf:result  <regex-result-002.ttl> .
-
-:dawg-regex-003 a mf:QueryEvaluationTest ;
-      mf:name    "regex-query-003" ;
-      dawgt:approval dawgt:Approved ;
-      dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0029.html> ;
-      rdfs:comment
-          "Use/mention test" ;
-      mf:action
-          [ qt:query  <regex-query-003.rq> ;
-            qt:data   <regex-data-01.ttl> ] ;
-      mf:result  <regex-result-003.ttl> .
-
-:dawg-regex-004 a mf:QueryEvaluationTest ;
-      mf:name    "regex-query-004" ;
-      dawgt:approval dawgt:Approved ;
-      dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0029.html> ;
-      rdfs:comment
-          "str()+URI test" ;
-      mf:action
-          [ qt:query  <regex-query-004.rq> ;
-            qt:data   <regex-data-01.ttl> ] ;
-      mf:result  <regex-result-004.ttl> .
-

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/manifest.ttl.bak
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/manifest.ttl.bak b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/manifest.ttl.bak
deleted file mode 100644
index 17ce2e5..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/manifest.ttl.bak
+++ /dev/null
@@ -1,56 +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:comment "SPARQL regex test cases" ;
-    mf:entries (
-      <#dawg-regex-001> <#dawg-regex-002> <#dawg-regex-003> <#dawg-regex-004>
-    ).
-
-<#dawg-regex-001> a mf:QueryEvaluationTest ;
-      mf:name    "regex-query-001" ;
-      dawgt:approval dawgt:Approved ;
-      dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0029.html> ;
-      rdfs:comment
-            "Simple unanchored match test" ;
-        mf:action
-            [ qt:query  <regex-query-001.rq> ;
-              qt:data   <regex-data-01.ttl> ] ;
-        mf:result  <regex-result-001.ttl> .
-
-<#dawg-regex-002> a mf:QueryEvaluationTest ;
-      mf:name    "regex-query-002" ;
-      dawgt:approval dawgt:Approved ;
-      dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0029.html> ;
-      rdfs:comment
-          "Case insensitive unanchored match test" ;
-      mf:action
-          [ qt:query  <regex-query-002.rq> ;
-            qt:data   <regex-data-01.ttl> ] ;
-      mf:result  <regex-result-002.ttl> .
-
-<#dawg-regex-003> a mf:QueryEvaluationTest ;
-      mf:name    "regex-query-003" ;
-      dawgt:approval dawgt:Approved ;
-      dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0029.html> ;
-      rdfs:comment
-          "Use/mention test" ;
-      mf:action
-          [ qt:query  <regex-query-003.rq> ;
-            qt:data   <regex-data-01.ttl> ] ;
-      mf:result  <regex-result-003.ttl> .
-
-<#dawg-regex-004> a mf:QueryEvaluationTest ;
-      mf:name    "regex-query-004" ;
-      dawgt:approval dawgt:Approved ;
-      dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0029.html> ;
-      rdfs:comment
-          "str()+URI test" ;
-      mf:action
-          [ qt:query  <regex-query-004.rq> ;
-            qt:data   <regex-data-01.ttl> ] ;
-      mf:result  <regex-result-004.ttl> .
-

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-data-01.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-data-01.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-data-01.ttl
deleted file mode 100644
index 930f1b7..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-data-01.ttl
+++ /dev/null
@@ -1,5 +0,0 @@
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix ex: <http://example.com/#> .
-
-ex:foo rdf:value "abcDEFghiJKL" , "ABCdefGHIjkl", "0123456789",
-	<http://example.com/uri>, "http://example.com/literal" .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-query-001.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-query-001.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-query-001.rq
deleted file mode 100644
index 3c8f661..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-query-001.rq
+++ /dev/null
@@ -1,8 +0,0 @@
-PREFIX  rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-PREFIX  ex: <http://example.com/#>
-
-SELECT ?val
-WHERE {
-	ex:foo rdf:value ?val .
-	FILTER regex(?val, "GHI")
-}

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-query-002.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-query-002.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-query-002.rq
deleted file mode 100644
index b0bb7fd..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-query-002.rq
+++ /dev/null
@@ -1,8 +0,0 @@
-PREFIX  ex: <http://example.com/#>
-PREFIX  rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-
-SELECT ?val
-WHERE {
-	ex:foo rdf:value ?val .
-	FILTER regex(?val, "DeFghI", "i")
-}

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-query-003.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-query-003.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-query-003.rq
deleted file mode 100644
index 384da9b..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-query-003.rq
+++ /dev/null
@@ -1,8 +0,0 @@
-PREFIX  rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-PREFIX  ex:  <http://example.com/#>
-
-SELECT ?val
-WHERE {
-	ex:foo rdf:value ?val .
-	FILTER regex(?val, "example\\.com")
-}

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-query-004.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-query-004.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-query-004.rq
deleted file mode 100644
index 1635291..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-query-004.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX  rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-PREFIX  ex: <http://example.com/#>
-SELECT ?val
-WHERE {
-	ex:foo rdf:value ?val .
-	FILTER regex(str(?val), "example\\.com")
-}

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-result-001.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-result-001.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-result-001.ttl
deleted file mode 100644
index fe8ad33..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-result-001.ttl
+++ /dev/null
@@ -1,10 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[]  <http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
-                rs:ResultSet ;
-    rs:resultVariable
-                "val" ;
-    rs:solution [ rs:binding  [ rs:value    "ABCdefGHIjkl" ;
-                                rs:variable "val"
-                              ] ;
-                ] .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-result-002.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-result-002.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-result-002.ttl
deleted file mode 100644
index afe3844..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-result-002.ttl
+++ /dev/null
@@ -1,14 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[]  <http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
-                rs:ResultSet ;
-    rs:resultVariable
-                "val" ;
-    rs:solution [ rs:binding  [ rs:value    "ABCdefGHIjkl" ;
-                                rs:variable "val"
-                              ] ;
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    "abcDEFghiJKL" ;
-                                rs:variable "val"
-                              ] ;
-                ] .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-result-003.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-result-003.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-result-003.ttl
deleted file mode 100644
index 8db3958..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-result-003.ttl
+++ /dev/null
@@ -1,10 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[]  <http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
-                rs:ResultSet ;
-    rs:resultVariable
-                "val" ;
-    rs:solution [ rs:binding  [ rs:value    "http://example.com/literal" ;
-                                rs:variable "val"
-                              ] ;
-                ] .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-result-004.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-result-004.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-result-004.ttl
deleted file mode 100644
index 18b66bd..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/regex/regex-result-004.ttl
+++ /dev/null
@@ -1,14 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[]  <http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
-                rs:ResultSet ;
-    rs:resultVariable
-                "val" ;
-    rs:solution [ rs:binding  [ rs:value    "http://example.com/literal" ;
-                                rs:variable "val"
-                              ] ;
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.com/uri> ;
-                                rs:variable "val"
-                              ] ;
-                ] .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/data.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/data.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/data.ttl
deleted file mode 100644
index 5718aa0..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/data.ttl
+++ /dev/null
@@ -1,18 +0,0 @@
-@prefix :  <http://example.org/ns#> .
-@prefix xsd:        <http://www.w3.org/2001/XMLSchema#> .
-
-:x :num  "1"^^xsd:integer .
-:x :num  "2"^^xsd:integer .
-:x :num  "3"^^xsd:integer .
-:x :num  "4"^^xsd:integer .
-:x :num  "1.5"^^xsd:decimal .
-
-:y :num  "1"^^xsd:integer .
-:y :num  "2"^^xsd:integer .
-:y :num  "3"^^xsd:integer .
-
-:x :str  "aaa" .
-:x :str  "002" .
-:x :str  "1" .
-:x :str  "AAA" .
-:x :str  "" .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/manifest.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/manifest.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/manifest.ttl
deleted file mode 100644
index fe4d9d5..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/manifest.ttl
+++ /dev/null
@@ -1,117 +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/solution-seq/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 "Solution Sequence" ;
-    mf:entries
-    ( 
-        :limit-1
-        :limit-2
-        :limit-3
-        :limit-4
-        :offset-1
-        :offset-2
-        :offset-3
-        :offset-4
-        :slice-1
-        :slice-2
-        :slice-3
-        :slice-4
-        :slice-5
-    ) .
-    
-
-:limit-1 rdf:type mf:QueryEvaluationTest ;
-    mf:name "Limit 1" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes#item03> ;
-    mf:action [ qt:query  <slice-01.rq> ; qt:data <data.ttl> ] ;
-    mf:result <slice-results-01.ttl> .
-
-:limit-2 rdf:type mf:QueryEvaluationTest ;
-    mf:name "Limit 2" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes#item03> ;
-    mf:action [ qt:query  <slice-02.rq> ; qt:data <data.ttl> ] ;
-    mf:result <slice-results-02.ttl> .
-
-:limit-3 rdf:type mf:QueryEvaluationTest ;
-    mf:name "Limit 3" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes#item03> ;
-    mf:action [ qt:query  <slice-03.rq> ; qt:data <data.ttl> ] ;
-    mf:result <slice-results-03.ttl> .
-
-:limit-4 rdf:type mf:QueryEvaluationTest ;
-    mf:name "Limit 4" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes#item03> ;
-    mf:action [ qt:query  <slice-04.rq> ; qt:data <data.ttl> ] ;
-    mf:result <slice-results-04.ttl> .
-
-:offset-1 rdf:type mf:QueryEvaluationTest ;
-    mf:name "Offset 1" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes#item03> ;
-    mf:action [ qt:query  <slice-10.rq> ; qt:data <data.ttl> ] ;
-    mf:result <slice-results-10.ttl> .
-
-:offset-2 rdf:type mf:QueryEvaluationTest ;
-    mf:name "Offset 2" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes#item03> ;
-    mf:action [ qt:query  <slice-11.rq> ; qt:data <data.ttl> ] ;
-    mf:result <slice-results-11.ttl> .
-
-:offset-3 rdf:type mf:QueryEvaluationTest ;
-    mf:name "Offset 3" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes#item03> ;
-    mf:action [ qt:query  <slice-12.rq> ; qt:data <data.ttl> ] ;
-    mf:result <slice-results-12.ttl> .
-
-:offset-4 rdf:type mf:QueryEvaluationTest ;
-    mf:name "Offset 4" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes#item03> ;
-    mf:action [ qt:query  <slice-13.rq> ; qt:data <data.ttl> ] ;
-    mf:result <slice-results-13.ttl> .
-
-:slice-1 rdf:type mf:QueryEvaluationTest ;
-    mf:name "Slice 1" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes#item03> ;
-    mf:action [ qt:query  <slice-20.rq> ; qt:data <data.ttl> ] ;
-    mf:result <slice-results-20.ttl> .
-
-:slice-2 rdf:type mf:QueryEvaluationTest ;
-    mf:name "Slice 2" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes#item03> ;
-    mf:action [ qt:query  <slice-21.rq> ; qt:data <data.ttl> ] ;
-    mf:result <slice-results-21.ttl> .
-
-:slice-3 rdf:type mf:QueryEvaluationTest ;
-    mf:name "Slice 3" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes#item03> ;
-    mf:action [ qt:query  <slice-22.rq> ; qt:data <data.ttl> ] ;
-    mf:result <slice-results-22.ttl> .
-
-:slice-4 rdf:type mf:QueryEvaluationTest ;
-    mf:name "Slice 4" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes#item03> ;
-    mf:action [ qt:query  <slice-23.rq> ; qt:data <data.ttl> ] ;
-    mf:result <slice-results-23.ttl> .
-
-:slice-5 rdf:type mf:QueryEvaluationTest ;
-    mf:name "Slice 5" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0047/31-dawg-minutes#item03> ;
-    mf:action [ qt:query  <slice-24.rq> ; qt:data <data.ttl> ] ;
-    mf:result <slice-results-24.ttl> .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/manifest.ttl.bak
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/manifest.ttl.bak b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/manifest.ttl.bak
deleted file mode 100644
index 935e174..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/manifest.ttl.bak
+++ /dev/null
@@ -1,89 +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#> .
-
-<>  rdf:type mf:Manifest ;
-    rdfs:label "Solution Sequence" ;
-    mf:entries
-    ( 
-        <#limit-1>
-        <#limit-2>
-        <#limit-3>
-        <#limit-4>
-        <#offset-1>
-        <#offset-2>
-        <#offset-3>
-        <#offset-4>
-        <#slice-1>
-        <#slice-2>
-        <#slice-3>
-        <#slice-4>
-        <#slice-5>
-    ) .
-    
-
-<#limit-1>
-    mf:name "Limit 1" ;
-    mf:action [ qt:query  <slice-01.rq> ; qt:data <data.ttl> ] ;
-    mf:result <slice-results-01.ttl> .
-
-<#limit-2>
-    mf:name "Limit 2" ;
-    mf:action [ qt:query  <slice-02.rq> ; qt:data <data.ttl> ] ;
-    mf:result <slice-results-02.ttl> .
-
-<#limit-3>
-    mf:name "Limit 3" ;
-    mf:action [ qt:query  <slice-03.rq> ; qt:data <data.ttl> ] ;
-    mf:result <slice-results-03.ttl> .
-
-<#limit-4>
-    mf:name "Limit 4" ;
-    mf:action [ qt:query  <slice-04.rq> ; qt:data <data.ttl> ] ;
-    mf:result <slice-results-04.ttl> .
-
-<#offset-1>
-    mf:name "Offset 1" ;
-    mf:action [ qt:query  <slice-10.rq> ; qt:data <data.ttl> ] ;
-    mf:result <slice-results-10.ttl> .
-
-<#offset-2>
-    mf:name "Offset 2" ;
-    mf:action [ qt:query  <slice-11.rq> ; qt:data <data.ttl> ] ;
-    mf:result <slice-results-11.ttl> .
-
-<#offset-3>
-    mf:name "Offset 3" ;
-    mf:action [ qt:query  <slice-12.rq> ; qt:data <data.ttl> ] ;
-    mf:result <slice-results-12.ttl> .
-
-<#offset-4>
-    mf:name "Offset 4" ;
-    mf:action [ qt:query  <slice-13.rq> ; qt:data <data.ttl> ] ;
-    mf:result <slice-results-13.ttl> .
-
-<#slice-1>
-    mf:name "Slice 1" ;
-    mf:action [ qt:query  <slice-20.rq> ; qt:data <data.ttl> ] ;
-    mf:result <slice-results-20.ttl> .
-
-<#slice-2>
-    mf:name "Slice 2" ;
-    mf:action [ qt:query  <slice-21.rq> ; qt:data <data.ttl> ] ;
-    mf:result <slice-results-21.ttl> .
-
-<#slice-3>
-    mf:name "Slice 3" ;
-    mf:action [ qt:query  <slice-22.rq> ; qt:data <data.ttl> ] ;
-    mf:result <slice-results-22.ttl> .
-
-<#slice-4>
-    mf:name "Slice 4" ;
-    mf:action [ qt:query  <slice-23.rq> ; qt:data <data.ttl> ] ;
-    mf:result <slice-results-23.ttl> .
-
-<#slice-5>
-    mf:name "Slice 5" ;
-    mf:action [ qt:query  <slice-24.rq> ; qt:data <data.ttl> ] ;
-    mf:result <slice-results-24.ttl> .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/slice-01.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/slice-01.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/slice-01.rq
deleted file mode 100644
index d9ec37a..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/slice-01.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example.org/ns#>
-
-SELECT ?v
-WHERE { [] :num ?v }
-ORDER BY ?v
-LIMIT 1

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/slice-02.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/slice-02.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/slice-02.rq
deleted file mode 100644
index a438f45..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/slice-02.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX : <http://example.org/ns#>
-
-SELECT ?v
-WHERE { [] :num ?v }
-ORDER BY ?v
-LIMIT 100
-

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/slice-03.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/slice-03.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/slice-03.rq
deleted file mode 100644
index 3ed7eb2..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/slice-03.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example.org/ns#>
-
-SELECT ?v
-WHERE { [] :num ?v }
-ORDER BY ?v
-LIMIT 0

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/slice-04.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/slice-04.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/slice-04.rq
deleted file mode 100644
index 8ded67d..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/slice-04.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example.org/ns#>
-
-SELECT DISTINCT ?v
-WHERE { [] :num ?v }
-ORDER BY ?v
-LIMIT 100

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/slice-10.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/slice-10.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/slice-10.rq
deleted file mode 100644
index 212e98f..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/slice-10.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example.org/ns#>
-
-SELECT ?v
-WHERE { [] :num ?v }
-ORDER BY ?v
-OFFSET 1

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/slice-11.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/slice-11.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/slice-11.rq
deleted file mode 100644
index b40c5e7..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/slice-11.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example.org/ns#>
-
-SELECT ?v
-WHERE { [] :num ?v }
-ORDER BY ?v
-OFFSET 0

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/slice-12.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/slice-12.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/slice-12.rq
deleted file mode 100644
index 25a3a38..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/solution-seq/slice-12.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example.org/ns#>
-
-SELECT ?v
-WHERE { [] :num ?v }
-ORDER BY ?v
-OFFSET 100