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:46 UTC

[18/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/algebra/filter-nested-1.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-nested-1.srx b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-nested-1.srx
deleted file mode 100644
index 3a0f024..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-nested-1.srx
+++ /dev/null
@@ -1,16 +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>
-  </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/algebra/filter-nested-2.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-nested-2.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-nested-2.rq
deleted file mode 100644
index 8430cef..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-nested-2.rq
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX : <http://example/> 
-
-SELECT ?v
-{ :x :p ?v . { FILTER(?v = 1) } }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-nested-2.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-nested-2.srx b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-nested-2.srx
deleted file mode 100644
index 8ac7e1c..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-nested-2.srx
+++ /dev/null
@@ -1,11 +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>
-  </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/algebra/filter-placement-1.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-placement-1.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-placement-1.rq
deleted file mode 100644
index cdabba4..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-placement-1.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX : <http://example/>
-
-SELECT ?v 
-{ 
-    ?s :p ?v . 
-    FILTER (?v = 2)
-}

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-placement-1.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-placement-1.srx b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-placement-1.srx
deleted file mode 100644
index 7f4d990..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-placement-1.srx
+++ /dev/null
@@ -1,16 +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">2</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/algebra/filter-placement-2.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-placement-2.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-placement-2.rq
deleted file mode 100644
index 0f4e1a3..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-placement-2.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX : <http://example/>
-
-SELECT ?v 
-{ 
-    FILTER (?v = 2)
-    ?s :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/algebra/filter-placement-2.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-placement-2.srx b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-placement-2.srx
deleted file mode 100644
index 7f4d990..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-placement-2.srx
+++ /dev/null
@@ -1,16 +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">2</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/algebra/filter-placement-3.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-placement-3.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-placement-3.rq
deleted file mode 100644
index f3be6d2..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-placement-3.rq
+++ /dev/null
@@ -1,9 +0,0 @@
-PREFIX : <http://example/>
-
-SELECT ?v ?w
-{ 
-    FILTER (?v = 2)
-    FILTER (?w = 3)
-    ?s :p ?v . 
-    ?s :q ?w .
-}

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-placement-3.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-placement-3.srx b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-placement-3.srx
deleted file mode 100644
index dc55af4..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-placement-3.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="v"/>
-    <variable name="w"/>
-  </head>
-  <results>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-      <binding name="w">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</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/algebra/filter-scope-1.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-scope-1.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-scope-1.rq
deleted file mode 100644
index 917a67f..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-scope-1.rq
+++ /dev/null
@@ -1,9 +0,0 @@
-PREFIX :    <http://example/>
-
-SELECT *
-{ 
-    :x :p ?v . 
-    { :x :q ?w 
-      OPTIONAL {  :x :p ?v2 FILTER(?v = 1) }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-scope-1.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-scope-1.srx b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-scope-1.srx
deleted file mode 100644
index 34c182d..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/filter-scope-1.srx
+++ /dev/null
@@ -1,109 +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"/>
-    <variable name="w"/>
-    <variable name="v2"/>
-  </head>
-  <results>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">4</literal>
-      </binding>
-      <binding name="w">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">4</literal>
-      </binding>
-      <binding name="w">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">4</literal>
-      </binding>
-      <binding name="w">
-        <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">3</literal>
-      </binding>
-      <binding name="w">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</literal>
-      </binding>
-      <binding name="w">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</literal>
-      </binding>
-      <binding name="w">
-        <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">2</literal>
-      </binding>
-      <binding name="w">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-      <binding name="w">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-      <binding name="w">
-        <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>
-      <binding name="w">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
-      </binding>
-      <binding name="w">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
-      </binding>
-      <binding name="w">
-        <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/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/join-combo-1.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/join-combo-1.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/join-combo-1.rq
deleted file mode 100644
index 60b2992..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/join-combo-1.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX :    <http://example/>
-
-SELECT ?a ?y ?d ?z
-{ 
-    ?a :p ?c OPTIONAL { ?a :r ?d }. 
-    ?a ?p 1 { ?p a ?y } UNION { ?a ?z ?p } 
-}
\ 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/algebra/join-combo-1.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/join-combo-1.srx b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/join-combo-1.srx
deleted file mode 100644
index 84e94f2..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/join-combo-1.srx
+++ /dev/null
@@ -1,36 +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="a"/>
-        <variable name="y"/>
-        <variable name="d"/>
-        <variable name="z"/>
-    </head>
-    <results>
-        <result>
-            <binding name="a">
-                <uri>http://example/x1</uri>
-            </binding>
-            <binding name="y">
-                <uri>http://www.w3.org/1999/02/22-rdf-syntax-ns#Property</uri>
-            </binding>
-            <binding name="d">
-                <literal datatype="http://www.w3.org/2001/XMLSchema#integer">4</literal>
-            </binding>
-        </result>
-        <result>
-            <binding name="a">
-                <uri>http://example/x1</uri>
-            </binding>
-            <binding name="z">
-                <uri>http://example/z</uri>
-            </binding>
-            <binding name="d">
-                <literal datatype="http://www.w3.org/2001/XMLSchema#integer">4</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/algebra/join-combo-2.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/join-combo-2.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/join-combo-2.rq
deleted file mode 100644
index 36cfd3c..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/join-combo-2.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX :    <http://example/>
-
-SELECT ?x ?y ?z
-{ 
-    GRAPH ?g { ?x ?p 1 } { ?x :p ?y } UNION { ?p a ?z }
-}

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/join-combo-2.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/join-combo-2.srx b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/join-combo-2.srx
deleted file mode 100644
index 817a717..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/join-combo-2.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="x"/>
-        <variable name="y"/>
-        <variable name="z"/>
-    </head>
-    <results>
-        <result>
-            <binding name="x">
-                <uri>http://example/b</uri>
-            </binding>
-            <binding name="z">
-                <uri>http://www.w3.org/1999/02/22-rdf-syntax-ns#Property</uri>
-            </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/algebra/join-combo-graph-1.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/join-combo-graph-1.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/join-combo-graph-1.ttl
deleted file mode 100644
index 15b720a..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/join-combo-graph-1.ttl
+++ /dev/null
@@ -1,5 +0,0 @@
-@prefix : <http://example/> .
-@prefix xsd:        <http://www.w3.org/2001/XMLSchema#> .
-
- :b :p "1"^^xsd:integer .
-_:a :p "9"^^xsd:integer .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/join-combo-graph-2.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/join-combo-graph-2.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/join-combo-graph-2.ttl
deleted file mode 100644
index ac7d3b7..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/join-combo-graph-2.ttl
+++ /dev/null
@@ -1,15 +0,0 @@
-@prefix   :         <http://example/> .
-@prefix   rdf:      <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix xsd:        <http://www.w3.org/2001/XMLSchema#> .
-
-:x1 :p "1"^^xsd:integer .
-:x1 :r "4"^^xsd:integer .
-:x2 :p "2"^^xsd:integer .
-:x2 :r "10"^^xsd:integer .
-:x2 :x "1"^^xsd:integer .
-:x3 :q "3"^^xsd:integer .
-:x3 :q "4"^^xsd:integer .
-:x3 :s "1"^^xsd:integer .
-:x3 :t :s .
-:p a rdf:Property .
-:x1 :z :p .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/manifest.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/manifest.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/manifest.ttl
deleted file mode 100644
index 73595a2..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/manifest.ttl
+++ /dev/null
@@ -1,175 +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/algebra/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 "Algebra" ;
-    mf:entries
-    (   :nested-opt-1 
-        :nested-opt-2 
-        :opt-filter-1 
-        :opt-filter-2 
-        :opt-filter-3 
-        :filter-place-1 
-        :filter-place-2 
-        :filter-place-3 
-        :filter-nested-1 
-        :filter-nested-2 
-        :filter-scope-1 
-        :join-scope-1
-        :join-combo-1 
-        :join-combo-2
-    ) .
-
-:join-combo-1 a mf:QueryEvaluationTest ;
-   mf:name    "Join operator with OPTs, BGPs, and UNIONs" ;
-   rdfs:comment """Tests nested combination of Join with a BGP / OPT and a BGP / UNION""" ;
-      dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0096/21-dawg-minutes.html> ;
-    dawgt:approval dawgt:Approved ;
-         mf:action
-            [ qt:query  <join-combo-1.rq> ;
-              qt:data   <join-combo-graph-2.ttl> ] ;
-         mf:result  <join-combo-1.srx> .
-
-:join-combo-2 a mf:QueryEvaluationTest ;
-   mf:name    "Join operator with Graph and Union" ;
-   rdfs:comment """Tests combination of Join operator with Graph on LHS and Union on RHS""" ;
-      dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0096/21-dawg-minutes.html> ;
-    dawgt:approval dawgt:Approved ;
-         mf:action
-            [ qt:query  <join-combo-2.rq> ;
-              qt:graphData   <join-combo-graph-1.ttl>;
-              qt:data        <join-combo-graph-2.ttl> ] ;
-         mf:result  <join-combo-2.srx> .
-
-:nested-opt-1 rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Nested Optionals - 1" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://www.w3.org/2007/06/19-dawg-minutes.html> ;
-    rdfs:comment """Nested-optionals with a shared variable that does not appear in the middle pattern (a not well-formed query pattern as per "Semantics and Complexity" of SPARQL""" ;
-         mf:action
-            [ qt:query  <two-nested-opt.rq> ;
-              qt:data   <two-nested-opt.ttl> ] ;
-         mf:result  <two-nested-opt.srx> .
-
-:nested-opt-2 rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Nested Optionals - 2" ;
-         rdfs:comment "OPTIONALs parse in a left-associative manner" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://www.w3.org/2007/06/19-dawg-minutes.html> ;
-         mf:action
-            [ qt:query  <two-nested-opt-alt.rq> ;
-              qt:data   <two-nested-opt.ttl>  ] ;
-        mf:result  <two-nested-opt-alt.srx> .
-      
-
-:opt-filter-1 rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Optional-filter - 1" ;
-         rdfs:comment "A FILTER inside an OPTIONAL can reference a variable bound in the required part of the OPTIONAL" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://www.w3.org/2007/06/19-dawg-minutes.html> ;
-         mf:action
-            [ qt:query  <opt-filter-1.rq> ;
-              qt:data   <opt-filter-1.ttl>  ] ;
-        mf:result  <opt-filter-1.srx> .
-      
-
-:opt-filter-2 rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Optional-filter - 2 filters" ;
-     rdfs:comment "FILTERs inside an OPTIONAL can refer to variables from both the required and optional parts of the construct." ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://www.w3.org/2007/06/19-dawg-minutes.html> ;
-         mf:action
-            [ qt:query  <opt-filter-2.rq> ;
-              qt:data   <opt-filter-2.ttl>  ] ;
-        mf:result  <opt-filter-2.srx> .
-
-:opt-filter-3 rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Optional-filter - scope of variable" ;
-         rdfs:comment "FILTERs in an OPTIONAL do not extend to variables bound outside of the LeftJoin(...) operation" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://www.w3.org/2007/06/19-dawg-minutes.html> ;
-         mf:action
-            [ qt:query  <opt-filter-3.rq> ;
-              qt:data   <opt-filter-3.ttl>  ] ;
-        mf:result  <opt-filter-3.srx> .
-      
-
-:filter-place-1 rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Filter-placement - 1" ;
-        rdfs:comment "FILTER placed after the triple pattern that contains the variable tested" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://www.w3.org/2007/06/19-dawg-minutes.html> ;
-         mf:action
-            [ qt:query  <filter-placement-1.rq> ;
-              qt:data   <data-2.ttl>  ] ;
-        mf:result  <filter-placement-1.srx> .
-      
-
-:filter-place-2 rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Filter-placement - 2" ;
-         rdfs:comment "FILTERs are scoped to the nearest enclosing group - placement within that group does not matter" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://www.w3.org/2007/06/19-dawg-minutes.html> ;
-         mf:action
-            [ qt:query  <filter-placement-2.rq> ;
-              qt:data   <data-2.ttl>  ] ;
-        mf:result  <filter-placement-2.srx> .
-      
-
-:filter-place-3 rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Filter-placement - 3" ;
-         rdfs:comment "FILTERs are scoped to the nearest enclosing group - placement within that group does not matter" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://www.w3.org/2007/06/19-dawg-minutes.html> ;
-         mf:action
-            [ qt:query  <filter-placement-3.rq> ;
-              qt:data   <data-2.ttl>  ] ;
-        mf:result  <filter-placement-3.srx> .
-      
-
-:filter-nested-1 rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Filter-nested - 1" ;
-         rdfs:comment "A FILTER is in scope for variables bound at the same level of the query tree" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://www.w3.org/2007/06/19-dawg-minutes.html> ;
-         mf:action
-            [ qt:query  <filter-nested-1.rq> ;
-              qt:data   <data-1.ttl>  ] ;
-        mf:result  <filter-nested-1.srx> .
-      
-
-:filter-nested-2 rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Filter-nested - 2" ;
-         rdfs:comment "A FILTER in a group { ... } cannot see variables bound outside that group" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://www.w3.org/2007/06/19-dawg-minutes.html> ;
-         mf:action
-            [ qt:query  <filter-nested-2.rq> ;
-              qt:data   <data-1.ttl>  ] ;
-        mf:result  <filter-nested-2.srx> .
-       
-
-:filter-scope-1 rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Filter-scope - 1" ;
-         rdfs:comment "FILTERs in an OPTIONAL do not extend to variables bound outside of the LeftJoin(...) operation" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://www.w3.org/2007/06/19-dawg-minutes.html> ;
-         mf:action
-            [ qt:query  <filter-scope-1.rq> ;
-              qt:data   <data-2.ttl>  ] ;
-        mf:result  <filter-scope-1.srx> .
-      
-
-:join-scope-1 rdf:type mf:QueryEvaluationTest ;
-       mf:name      "Join scope - 1" ;
-       rdfs:comment "Variables have query scope." ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://www.w3.org/2007/06/19-dawg-minutes.html> ;
-         mf:action
-            [ qt:query  <var-scope-join-1.rq> ;
-              qt:data   <var-scope-join-1.ttl>  ] ;
-       mf:result  <var-scope-join-1.srx> .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/manifest.ttl.bak
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/manifest.ttl.bak b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/manifest.ttl.bak
deleted file mode 100644
index 7a770e1..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/manifest.ttl.bak
+++ /dev/null
@@ -1,152 +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 "Algebra" ;
-    mf:entries
-    (   <#nested-opt-1> 
-        <#nested-opt-2> 
-        <#opt-filter-1> 
-        <#opt-filter-2> 
-        <#opt-filter-3> 
-        <#filter-place-1> 
-        <#filter-place-2> 
-        <#filter-place-3> 
-        <#filter-nested-1> 
-        <#filter-nested-2> 
-        <#filter-scope-1> 
-        <#join-scope-1> 
-    ) .
-
-
-<#nested-opt-1> rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Nested Optionals - 1" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://www.w3.org/2007/06/19-dawg-minutes.html> ;
-    rdfs:comment """Nested-optionals with a shared variable that does not appear in the middle pattern (a not well-formed query pattern as per "Semantics and Complexity" of SPARQL""" ;
-         mf:action
-            [ qt:query  <two-nested-opt.rq> ;
-              qt:data   <two-nested-opt.ttl> ] ;
-         mf:result  <two-nested-opt.srx> .
-
-<#nested-opt-2> rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Nested Optionals - 2" ;
-         rdfs:comment "OPTIONALs parse in a left-associative manner" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://www.w3.org/2007/06/19-dawg-minutes.html> ;
-         mf:action
-            [ qt:query  <two-nested-opt-alt.rq> ;
-              qt:data   <two-nested-opt.ttl>  ] ;
-        mf:result  <two-nested-opt-alt.srx> .
-      
-
-<#opt-filter-1> rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Optional-filter - 1" ;
-         rdfs:comment "A FILTER inside an OPTIONAL can reference a variable bound in the required part of the OPTIONAL" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://www.w3.org/2007/06/19-dawg-minutes.html> ;
-         mf:action
-            [ qt:query  <opt-filter-1.rq> ;
-              qt:data   <opt-filter-1.ttl>  ] ;
-        mf:result  <opt-filter-1.srx> .
-      
-
-<#opt-filter-2> rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Optional-filter - 2 filters" ;
-     rdfs:comment "FILTERs inside an OPTIONAL can refer to variables from both the required and optional parts of the construct." ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://www.w3.org/2007/06/19-dawg-minutes.html> ;
-         mf:action
-            [ qt:query  <opt-filter-2.rq> ;
-              qt:data   <opt-filter-2.ttl>  ] ;
-        mf:result  <opt-filter-2.srx> .
-
-<#opt-filter-3> rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Optional-filter - scope of variable" ;
-         rdfs:comment "FILTERs in an OPTIONAL do not extend to variables bound outside of the LeftJoin(...) operation" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://www.w3.org/2007/06/19-dawg-minutes.html> ;
-         mf:action
-            [ qt:query  <opt-filter-3.rq> ;
-              qt:data   <opt-filter-3.ttl>  ] ;
-        mf:result  <opt-filter-3.srx> .
-      
-
-<#filter-place-1> rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Filter-placement - 1" ;
-        rdfs:comment "FILTER placed after the triple pattern that contains the variable tested" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://www.w3.org/2007/06/19-dawg-minutes.html> ;
-         mf:action
-            [ qt:query  <filter-placement-1.rq> ;
-              qt:data   <data-2.ttl>  ] ;
-        mf:result  <filter-placement-1.srx> .
-      
-
-<#filter-place-2> rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Filter-placement - 2" ;
-         rdfs:comment "FILTERs are scoped to the nearest enclosing group - placement within that group does not matter" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://www.w3.org/2007/06/19-dawg-minutes.html> ;
-         mf:action
-            [ qt:query  <filter-placement-2.rq> ;
-              qt:data   <data-2.ttl>  ] ;
-        mf:result  <filter-placement-2.srx> .
-      
-
-<#filter-place-3> rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Filter-placement - 3" ;
-         rdfs:comment "FILTERs are scoped to the nearest enclosing group - placement within that group does not matter" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://www.w3.org/2007/06/19-dawg-minutes.html> ;
-         mf:action
-            [ qt:query  <filter-placement-3.rq> ;
-              qt:data   <data-2.ttl>  ] ;
-        mf:result  <filter-placement-3.srx> .
-      
-
-<#filter-nested-1> rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Filter-nested - 1" ;
-         rdfs:comment "A FILTER is in scope for variables bound at the same level of the query tree" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://www.w3.org/2007/06/19-dawg-minutes.html> ;
-         mf:action
-            [ qt:query  <filter-nested-1.rq> ;
-              qt:data   <data-1.ttl>  ] ;
-        mf:result  <filter-nested-1.srx> .
-      
-
-<#filter-nested-2> rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Filter-nested - 2" ;
-         rdfs:comment "A FILTER in a group { ... } cannot see variables bound outside that group" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://www.w3.org/2007/06/19-dawg-minutes.html> ;
-         mf:action
-            [ qt:query  <filter-nested-2.rq> ;
-              qt:data   <data-1.ttl>  ] ;
-        mf:result  <filter-nested-2.srx> .
-       
-
-<#filter-scope-1> rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Filter-scope - 1" ;
-         rdfs:comment "FILTERs in an OPTIONAL do not extend to variables bound outside of the LeftJoin(...) operation" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://www.w3.org/2007/06/19-dawg-minutes.html> ;
-         mf:action
-            [ qt:query  <filter-scope-1.rq> ;
-              qt:data   <data-2.ttl>  ] ;
-        mf:result  <filter-scope-1.srx> .
-      
-
-<#join-scope-1> rdf:type mf:QueryEvaluationTest ;
-       mf:name      "Join scope - 1" ;
-       rdfs:comment "Variables have query scope." ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://www.w3.org/2007/06/19-dawg-minutes.html> ;
-         mf:action
-            [ qt:query  <var-scope-join-1.rq> ;
-              qt:data   <var-scope-join-1.ttl>  ] ;
-       mf:result  <var-scope-join-1.srx> .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-1.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-1.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-1.rq
deleted file mode 100644
index 4622daf..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-1.rq
+++ /dev/null
@@ -1,11 +0,0 @@
-PREFIX :    <http://example/>
-
-SELECT *
-{ 
-  ?x :p ?v .
-  OPTIONAL
-  { 
-    ?y :q ?w .
-    FILTER(?v=2)
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-1.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-1.srx b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-1.srx
deleted file mode 100644
index 60f05bc..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-1.srx
+++ /dev/null
@@ -1,50 +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="x"/>
-    <variable name="v"/>
-    <variable name="y"/>
-    <variable name="w"/>
-  </head>
-  <results>
-    <result>
-      <binding name="x">
-        <uri>http://example/x2</uri>
-      </binding>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-      <binding name="y">
-        <uri>http://example/x3</uri>
-      </binding>
-      <binding name="w">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">4</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="x">
-        <uri>http://example/x2</uri>
-      </binding>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-      <binding name="y">
-        <uri>http://example/x3</uri>
-      </binding>
-      <binding name="w">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="x">
-        <uri>http://example/x1</uri>
-      </binding>
-      <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/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-1.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-1.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-1.ttl
deleted file mode 100644
index 78e2ec7..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-1.ttl
+++ /dev/null
@@ -1,9 +0,0 @@
-@prefix   :         <http://example/> .
-@prefix xsd:        <http://www.w3.org/2001/XMLSchema#> .
-
-:x1 :p "1"^^xsd:integer .
-:x2 :p "2"^^xsd:integer .
-
-:x3 :q "3"^^xsd:integer .
-:x3 :q "4"^^xsd:integer .
- 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-2.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-2.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-2.rq
deleted file mode 100644
index 82b136c..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-2.rq
+++ /dev/null
@@ -1,12 +0,0 @@
-PREFIX :    <http://example/>
-
-SELECT *
-{ 
-  ?x :p ?v .
-  OPTIONAL
-  { 
-    ?y :q ?w .
-    FILTER(?v=2)
-    FILTER(?w=3)
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-2.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-2.srx b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-2.srx
deleted file mode 100644
index 42e9b6e..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-2.srx
+++ /dev/null
@@ -1,36 +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="x"/>
-    <variable name="v"/>
-    <variable name="y"/>
-    <variable name="w"/>
-  </head>
-  <results>
-    <result>
-      <binding name="x">
-        <uri>http://example/x2</uri>
-      </binding>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-      <binding name="y">
-        <uri>http://example/x3</uri>
-      </binding>
-      <binding name="w">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="x">
-        <uri>http://example/x1</uri>
-      </binding>
-      <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/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-2.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-2.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-2.ttl
deleted file mode 100644
index 78e2ec7..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-2.ttl
+++ /dev/null
@@ -1,9 +0,0 @@
-@prefix   :         <http://example/> .
-@prefix xsd:        <http://www.w3.org/2001/XMLSchema#> .
-
-:x1 :p "1"^^xsd:integer .
-:x2 :p "2"^^xsd:integer .
-
-:x3 :q "3"^^xsd:integer .
-:x3 :q "4"^^xsd:integer .
- 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-3.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-3.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-3.rq
deleted file mode 100644
index 9031586..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-3.rq
+++ /dev/null
@@ -1,10 +0,0 @@
-PREFIX :    <http://example/>
-
-SELECT *
-{ 
-    :x :p ?v . 
-    { :x :q ?w 
-      # ?v is not in scope so ?v2 never set
-      OPTIONAL {  :x :p ?v2 FILTER(?v = 1) }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-3.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-3.srx b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-3.srx
deleted file mode 100644
index e0d780f..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-3.srx
+++ /dev/null
@@ -1,13 +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"/>
-    <variable name="w"/>
-    <variable name="v2"/>
-  </head>
-  <results>
-  </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/algebra/opt-filter-3.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-3.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-3.ttl
deleted file mode 100644
index 78e2ec7..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/opt-filter-3.ttl
+++ /dev/null
@@ -1,9 +0,0 @@
-@prefix   :         <http://example/> .
-@prefix xsd:        <http://www.w3.org/2001/XMLSchema#> .
-
-:x1 :p "1"^^xsd:integer .
-:x2 :p "2"^^xsd:integer .
-
-:x3 :q "3"^^xsd:integer .
-:x3 :q "4"^^xsd:integer .
- 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/two-nested-opt-alt.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/two-nested-opt-alt.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/two-nested-opt-alt.rq
deleted file mode 100644
index 3c6820d..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/two-nested-opt-alt.rq
+++ /dev/null
@@ -1,10 +0,0 @@
-PREFIX :    <http://example/>
-
-## The nested optional example, rewritten to a form that is the same
-## for the SPARQL algebra and the declarative semantics.
-SELECT *
-{ 
-    :x1 :p ?v .
-    OPTIONAL { :x3 :q ?w }
-    OPTIONAL { :x3 :q ?w  . :x2 :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/algebra/two-nested-opt-alt.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/two-nested-opt-alt.srx b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/two-nested-opt-alt.srx
deleted file mode 100644
index 0644ba5..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/two-nested-opt-alt.srx
+++ /dev/null
@@ -1,28 +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"/>
-    <variable name="w"/>
-  </head>
-  <results>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
-      </binding>
-      <binding name="w">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">4</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
-      </binding>
-      <binding name="w">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</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/algebra/two-nested-opt.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/two-nested-opt.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/two-nested-opt.rq
deleted file mode 100644
index 71b4046..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/two-nested-opt.rq
+++ /dev/null
@@ -1,11 +0,0 @@
-PREFIX :    <http://example/>
-
-SELECT *
-{ 
-    :x1 :p ?v .
-    OPTIONAL
-    {
-      :x3 :q ?w .
-      OPTIONAL { :x2 :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/algebra/two-nested-opt.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/two-nested-opt.srx b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/two-nested-opt.srx
deleted file mode 100644
index 5b948db..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/two-nested-opt.srx
+++ /dev/null
@@ -1,17 +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"/>
-    <variable name="w"/>
-  </head>
-  <results>
-    <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/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/two-nested-opt.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/two-nested-opt.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/two-nested-opt.ttl
deleted file mode 100644
index 78ba93c..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/two-nested-opt.ttl
+++ /dev/null
@@ -1,7 +0,0 @@
-@prefix   :         <http://example/> .
-@prefix xsd:        <http://www.w3.org/2001/XMLSchema#> .
-
-:x1 :p "1"^^xsd:integer .
-:x2 :p "2"^^xsd:integer .
-:x3 :q "3"^^xsd:integer .
-:x3 :q "4"^^xsd:integer .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/var-scope-join-1.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/var-scope-join-1.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/var-scope-join-1.rq
deleted file mode 100644
index fa856a4..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/var-scope-join-1.rq
+++ /dev/null
@@ -1,8 +0,0 @@
-PREFIX : <http://example/>
-
-SELECT *
-{ 
-  ?X  :name "paul"
-  {?Y :name "george" . OPTIONAL { ?X :email ?Z } }
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/var-scope-join-1.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/var-scope-join-1.srx b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/var-scope-join-1.srx
deleted file mode 100644
index 81d0717..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/var-scope-join-1.srx
+++ /dev/null
@@ -1,13 +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="X"/>
-    <variable name="Y"/>
-    <variable name="Z"/>
-  </head>
-  <results>
-  </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/algebra/var-scope-join-1.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/var-scope-join-1.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/var-scope-join-1.ttl
deleted file mode 100644
index b6ee6e5..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/algebra/var-scope-join-1.ttl
+++ /dev/null
@@ -1,15 +0,0 @@
-@prefix : <http://example/> .
-
-_:B1 :name "paul" .
-_:B1 :phone "777-3426". 
-
-_:B2 :name "john" . 
-_:B2 :email <ma...@acd.edu> .
-
-_:B3 :name "george". 
-_:B3 :webPage <http://www.george.edu/> .
-
-_:B4 :name "ringo". 
-_:B4 :email <ma...@acd.edu> .
-_:B4 :webPage <http://www.starr.edu/> .
-_:B4 :phone "888-4537".

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/ask-1.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/ask-1.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/ask-1.rq
deleted file mode 100644
index 25f63cb..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/ask-1.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX :   <http://example/>
-
-ASK { :x :p 1 }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/ask-1.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/ask-1.srx b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/ask-1.srx
deleted file mode 100644
index 35d0d11..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/ask-1.srx
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<sparql xmlns="http://www.w3.org/2005/sparql-results#">
-  <head>
-  </head>
-  <boolean>true</boolean>
-</sparql>

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/ask-4.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/ask-4.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/ask-4.rq
deleted file mode 100644
index 3b56286..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/ask-4.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX :   <http://example/>
-
-ASK { :x :p 99 }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/ask-4.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/ask-4.srx b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/ask-4.srx
deleted file mode 100644
index 8eea9e3..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/ask-4.srx
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<sparql xmlns="http://www.w3.org/2005/sparql-results#">
-  <head>
-  </head>
-  <boolean>false</boolean>
-</sparql>

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/ask-7.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/ask-7.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/ask-7.rq
deleted file mode 100644
index 4bb6df2..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/ask-7.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX :   <http://example/>
-
-ASK { :x :p ?x }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/ask-7.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/ask-7.srx b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/ask-7.srx
deleted file mode 100644
index 35d0d11..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/ask-7.srx
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<sparql xmlns="http://www.w3.org/2005/sparql-results#">
-  <head>
-  </head>
-  <boolean>true</boolean>
-</sparql>

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/ask-8.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/ask-8.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/ask-8.rq
deleted file mode 100644
index c8ac10e..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/ask-8.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX :   <http://example/>
-
-ASK { :x :p ?x . FILTER(?x = 99) }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/ask-8.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/ask-8.srx b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/ask-8.srx
deleted file mode 100644
index 8eea9e3..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/ask-8.srx
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<sparql xmlns="http://www.w3.org/2005/sparql-results#">
-  <head>
-  </head>
-  <boolean>false</boolean>
-</sparql>

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/data.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/data.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/data.ttl
deleted file mode 100644
index 039b3fd..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/data.ttl
+++ /dev/null
@@ -1,9 +0,0 @@
-@prefix :   <http://example/> .
-@prefix xsd:        <http://www.w3.org/2001/XMLSchema#> .
-
-:x :p "1"^^xsd:integer .
-:x :p "2"^^xsd:integer .
-:x :p "3"^^xsd:integer .
-
-:y :p :a .
-:a :q :r .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/manifest.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/manifest.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/manifest.ttl
deleted file mode 100644
index 044b04b..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/manifest.ttl
+++ /dev/null
@@ -1,61 +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/ask/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 "ASK" ;
-    mf:entries
-    ( 
-      :ask-1
-      :ask-4
-      :ask-7
-      :ask-8
-    ) .
-
-
-:ask-1 rdf:type mf:QueryEvaluationTest ;
-      qt:queryForm qt:QueryAsk ;
-      mf:name    "ASK-1 (SPARQL XML results)" ;
-    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  <ask-1.rq> ;
-           qt:data   <data.ttl> ] ;
-      mf:result  <ask-1.srx>
-      .
-
-:ask-4 rdf:type mf:QueryEvaluationTest ;
-      qt:queryForm qt:QueryAsk ;
-      mf:name    "ASK-4 (SPARQL XML results)" ;
-    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  <ask-4.rq> ;
-           qt:data   <data.ttl> ] ;
-      mf:result  <ask-4.srx>
-      .
-
-:ask-7 rdf:type mf:QueryEvaluationTest ;
-      qt:queryForm qt:QueryAsk ;
-      mf:name    "ASK-7 (SPARQL XML results)" ;
-    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  <ask-7.rq> ;
-           qt:data   <data.ttl> ] ;
-      mf:result  <ask-7.srx>
-      .
-
-:ask-8 rdf:type mf:QueryEvaluationTest ;
-      qt:queryForm qt:QueryAsk ;
-      mf:name    "ASK-8 (SPARQL XML results)" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0087/14-dawg-minutes.html> ;
-      mf:action
-         [ qt:query  <ask-8.rq> ;
-           qt:data   <data.ttl> ] ;
-      mf:result  <ask-8.srx>
-      .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/manifest.ttl.bak
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/manifest.ttl.bak b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/manifest.ttl.bak
deleted file mode 100644
index 925a183..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/ask/manifest.ttl.bak
+++ /dev/null
@@ -1,55 +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 "ASK" ;
-    mf:entries
-    ( 
-      <#ask-1>
-      <#ask-4>
-      <#ask-7>
-      <#ask-8>
-    ) .
-
-
-<#ask-1> rdf:type mf:QueryEvaluationTest ;
-      mf:name    "ASK-1 (SPARQL XML results)" ;
-    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  <ask-1.rq> ;
-           qt:data   <data.ttl> ] ;
-      mf:result  <ask-1.srx>
-      .
-
-<#ask-4> rdf:type mf:QueryEvaluationTest ;
-      mf:name    "ASK-4 (SPARQL XML results)" ;
-    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  <ask-4.rq> ;
-           qt:data   <data.ttl> ] ;
-      mf:result  <ask-4.srx>
-      .
-
-<#ask-7> rdf:type mf:QueryEvaluationTest ;
-      mf:name    "ASK-7 (SPARQL XML results)" ;
-    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  <ask-7.rq> ;
-           qt:data   <data.ttl> ] ;
-      mf:result  <ask-7.srx>
-      .
-
-<#ask-8> rdf:type mf:QueryEvaluationTest ;
-      mf:name    "ASK-8 (SPARQL XML results)" ;
-    dawgt:approval dawgt:NotApproved ;
-      mf:action
-         [ qt:query  <ask-8.rq> ;
-           qt:data   <data.ttl> ] ;
-      mf:result  <ask-8.srx>
-      .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/base-prefix-1.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/base-prefix-1.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/base-prefix-1.rq
deleted file mode 100644
index 4adf184..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/base-prefix-1.rq
+++ /dev/null
@@ -1,4 +0,0 @@
-BASE <http://example.org/x/> 
-PREFIX : <>
-
-SELECT * WHERE { :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/basic/base-prefix-1.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/base-prefix-1.srx b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/base-prefix-1.srx
deleted file mode 100644
index 8083e59..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/base-prefix-1.srx
+++ /dev/null
@@ -1,28 +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"/>
-    <variable name="p"/>
-  </head>
-  <results>
-    <result>
-      <binding name="v">
-        <literal>d:x ns:p</literal>
-      </binding>
-      <binding name="p">
-        <uri>http://example.org/ns#p</uri>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal>x:x x:p</literal>
-      </binding>
-      <binding name="p">
-        <uri>http://example.org/x/p</uri>
-      </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/basic/base-prefix-2.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/base-prefix-2.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/base-prefix-2.rq
deleted file mode 100644
index 824f2cb..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/base-prefix-2.rq
+++ /dev/null
@@ -1,4 +0,0 @@
-BASE <http://example.org/x/> 
-PREFIX : <#>
-
-SELECT * WHERE { :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/basic/base-prefix-2.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/base-prefix-2.srx b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/base-prefix-2.srx
deleted file mode 100644
index 1b900e5..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/base-prefix-2.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="v"/>
-    <variable name="p"/>
-  </head>
-  <results>
-    <result>
-      <binding name="v">
-        <literal>z:x z:p</literal>
-      </binding>
-      <binding name="p">
-        <uri>http://example.org/x/#p</uri>
-      </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/basic/base-prefix-3.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/base-prefix-3.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/base-prefix-3.rq
deleted file mode 100644
index 73e134d..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/base-prefix-3.rq
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX ns: <http://example.org/ns#>
-PREFIX x:  <http://example.org/x/>
-
-SELECT * WHERE { x:x ns: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/basic/base-prefix-3.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/base-prefix-3.srx b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/base-prefix-3.srx
deleted file mode 100644
index 7901e3d..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/base-prefix-3.srx
+++ /dev/null
@@ -1,16 +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>d:x ns:p</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/basic/base-prefix-4.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/base-prefix-4.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/base-prefix-4.rq
deleted file mode 100644
index 7630599..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/base-prefix-4.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-BASE <http://example.org/x/>
-
-SELECT * WHERE { <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/basic/base-prefix-4.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/base-prefix-4.srx b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/base-prefix-4.srx
deleted file mode 100644
index f5bbac4..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/base-prefix-4.srx
+++ /dev/null
@@ -1,16 +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>x:x x:p</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/basic/base-prefix-5.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/base-prefix-5.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/base-prefix-5.rq
deleted file mode 100644
index 010e755..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/base-prefix-5.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-BASE <http://example.org/x/>
-
-SELECT * WHERE { <#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/basic/base-prefix-5.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/base-prefix-5.srx b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/base-prefix-5.srx
deleted file mode 100644
index 058fc97..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/base-prefix-5.srx
+++ /dev/null
@@ -1,16 +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>z:x z:p</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/basic/bgp-no-match.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/bgp-no-match.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/bgp-no-match.rq
deleted file mode 100644
index b72ccca..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/bgp-no-match.rq
+++ /dev/null
@@ -1,8 +0,0 @@
-PREFIX : <http://example.org/>
-PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-SELECT ?x
-WHERE {
-  ?x foaf:name "John Smith" ;
-       a foaf:Womble .
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/bgp-no-match.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/bgp-no-match.srx b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/bgp-no-match.srx
deleted file mode 100644
index 43e69cc..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/bgp-no-match.srx
+++ /dev/null
@@ -1,10 +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="x"/>
-  </head>
-  <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/basic/data-1.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/data-1.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/data-1.ttl
deleted file mode 100644
index bfe253e..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/data-1.ttl
+++ /dev/null
@@ -1,8 +0,0 @@
-@prefix ns: <http://example.org/ns#> .
-@prefix x:  <http://example.org/x/> .
-@prefix z:  <http://example.org/x/#> .
-
-x:x ns:p  "d:x ns:p" .
-x:x x:p   "x:x x:p" .
-
-z:x z:p   "z:x z:p" .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/data-2.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/data-2.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/data-2.ttl
deleted file mode 100644
index 2672186..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/data-2.ttl
+++ /dev/null
@@ -1,8 +0,0 @@
-@prefix : <http://example.org/ns#> .
-@prefix xsd:        <http://www.w3.org/2001/XMLSchema#> .
-
-
-:x :list0 () .
-:x :list1 ("1"^^xsd:integer) .
-:x :list2 ("11"^^xsd:integer "22"^^xsd:integer) .
-:x :list3 ("111"^^xsd:integer "222"^^xsd:integer "333"^^xsd:integer) .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/data-3.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/data-3.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/data-3.ttl
deleted file mode 100644
index 598afc9..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/data-3.ttl
+++ /dev/null
@@ -1,12 +0,0 @@
-@prefix : <http://example.org/ns#> .
-
-# This file uses UNIX line end conventions.
-
-:x1 :p1 "x" .
-:x2 :p2 """x
-y""" .
-
-:x3 :p3 """x
-y"""^^:someType .
-
-

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/data-4.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/data-4.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/data-4.ttl
deleted file mode 100644
index 5598d40..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/data-4.ttl
+++ /dev/null
@@ -1,14 +0,0 @@
-@prefix : <http://example.org/ns#> .
-@prefix xsd:        <http://www.w3.org/2001/XMLSchema#> .
-@prefix rdf:        <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-:x :p1 "true"^^xsd:boolean .
-:x :p2 "false"^^xsd:boolean .
-
-:x rdf:type :C .
-
-:x :n1  "123.0"^^xsd:decimal .
-:x :n2  "456."^^xsd:decimal .
-
-:x :n3 "+5"^^xsd:integer .
-:x :n4 "-18"^^xsd:integer .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/data-5.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/data-5.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/data-5.ttl
deleted file mode 100644
index 282eb58..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/data-5.ttl
+++ /dev/null
@@ -1,5 +0,0 @@
-@prefix : <http://example.org/ns#> .
-@prefix xsd:        <http://www.w3.org/2001/XMLSchema#> .
-
-:x :p1 "1"^^xsd:integer .
-:x :p2 "2"^^xsd:integer .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/data-6.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/data-6.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/data-6.ttl
deleted file mode 100644
index 8df49a4..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/data-6.ttl
+++ /dev/null
@@ -1,5 +0,0 @@
-@prefix : <http://example.org/ns#> .
-@prefix xsd:        <http://www.w3.org/2001/XMLSchema#> .
-
-:x :p1 "1"^^xsd:integer .
-:x :p1 "2"^^xsd:integer .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/data-7.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/data-7.ttl b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/data-7.ttl
deleted file mode 100644
index 441143c..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/data-7.ttl
+++ /dev/null
@@ -1,7 +0,0 @@
-@prefix : <http://example.org/> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-
-:john a foaf:Person ;
-   foaf:name "John Smith" .
-
-

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/list-1.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/list-1.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/list-1.rq
deleted file mode 100644
index 15d6ecb..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/list-1.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.org/ns#>
-
-SELECT ?p
-{ :x ?p () . }
-

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/list-1.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/list-1.srx b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/list-1.srx
deleted file mode 100644
index 842088a..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/list-1.srx
+++ /dev/null
@@ -1,16 +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="p"/>
-  </head>
-  <results>
-    <result>
-      <binding name="p">
-        <uri>http://example.org/ns#list0</uri>
-      </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/basic/list-2.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/list-2.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/list-2.rq
deleted file mode 100644
index d0fef0b..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/list-2.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.org/ns#>
-
-SELECT ?p
-{ :x ?p (1) . }
-

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/list-2.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/list-2.srx b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/list-2.srx
deleted file mode 100644
index 94ef900..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/list-2.srx
+++ /dev/null
@@ -1,16 +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="p"/>
-  </head>
-  <results>
-    <result>
-      <binding name="p">
-        <uri>http://example.org/ns#list1</uri>
-      </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/basic/list-3.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/list-3.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/list-3.rq
deleted file mode 100644
index c28d2d7..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/list-3.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.org/ns#>
-
-SELECT ?p ?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/basic/list-3.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/list-3.srx b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/list-3.srx
deleted file mode 100644
index 849b832..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/list-3.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="p"/>
-    <variable name="v"/>
-  </head>
-  <results>
-    <result>
-      <binding name="p">
-        <uri>http://example.org/ns#list1</uri>
-      </binding>
-      <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/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/list-4.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/list-4.rq b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/list-4.rq
deleted file mode 100644
index a96249d..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/list-4.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.org/ns#>
-
-SELECT ?p ?v ?w
-{ :x ?p (?v ?w) . }
-

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5486b79f/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/list-4.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/list-4.srx b/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/list-4.srx
deleted file mode 100644
index ca2e354..0000000
--- a/platform/marmotta-sparql/target/test-classes/test-suite-archive/data-r2/basic/list-4.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="p"/>
-    <variable name="v"/>
-    <variable name="w"/>
-  </head>
-  <results>
-    <result>
-      <binding name="p">
-        <uri>http://example.org/ns#list2</uri>
-      </binding>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">11</literal>
-      </binding>
-      <binding name="w">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">22</literal>
-      </binding>
-    </result>
-  </results>
-</sparql>