You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by tk...@apache.org on 2013/03/21 14:41:45 UTC

[1/2] git commit: fixes memento filter bug. now memento filter only works for http and https resources

Updated Branches:
  refs/heads/master a53c69d5d -> 1b72bee7c


fixes memento filter bug. now memento filter only works for http and https resources


Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/02be9d4a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/02be9d4a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/02be9d4a

Branch: refs/heads/master
Commit: 02be9d4a29617bbff77ea19c6d5c89fba53033c8
Parents: 0b5ddf9
Author: tkurz <tk...@apache.org>
Authored: Thu Mar 21 14:41:18 2013 +0100
Committer: tkurz <tk...@apache.org>
Committed: Thu Mar 21 14:41:18 2013 +0100

----------------------------------------------------------------------
 .../platform/versioning/filter/MementoFilter.java  |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/02be9d4a/platform/marmotta-versioning/src/main/java/org/apache/marmotta/platform/versioning/filter/MementoFilter.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-versioning/src/main/java/org/apache/marmotta/platform/versioning/filter/MementoFilter.java b/platform/marmotta-versioning/src/main/java/org/apache/marmotta/platform/versioning/filter/MementoFilter.java
index 737645b..2c1d62d 100644
--- a/platform/marmotta-versioning/src/main/java/org/apache/marmotta/platform/versioning/filter/MementoFilter.java
+++ b/platform/marmotta-versioning/src/main/java/org/apache/marmotta/platform/versioning/filter/MementoFilter.java
@@ -114,7 +114,10 @@ public class MementoFilter implements MarmottaHttpFilter {
     private URL getResourceURL(HttpServletRequest request) {
         try {
             if(request.getParameter("uri") != null) {
-                return new URL(request.getParameter("uri"));
+                //memento is only for http protocol
+                if(request.getParameter("uri").startsWith("http://") || request.getParameter("uri").startsWith("https://")) {
+                    return new URL(request.getParameter("uri"));
+                }
             } else {
                 //test if it is a resource / meta / content url
                 if(request.getRequestURI().startsWith("/"+ ConfigurationService.RESOURCE_PATH+"/")) {


[2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta

Posted by tk...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta


Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/1b72bee7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/1b72bee7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/1b72bee7

Branch: refs/heads/master
Commit: 1b72bee7c4b4209b029c6c93bd47c87a765c8864
Parents: 02be9d4 a53c69d
Author: tkurz <tk...@apache.org>
Authored: Thu Mar 21 14:41:28 2013 +0100
Committer: tkurz <tk...@apache.org>
Committed: Thu Mar 21 14:41:28 2013 +0100

----------------------------------------------------------------------
 KEYS                                               |    1 +
 LICENSE.txt                                        |   35 +
 NOTICE.txt                                         |    6 +-
 README.txt                                         |  115 +
 build/archetypes/marmotta-archetype-module/pom.xml |   31 +-
 .../src/main/resources/archetype-resources/pom.xml |   41 +-
 .../src/main/java/webservices/MyWebService.java    |    3 +-
 .../src/main/resources/kiwi-module.properties      |   18 +-
 .../src/main/resources/web/admin/about.html        |   18 -
 .../main/resources/web/admin/configuration.html    |   17 +-
 .../src/test/java/services/MyServiceTest.java      |   10 +-
 .../test/java/webservices/MyWebServiceTest.java    |   11 +-
 .../resources/projects/basic/archetype.properties  |   17 +
 build/archetypes/marmotta-archetype-webapp/pom.xml |   37 +-
 .../META-INF/maven/archetype-metadata.xml          |    9 +-
 .../src/main/resources/archetype-resources/pom.xml |  152 +-
 .../resources/projects/basic/archetype.properties  |   26 +-
 build/archetypes/pom.xml                           |    2 +-
 build/checkstyle-resources/pom.xml                 |   53 +
 .../org/apache/marmotta/checkstyle/checkstyle.xml  |   45 +
 build/dependency-resource-supplement/pom.xml       |    5 +-
 .../src/main/resources/supplemental-models.xml     |   17 +
 build/plugins/buildinfo-maven-plugin/pom.xml       |    2 +-
 build/plugins/marmotta-maven-plugin/pom.xml        |    5 +-
 build/plugins/pom.xml                              |    5 +-
 build/plugins/refpack-maven-plugin/pom.xml         |    4 +-
 build/plugins/repocheck-maven-plugin/pom.xml       |    5 +-
 build/pom.xml                                      |    3 +-
 client/marmotta-client-java/pom.xml                |    2 +-
 .../marmotta/client/util/CollectionUtils.java      |    5 +
 .../src/main/resources/marmotta.properties         |   15 +-
 .../src/test/resources/marmotta.properties         |   17 +
 client/pom.xml                                     |    2 +-
 commons/marmotta-commons/pom.xml                   |    2 +-
 .../commons/collections/CollectionUtils.java       |    6 +-
 .../marmotta/commons/vocabulary/DCTERMS.java       |   17 +
 .../apache/marmotta/commons/vocabulary/FOAF.java   |   17 +
 .../apache/marmotta/commons/vocabulary/GEO.java    |   17 +
 .../org/apache/marmotta/commons/vocabulary/MA.java |   17 +
 .../apache/marmotta/commons/vocabulary/SCHEMA.java |   17 +
 .../apache/marmotta/commons/vocabulary/SIOC.java   |   17 +
 .../apache/marmotta/commons/vocabulary/SKOS.java   |   17 +
 commons/pom.xml                                    |    2 +-
 commons/sesame-filter/pom.xml                      |    2 +-
 .../commons/sesame/filter/AllOfFilter.java         |    2 +
 .../commons/sesame/filter/AlwaysFalseFilter.java   |    2 +
 .../commons/sesame/filter/AlwaysTrueFilter.java    |    2 +
 commons/sesame-tools-facading/pom.xml              |    2 +-
 .../commons/sesame/facading/FacadingFactory.java   |   17 +-
 .../commons/sesame/facading/annotations/RDF.java   |   17 +-
 .../sesame/facading/annotations/RDFContext.java    |   17 +-
 .../sesame/facading/annotations/RDFFilter.java     |   17 +-
 .../sesame/facading/annotations/RDFInverse.java    |   17 +-
 .../facading/annotations/RDFPropertyBuilder.java   |   17 +-
 .../sesame/facading/annotations/RDFType.java       |   17 +-
 .../commons/sesame/facading/api/Facading.java      |   17 +-
 .../facading/api/FacadingPredicateBuilder.java     |   17 +-
 .../commons/sesame/facading/impl/FacadingImpl.java |   17 +-
 .../facading/impl/FacadingInvocationHandler.java   |   17 +-
 .../facading/impl/FacadingInvocationHelper.java    |   17 +-
 .../sesame/facading/impl/FacadingPredicate.java    |   17 +-
 .../model/AbstractNamespacePropBuilder.java        |   17 +-
 .../commons/sesame/facading/model/Facade.java      |   17 +-
 .../commons/sesame/facading/util/FacadeUtils.java  |   17 +-
 .../sesame/facading/AbstractFacadingTest.java      |   17 +-
 .../builder/FacadingPredicateBuilderTest.java      |   17 +-
 .../facading/builder/model/ExampleFacade.java      |   17 +-
 .../facading/builder/model/ExamplePropBuilder.java |   17 +-
 .../collections/CollectionFacadingTest.java        |   17 +-
 .../collections/model/CollectionFacade.java        |   17 +-
 .../sesame/facading/foaf/FacadingFoafTest.java     |   17 +-
 .../sesame/facading/foaf/model/OnlineAccount.java  |   17 +-
 .../commons/sesame/facading/foaf/model/Person.java |   17 +-
 .../sesame/facading/locale/LocaleFacadingTest.java |   17 +-
 .../sesame/facading/locale/model/LocaleFacade.java |   17 +-
 .../commons/sesame/facading/demo-data.foaf         |   13 +-
 commons/sesame-tools-rio-api/pom.xml               |    2 +-
 .../commons/sesame/rio/ical/ICalFormat.java        |   17 +-
 .../commons/sesame/rio/rss/AtomFormat.java         |   17 +-
 .../marmotta/commons/sesame/rio/rss/RSSFormat.java |   17 +-
 .../commons/sesame/rio/vcard/VCardFormat.java      |   17 +-
 commons/sesame-tools-rio-ical/pom.xml              |    2 +-
 .../src/test/resources/logback.xml                 |   27 +
 .../marmotta/commons/sesame/rio/ical/kmt.sparql    |   18 +
 .../commons/sesame/rio/ical/vacation.sparql        |   17 +
 commons/sesame-tools-rio-jsonld/pom.xml            |    2 +-
 .../src/main/resources/META-INF/LICENSE            |  205 +
 .../src/main/resources/META-INF/NOTICE             |    9 +
 .../src/test/resources/logback.xml                 |   27 +
 commons/sesame-tools-rio-rdfjson/pom.xml           |    2 +-
 .../src/test/resources/logback.xml                 |   27 +
 .../commons/sesame/rio/rdfjson/test-001.rdf        |   17 +
 commons/sesame-tools-rio-rss/pom.xml               |    5 +-
 .../src/main/resources/META-INF/NOTICE             |    9 +
 .../src/test/resources/logback.xml                 |   27 +
 .../marmotta/commons/sesame/rio/rss/iks-blog.atom  |  351 +-
 .../marmotta/commons/sesame/rio/rss/iks-blog.rss   |  348 +-
 .../commons/sesame/rio/rss/iks-blog.sparql         |   17 +
 commons/sesame-tools-rio-vcard/pom.xml             |    2 +-
 .../src/test/resources/logback.xml                 |   27 +
 .../commons/sesame/rio/vcard/Frank_Dawson.sparql   |   17 +
 .../sesame/rio/vcard/vcard-vCards-SAP.sparql       |   17 +
 extras/pom.xml                                     |    2 +-
 launchers/marmotta-installer/assembly.xml          |    4 +-
 launchers/marmotta-installer/pom.xml               |    2 +-
 .../src/main/resources/installer/LICENSE.txt       |  283 +
 .../src/main/resources/installer/NOTICE.txt        |   64 +
 .../src/main/resources/installer/standalone.xml    |    2 +-
 .../Contents/MacOS/run.sh                          |   17 +
 .../Stop Apache Marmotta.app/Contents/MacOS/run.sh |   17 +
 .../src/main/resources/panels/COPYING              |  177 -
 .../src/main/resources/tomcat/index.jsp            |   17 +
 launchers/marmotta-splash/pom.xml                  |    2 +-
 .../src/ext/resources/META-INF/LICENSE             |  208 +
 .../src/ext/resources/META-INF/NOTICE              |   10 +
 launchers/marmotta-webapp/NOTICE.template          |    9 +
 launchers/marmotta-webapp/NOTICE.txt               |   62 +
 launchers/marmotta-webapp/assembly.xml             |    6 +-
 launchers/marmotta-webapp/pom.xml                  |   15 +-
 .../src/main/webapp/META-INF/LICENSE               |  277 +
 .../src/main/webapp/META-INF/NOTICE                |   62 +
 launchers/pom.xml                                  |    6 +-
 libraries/kiwi/kiwi-contextaware/pom.xml           |    2 +-
 libraries/kiwi/kiwi-reasoner/pom.xml               |    2 +-
 .../kiwi/persistence/h2/create_reasoner_tables.sql |   14 +
 .../kiwi/persistence/h2/drop_reasoner_tables.sql   |   14 +
 .../persistence/mysql/create_reasoner_tables.sql   |   14 +
 .../persistence/mysql/drop_reasoner_tables.sql     |   14 +
 .../persistence/pgsql/create_reasoner_tables.sql   |   14 +
 .../persistence/pgsql/drop_reasoner_tables.sql     |   14 +
 .../kiwi-reasoner/src/test/resources/logback.xml   |   27 +
 .../marmotta/kiwi/reasoner/test/engine/simple.ttl  |   17 +
 .../marmotta/kiwi/reasoner/test/sail/simple.ttl    |   17 +
 libraries/kiwi/kiwi-transactions/pom.xml           |    2 +-
 .../src/test/resources/logback.xml                 |   44 +-
 libraries/kiwi/kiwi-triplestore/pom.xml            |    2 +-
 .../marmotta/kiwi/persistence/KiWiPersistence.java |    4 +-
 .../kiwi/persistence/h2/create_base_tables.sql     |   15 +
 .../kiwi/persistence/h2/drop_base_tables.sql       |   16 +-
 .../kiwi/persistence/mysql/create_base_tables.sql  |   14 +
 .../kiwi/persistence/mysql/drop_base_tables.sql    |   14 +
 .../kiwi/persistence/pgsql/create_base_tables.sql  |   14 +
 .../kiwi/persistence/pgsql/drop_base_tables.sql    |   14 +
 .../src/test/resources/logback.xml                 |   44 +-
 .../org/apache/marmotta/kiwi/test/demo-data.foaf   |   13 +-
 .../apache/marmotta/kiwi/test/srfg-ontology.rdf    |   13 +-
 libraries/kiwi/kiwi-tripletable/pom.xml            |    2 +-
 libraries/kiwi/kiwi-versioning/pom.xml             |    2 +-
 .../persistence/h2/create_versioning_tables.sql    |   14 +
 .../kiwi/persistence/h2/drop_versioning_tables.sql |   14 +
 .../persistence/mysql/create_versioning_tables.sql |   14 +
 .../persistence/mysql/drop_versioning_tables.sql   |   14 +
 .../persistence/pgsql/create_versioning_tables.sql |   14 +
 .../persistence/pgsql/drop_versioning_tables.sql   |   14 +
 .../kiwi-versioning/src/test/resources/logback.xml |   44 +-
 libraries/kiwi/pom.xml                             |    2 +-
 libraries/ldcache/ldcache-api/pom.xml              |    2 +-
 libraries/ldcache/ldcache-backend-ehcache/pom.xml  |    2 +-
 libraries/ldcache/ldcache-backend-file/pom.xml     |    2 +-
 .../ldcache/backend/file/LDCachingFileBackend.java |   17 +
 .../ldcache/backend/file/model/FileCacheEntry.java |   17 +
 .../LDCachingFileRepositoryConnection.java         |   17 +
 .../backend/file/util/FileBackendUtils.java        |   17 +
 .../src/test/resources/logback.xml                 |   27 +
 libraries/ldcache/ldcache-backend-kiwi/pom.xml     |    2 +-
 .../kiwi/persistence/h2/create_ldcache_tables.sql  |   14 +
 .../kiwi/persistence/h2/drop_ldcache_tables.sql    |   14 +
 .../persistence/mysql/create_ldcache_tables.sql    |   14 +
 .../kiwi/persistence/mysql/drop_ldcache_tables.sql |   14 +
 .../persistence/pgsql/create_ldcache_tables.sql    |   14 +
 .../kiwi/persistence/pgsql/drop_ldcache_tables.sql |   14 +
 .../src/test/resources/logback.xml                 |   27 +
 libraries/ldcache/ldcache-core/pom.xml             |    2 +-
 .../ldcache-core/src/test/resources/logback.xml    |   27 +
 .../ldcache/services/test/dummy/resource1.ttl      |   17 +
 .../ldcache/services/test/dummy/resource2.ttl      |   17 +
 .../ldcache/services/test/dummy/resource3.ttl      |   17 +
 libraries/ldcache/ldcache-sail-generic/pom.xml     |    2 +-
 .../src/test/resources/logback.xml                 |   27 +
 .../marmotta/ldcache/sail/test/dummy/resource1.ttl |   17 +
 .../marmotta/ldcache/sail/test/dummy/resource2.ttl |   17 +
 .../marmotta/ldcache/sail/test/dummy/resource3.ttl |   17 +
 libraries/ldcache/ldcache-sail-kiwi/pom.xml        |    2 +-
 .../src/test/resources/logback.xml                 |   27 +
 .../marmotta/ldcache/sail/test/dummy/resource1.ttl |   17 +
 .../marmotta/ldcache/sail/test/dummy/resource2.ttl |   17 +
 .../marmotta/ldcache/sail/test/dummy/resource3.ttl |   17 +
 libraries/ldcache/pom.xml                          |    2 +-
 libraries/ldclient/ldclient-api/pom.xml            |    2 +-
 libraries/ldclient/ldclient-core/pom.xml           |    7 +-
 .../ldclient-core/src/test/resources/logback.xml   |   17 +
 .../ldclient/ldclient-provider-facebook/pom.xml    |    6 +-
 .../ldclient/endpoint/FacebookGraphEndpoint.java   |   17 +
 .../provider/facebook/FacebookGraphProvider.java   |  263 +-
 .../test/facebook/FacebookProviderTest.java        |   27 +
 .../src/test/resources/logback.xml                 |   17 +
 .../ldclient/test/facebook/interest.sparql         |   19 +-
 .../marmotta/ldclient/test/facebook/movie.sparql   |   19 +-
 .../ldclient/test/facebook/restaurant.sparql       |   17 +
 libraries/ldclient/ldclient-provider-html/pom.xml  |    2 +-
 libraries/ldclient/ldclient-provider-ldap/pom.xml  |    9 +-
 .../src/test/resources/logback.xml                 |   27 +
 .../ldclient/ldclient-provider-mediawiki/pom.xml   |    2 +-
 .../src/test/resources/logback.xml                 |   27 +
 .../test/mediawiki/wikipedia-marmot.sparql         |   17 +
 libraries/ldclient/ldclient-provider-phpbb/pom.xml |    2 +-
 libraries/ldclient/ldclient-provider-rdf/pom.xml   |    7 +-
 .../src/test/resources/logback.xml                 |   27 +
 .../ldclient/test/rdf/dbpedia-berlin.sparql        |   17 +
 .../marmotta/ldclient/test/rdf/foaf-wikier.sparql  |   17 +
 .../ldclient/test/rdf/geonames-embrun.sparql       |   17 +
 .../ldclient/test/rdf/ohloh-marmotta.sparql        |   17 +
 libraries/ldclient/ldclient-provider-rdfa/pom.xml  |    2 +-
 libraries/ldclient/ldclient-provider-vimeo/pom.xml |    7 +-
 .../src/test/resources/logback.xml                 |   27 +
 .../ldclient/test/vimeo/vimeo-channel.sparql       |   17 +
 .../ldclient/test/vimeo/vimeo-video.sparql         |   17 +
 libraries/ldclient/ldclient-provider-xml/pom.xml   |    2 +-
 .../ldclient/ldclient-provider-youtube/pom.xml     |    7 +-
 .../src/test/resources/logback.xml                 |   27 +
 .../ldclient/test/youtube/youtube-channel.sparql   |   17 +
 .../test/youtube/youtube-lmf-video-page.sparql     |   17 +
 .../ldclient/test/youtube/youtube-lmf-video.sparql |   17 +
 .../ldclient/test/youtube/youtube-playlist.sparql  |   17 +
 libraries/ldclient/pom.xml                         |    2 +-
 libraries/ldpath/ldpath-api/pom.xml                |    2 +-
 libraries/ldpath/ldpath-backend-file/pom.xml       |    2 +-
 libraries/ldpath/ldpath-backend-jena/pom.xml       |    2 +-
 .../ldpath-backend-linkeddata/NOTICE.template      |    9 +
 .../ldpath/ldpath-backend-linkeddata/NOTICE.txt    |   24 +
 .../ldpath/ldpath-backend-linkeddata/assembly.xml  |    2 +-
 libraries/ldpath/ldpath-backend-linkeddata/pom.xml |   19 +-
 libraries/ldpath/ldpath-backend-sesame/pom.xml     |    2 +-
 libraries/ldpath/ldpath-core/pom.xml               |    2 +-
 .../java/org/apache/marmotta/ldpath/LDPath.java    |    2 +
 .../model/functions/ConcatenateFunction.java       |    2 +
 .../ldpath/model/functions/FirstFunction.java      |    4 +-
 .../ldpath/model/selectors/FunctionSelector.java   |    4 +-
 .../ldpath/model/selectors/UnionSelector.java      |    2 +
 .../marmotta/ldpath/model/tests/AndTest.java       |    2 +
 .../model/transformers/BigDecimalTransformer.java  |    5 +
 .../model/transformers/BigIntegerTransformer.java  |    5 +
 .../model/transformers/DateTimeTransformer.java    |    4 +-
 .../ldpath/model/transformers/DateTransformer.java |    4 +-
 .../model/transformers/FloatTransformer.java       |    4 +-
 .../javacc/at/newmedialab/ldpath/parser/rdfpath.jj |   23 +-
 .../src/test/resources/ldpath/test-data.n3         |   17 +
 .../ldpath-core/src/test/resources/logback.xml     |   27 +
 .../ldpath/ldpath-functions-collections/pom.xml    |    7 +-
 .../src/test/resources/logback.xml                 |   27 +
 .../marmotta/ldpath/model/functions/coll/data.n3   |   17 +
 libraries/ldpath/ldpath-functions-date/pom.xml     |    7 +-
 .../src/test/resources/logback.xml                 |   27 +
 libraries/ldpath/ldpath-functions-html/pom.xml     |    7 +-
 .../model/functions/html/CleanHtmlFunction.java    |    2 +
 .../src/test/resources/logback.xml                 |   27 +
 .../marmotta/ldpath/model/functions/html/data.n3   |   17 +
 libraries/ldpath/ldpath-functions-math/pom.xml     |    7 +-
 .../src/test/resources/logback.xml                 |   27 +
 libraries/ldpath/ldpath-functions-text/pom.xml     |    7 +-
 .../model/functions/text/StrJoinFunction.java      |   79 +
 ....marmotta.ldpath.api.functions.SelectorFunction |    1 +
 .../model/functions/text/TextFunctionsTest.java    |   66 +
 .../src/test/resources/logback.xml                 |   27 +
 libraries/ldpath/ldpath-functions-xml/pom.xml      |    7 +-
 .../src/test/resources/logback.xml                 |   27 +
 .../marmotta/ldpath/model/functions/xml/data.n3    |   17 +
 .../marmotta/ldpath/model/functions/xml/quiz.xml   |   21 +-
 .../ldpath/ldpath-template-linkeddata/pom.xml      |    6 +-
 .../src/test/resources/city-html.ftl               |   16 +
 .../src/test/resources/logback.xml                 |   27 +
 libraries/ldpath/ldpath-template/pom.xml           |    2 +-
 .../ldpath/template/engine/TemplateEngine.java     |    4 +-
 .../transformers/TemplateDoubleTransformer.java    |    2 +
 libraries/ldpath/pom.xml                           |    2 +-
 libraries/pom.xml                                  |    2 +-
 license-mappings.xml                               |   53 +
 parent/pom.xml                                     |  203 +-
 platform/marmotta-core/pom.xml                     |    4 +-
 .../js/widgets/configurator/configurator.coffee    |   18 +
 .../platform/core/rio/RDFHtmlWriterImpl.java       |   11 +-
 .../core/services/logging/LoggingServiceImpl.java  |    8 +-
 .../services/templating/TemplatingServiceImpl.java |    2 +-
 .../marmotta/platform/core/util/CDIUtils.java      |    3 +
 .../core/util/LinkedHashSetBlockingQueue.java      |    4 +
 .../webservices/resource/ContentWebService.java    |   52 +-
 .../core/webservices/resource/MetaWebService.java  |   14 +-
 .../webservices/resource/ResourceWebService.java   |    2 +-
 .../resource/ResourceWebServiceHelper.java         |   13 +-
 .../webservices/triplestore/ContextWebService.java |    4 +-
 .../src/main/resources/META-INF/LICENSE            |  222 +
 .../src/main/resources/META-INF/NOTICE             |   13 +
 .../src/main/resources/templates/404.ftl           |   86 +-
 .../src/main/resources/templates/admin.ftl         |    8 +-
 .../src/main/resources/templates/rdfhtml.ftl       |   43 +-
 .../src/main/resources/web/public/style/404.css    |   44 +
 .../main/resources/web/public/style/rdfhtml.css    |    1 +
 .../resources/web/public/style/scheme/dark.css     |   28 +-
 .../src/main/resources/web/public/style/style.css  |    5 +-
 .../test/disabled/ConfigurationServiceTest.java    |   80 -
 .../src/test/disabled/LMFBaseTest.java             |  105 -
 .../src/test/disabled/PrefixCCTest.java            |   63 -
 .../src/test/disabled/PrefixServiceCCTests.java    |   30 -
 .../src/test/disabled/PrefixServiceTests.java      |  125 -
 .../src/test/disabled/ResourceServiceTest.java     |  414 -
 .../src/test/disabled/SparqlServiceTest.java       |  573 -
 platform/marmotta-core/src/test/disabled/data.n3   |   10 -
 .../marmotta-core/src/test/disabled/delete.sparql  |    8 -
 .../marmotta-core/src/test/disabled/insert.sparql  |    5 -
 .../marmotta-core/src/test/disabled/update.sparql  |    7 -
 .../test/util/LinkedHashSetBlockingQueueTest.java  |   53 +
 platform/marmotta-ldcache/pom.xml                  |    4 +-
 platform/marmotta-ldpath/pom.xml                   |    4 +-
 .../src/main/resources/META-INF/NOTICE             |    9 +
 platform/marmotta-reasoner/pom.xml                 |    4 +-
 .../src/main/resources/uploadOWL.sh                |   17 +
 .../src/main/resources/uploadRDFS.sh               |   17 +
 .../src/main/resources/uploadSKOS.sh               |   17 +
 .../reasoner/test/engine/test-001.initial.ttl      |   17 +
 .../reasoner/test/engine/test-001.result.ttl       |   17 +
 platform/marmotta-security/pom.xml                 |    4 +-
 platform/marmotta-sparql/pom.xml                   |    4 +-
 .../sparql/services/sparql/SparqlServiceImpl.java  |   22 +-
 .../src/main/resources/META-INF/LICENSE            |  207 +
 .../src/main/resources/META-INF/NOTICE             |   12 +
 .../test/resources/test-suite-archive/README.html  |  278 -
 .../resources/test-suite-archive/data-r2/LICENSE   |   21 -
 .../resources/test-suite-archive/data-r2/README    |   16 -
 .../data-r2/algebra-expressions.txt                |  112 -
 .../test-suite-archive/data-r2/algebra/data-1.ttl  |    5 -
 .../test-suite-archive/data-r2/algebra/data-2.ttl  |   11 -
 .../data-r2/algebra/filter-nested-1.rq             |    4 -
 .../data-r2/algebra/filter-nested-1.srx            |   16 -
 .../data-r2/algebra/filter-nested-2.rq             |    4 -
 .../data-r2/algebra/filter-nested-2.srx            |   11 -
 .../data-r2/algebra/filter-placement-1.rq          |    7 -
 .../data-r2/algebra/filter-placement-1.srx         |   16 -
 .../data-r2/algebra/filter-placement-2.rq          |    7 -
 .../data-r2/algebra/filter-placement-2.srx         |   16 -
 .../data-r2/algebra/filter-placement-3.rq          |    9 -
 .../data-r2/algebra/filter-placement-3.srx         |   20 -
 .../data-r2/algebra/filter-scope-1.rq              |    9 -
 .../data-r2/algebra/filter-scope-1.srx             |  109 -
 .../data-r2/algebra/join-combo-1.rq                |    7 -
 .../data-r2/algebra/join-combo-1.srx               |   36 -
 .../data-r2/algebra/join-combo-2.rq                |    6 -
 .../data-r2/algebra/join-combo-2.srx               |   21 -
 .../data-r2/algebra/join-combo-graph-1.ttl         |    5 -
 .../data-r2/algebra/join-combo-graph-2.ttl         |   15 -
 .../data-r2/algebra/manifest.ttl                   |  175 -
 .../data-r2/algebra/manifest.ttl.bak               |  152 -
 .../data-r2/algebra/opt-filter-1.rq                |   11 -
 .../data-r2/algebra/opt-filter-1.srx               |   50 -
 .../data-r2/algebra/opt-filter-1.ttl               |    9 -
 .../data-r2/algebra/opt-filter-2.rq                |   12 -
 .../data-r2/algebra/opt-filter-2.srx               |   36 -
 .../data-r2/algebra/opt-filter-2.ttl               |    9 -
 .../data-r2/algebra/opt-filter-3.rq                |   10 -
 .../data-r2/algebra/opt-filter-3.srx               |   13 -
 .../data-r2/algebra/opt-filter-3.ttl               |    9 -
 .../data-r2/algebra/two-nested-opt-alt.rq          |   10 -
 .../data-r2/algebra/two-nested-opt-alt.srx         |   28 -
 .../data-r2/algebra/two-nested-opt.rq              |   11 -
 .../data-r2/algebra/two-nested-opt.srx             |   17 -
 .../data-r2/algebra/two-nested-opt.ttl             |    7 -
 .../data-r2/algebra/var-scope-join-1.rq            |    8 -
 .../data-r2/algebra/var-scope-join-1.srx           |   13 -
 .../data-r2/algebra/var-scope-join-1.ttl           |   15 -
 .../test-suite-archive/data-r2/ask/ask-1.rq        |    3 -
 .../test-suite-archive/data-r2/ask/ask-1.srx       |    6 -
 .../test-suite-archive/data-r2/ask/ask-4.rq        |    3 -
 .../test-suite-archive/data-r2/ask/ask-4.srx       |    6 -
 .../test-suite-archive/data-r2/ask/ask-7.rq        |    3 -
 .../test-suite-archive/data-r2/ask/ask-7.srx       |    6 -
 .../test-suite-archive/data-r2/ask/ask-8.rq        |    3 -
 .../test-suite-archive/data-r2/ask/ask-8.srx       |    6 -
 .../test-suite-archive/data-r2/ask/data.ttl        |    9 -
 .../test-suite-archive/data-r2/ask/manifest.ttl    |   61 -
 .../data-r2/ask/manifest.ttl.bak                   |   55 -
 .../data-r2/basic/base-prefix-1.rq                 |    4 -
 .../data-r2/basic/base-prefix-1.srx                |   28 -
 .../data-r2/basic/base-prefix-2.rq                 |    4 -
 .../data-r2/basic/base-prefix-2.srx                |   20 -
 .../data-r2/basic/base-prefix-3.rq                 |    4 -
 .../data-r2/basic/base-prefix-3.srx                |   16 -
 .../data-r2/basic/base-prefix-4.rq                 |    3 -
 .../data-r2/basic/base-prefix-4.srx                |   16 -
 .../data-r2/basic/base-prefix-5.rq                 |    3 -
 .../data-r2/basic/base-prefix-5.srx                |   16 -
 .../data-r2/basic/bgp-no-match.rq                  |    8 -
 .../data-r2/basic/bgp-no-match.srx                 |   10 -
 .../test-suite-archive/data-r2/basic/data-1.ttl    |    8 -
 .../test-suite-archive/data-r2/basic/data-2.ttl    |    8 -
 .../test-suite-archive/data-r2/basic/data-3.ttl    |   12 -
 .../test-suite-archive/data-r2/basic/data-4.ttl    |   14 -
 .../test-suite-archive/data-r2/basic/data-5.ttl    |    5 -
 .../test-suite-archive/data-r2/basic/data-6.ttl    |    5 -
 .../test-suite-archive/data-r2/basic/data-7.ttl    |    7 -
 .../test-suite-archive/data-r2/basic/list-1.rq     |    5 -
 .../test-suite-archive/data-r2/basic/list-1.srx    |   16 -
 .../test-suite-archive/data-r2/basic/list-2.rq     |    5 -
 .../test-suite-archive/data-r2/basic/list-2.srx    |   16 -
 .../test-suite-archive/data-r2/basic/list-3.rq     |    5 -
 .../test-suite-archive/data-r2/basic/list-3.srx    |   20 -
 .../test-suite-archive/data-r2/basic/list-4.rq     |    5 -
 .../test-suite-archive/data-r2/basic/list-4.srx    |   24 -
 .../test-suite-archive/data-r2/basic/manifest.ttl  |  314 -
 .../data-r2/basic/manifest.ttl.bak                 |  311 -
 .../data-r2/basic/prefix-name-1.rq                 |    4 -
 .../data-r2/basic/prefix-name-1.srx                |   16 -
 .../test-suite-archive/data-r2/basic/quotes-1.rq   |    6 -
 .../test-suite-archive/data-r2/basic/quotes-1.srx  |   16 -
 .../test-suite-archive/data-r2/basic/quotes-2.rq   |    6 -
 .../test-suite-archive/data-r2/basic/quotes-2.srx  |   16 -
 .../test-suite-archive/data-r2/basic/quotes-3.rq   |    8 -
 .../test-suite-archive/data-r2/basic/quotes-3.srx  |   16 -
 .../test-suite-archive/data-r2/basic/quotes-4.rq   |    9 -
 .../test-suite-archive/data-r2/basic/quotes-4.srx  |   16 -
 .../test-suite-archive/data-r2/basic/spoo-1.rq     |    7 -
 .../test-suite-archive/data-r2/basic/spoo-1.srx    |   16 -
 .../test-suite-archive/data-r2/basic/term-1.rq     |    4 -
 .../test-suite-archive/data-r2/basic/term-1.srx    |   16 -
 .../test-suite-archive/data-r2/basic/term-2.rq     |    4 -
 .../test-suite-archive/data-r2/basic/term-2.srx    |   16 -
 .../test-suite-archive/data-r2/basic/term-3.rq     |    4 -
 .../test-suite-archive/data-r2/basic/term-3.srx    |   16 -
 .../test-suite-archive/data-r2/basic/term-4.rq     |    4 -
 .../test-suite-archive/data-r2/basic/term-4.srx    |   16 -
 .../test-suite-archive/data-r2/basic/term-5.rq     |    4 -
 .../test-suite-archive/data-r2/basic/term-5.srx    |   16 -
 .../test-suite-archive/data-r2/basic/term-6.rq     |    5 -
 .../test-suite-archive/data-r2/basic/term-6.srx    |   16 -
 .../test-suite-archive/data-r2/basic/term-7.rq     |    5 -
 .../test-suite-archive/data-r2/basic/term-7.srx    |   16 -
 .../test-suite-archive/data-r2/basic/term-8.rq     |    5 -
 .../test-suite-archive/data-r2/basic/term-8.srx    |   16 -
 .../test-suite-archive/data-r2/basic/term-9.rq     |    5 -
 .../test-suite-archive/data-r2/basic/term-9.srx    |   16 -
 .../test-suite-archive/data-r2/basic/var-1.rq      |    4 -
 .../test-suite-archive/data-r2/basic/var-1.srx     |   28 -
 .../test-suite-archive/data-r2/basic/var-2.rq      |    4 -
 .../test-suite-archive/data-r2/basic/var-2.srx     |   28 -
 .../data-r2/bnode-coreference/data.ttl             |   29 -
 .../data-r2/bnode-coreference/manifest.ttl         |   22 -
 .../data-r2/bnode-coreference/manifest.ttl.bak     |   21 -
 .../data-r2/bnode-coreference/query.rq             |    7 -
 .../data-r2/bnode-coreference/result.ttl           |   27 -
 .../data-r2/boolean-effective-value/data-1.ttl     |   14 -
 .../data-r2/boolean-effective-value/data-2.ttl     |   19 -
 .../data-r2/boolean-effective-value/manifest.ttl   |   81 -
 .../boolean-effective-value/manifest.ttl.bak       |   71 -
 .../data-r2/boolean-effective-value/query-bev-1.rq |    7 -
 .../data-r2/boolean-effective-value/query-bev-2.rq |    7 -
 .../data-r2/boolean-effective-value/query-bev-3.rq |    7 -
 .../data-r2/boolean-effective-value/query-bev-4.rq |    7 -
 .../data-r2/boolean-effective-value/query-bev-5.rq |    9 -
 .../data-r2/boolean-effective-value/query-bev-6.rq |    9 -
 .../query-boolean-literal.rq                       |    5 -
 .../boolean-effective-value/result-bev-1.ttl       |   27 -
 .../boolean-effective-value/result-bev-2.ttl       |   27 -
 .../boolean-effective-value/result-bev-3.ttl       |   27 -
 .../boolean-effective-value/result-bev-4.ttl       |   27 -
 .../boolean-effective-value/result-bev-5.ttl       |   12 -
 .../boolean-effective-value/result-bev-6.ttl       |   16 -
 .../result-boolean-literal.ttl                     |   12 -
 .../data-r2/bound/bound1-result.ttl                |   20 -
 .../test-suite-archive/data-r2/bound/bound1.rq     |    8 -
 .../test-suite-archive/data-r2/bound/data.ttl      |    5 -
 .../test-suite-archive/data-r2/bound/manifest.ttl  |   22 -
 .../data-r2/bound/manifest.ttl.bak                 |   21 -
 .../test-suite-archive/data-r2/cast/cast-bool.rq   |    7 -
 .../test-suite-archive/data-r2/cast/cast-bool.srx  |   16 -
 .../test-suite-archive/data-r2/cast/cast-dT.rq     |    7 -
 .../test-suite-archive/data-r2/cast/cast-dT.srx    |   16 -
 .../test-suite-archive/data-r2/cast/cast-dbl.rq    |    7 -
 .../test-suite-archive/data-r2/cast/cast-dbl.srx   |   26 -
 .../test-suite-archive/data-r2/cast/cast-dec.rq    |    7 -
 .../test-suite-archive/data-r2/cast/cast-dec.srx   |   21 -
 .../test-suite-archive/data-r2/cast/cast-flt.rq    |    7 -
 .../test-suite-archive/data-r2/cast/cast-flt.srx   |   26 -
 .../test-suite-archive/data-r2/cast/cast-int.rq    |    7 -
 .../test-suite-archive/data-r2/cast/cast-int.srx   |   16 -
 .../test-suite-archive/data-r2/cast/cast-str.rq    |    7 -
 .../test-suite-archive/data-r2/cast/cast-str.srx   |   46 -
 .../test-suite-archive/data-r2/cast/data.ttl       |    9 -
 .../test-suite-archive/data-r2/cast/manifest.ttl   |   83 -
 .../data-r2/construct/data-ident.ttl               |   18 -
 .../data-r2/construct/data-opt.ttl                 |   12 -
 .../data-r2/construct/data-reif.ttl                |   17 -
 .../data-r2/construct/manifest.ttl                 |   77 -
 .../data-r2/construct/manifest.ttl.bak             |   71 -
 .../data-r2/construct/query-construct-optional.rq  |   10 -
 .../data-r2/construct/query-ident.rq               |    7 -
 .../data-r2/construct/query-reif-1.rq              |    9 -
 .../data-r2/construct/query-reif-2.rq              |    9 -
 .../data-r2/construct/query-subgraph.rq            |    7 -
 .../construct/result-construct-optional.ttl        |    4 -
 .../data-r2/construct/result-ident.ttl             |   17 -
 .../data-r2/construct/result-reif.ttl              |   34 -
 .../data-r2/construct/result-subgraph.ttl          |    6 -
 .../data-r2/dataset/data-g1-dup.ttl                |    5 -
 .../test-suite-archive/data-r2/dataset/data-g1.ttl |    5 -
 .../data-r2/dataset/data-g2-dup.ttl                |    4 -
 .../test-suite-archive/data-r2/dataset/data-g2.ttl |    4 -
 .../data-r2/dataset/data-g3-dup.ttl                |    5 -
 .../test-suite-archive/data-r2/dataset/data-g3.ttl |    5 -
 .../data-r2/dataset/data-g4-dup.ttl                |    4 -
 .../test-suite-archive/data-r2/dataset/data-g4.ttl |    4 -
 .../data-r2/dataset/dataset-01.rq                  |    5 -
 .../data-r2/dataset/dataset-01.ttl                 |   29 -
 .../data-r2/dataset/dataset-02.rq                  |    5 -
 .../data-r2/dataset/dataset-02.ttl                 |    8 -
 .../data-r2/dataset/dataset-03.rq                  |    8 -
 .../data-r2/dataset/dataset-03.ttl                 |   36 -
 .../data-r2/dataset/dataset-04.rq                  |    8 -
 .../data-r2/dataset/dataset-04.ttl                 |    9 -
 .../data-r2/dataset/dataset-05.rq                  |    6 -
 .../data-r2/dataset/dataset-05.ttl                 |   29 -
 .../data-r2/dataset/dataset-06.rq                  |    9 -
 .../data-r2/dataset/dataset-06.ttl                 |   23 -
 .../data-r2/dataset/dataset-07.rq                  |   10 -
 .../data-r2/dataset/dataset-07.ttl                 |   43 -
 .../data-r2/dataset/dataset-08.rq                  |    9 -
 .../data-r2/dataset/dataset-08.ttl                 |   31 -
 .../data-r2/dataset/dataset-09.rq                  |    8 -
 .../data-r2/dataset/dataset-09.ttl                 |   11 -
 .../data-r2/dataset/dataset-09b.rq                 |    8 -
 .../data-r2/dataset/dataset-10.rq                  |    9 -
 .../data-r2/dataset/dataset-10.ttl                 |   11 -
 .../data-r2/dataset/dataset-10b.rq                 |    9 -
 .../data-r2/dataset/dataset-11.rq                  |   13 -
 .../data-r2/dataset/dataset-11.ttl                 |  108 -
 .../data-r2/dataset/dataset-12.rq                  |   16 -
 .../data-r2/dataset/dataset-12.ttl                 |  148 -
 .../data-r2/dataset/dataset-12b.rq                 |   16 -
 .../data-r2/dataset/manifest.ttl                   |  177 -
 .../data-r2/dataset/manifest.ttl.bak               |  143 -
 .../data-r2/distinct/data-all.ttl                  |   74 -
 .../data-r2/distinct/data-node.ttl                 |    9 -
 .../data-r2/distinct/data-num.ttl                  |   35 -
 .../data-r2/distinct/data-opt.ttl                  |   13 -
 .../data-r2/distinct/data-star.ttl                 |    8 -
 .../data-r2/distinct/data-str.ttl                  |   29 -
 .../data-r2/distinct/distinct-1-results.srx        |   61 -
 .../data-r2/distinct/distinct-1.rq                 |    7 -
 .../data-r2/distinct/distinct-2.rq                 |    8 -
 .../data-r2/distinct/distinct-all.srx              |  111 -
 .../data-r2/distinct/distinct-node.srx             |   21 -
 .../data-r2/distinct/distinct-num.srx              |   56 -
 .../data-r2/distinct/distinct-opt.srx              |   23 -
 .../data-r2/distinct/distinct-star-1.rq            |    7 -
 .../data-r2/distinct/distinct-star-1.srx           |   20 -
 .../data-r2/distinct/distinct-str.srx              |   56 -
 .../data-r2/distinct/manifest.ttl                  |  128 -
 .../data-r2/distinct/manifest.ttl.bak              |  127 -
 .../data-r2/distinct/no-distinct-1.rq              |    4 -
 .../data-r2/distinct/no-distinct-2.rq              |    8 -
 .../data-r2/distinct/no-distinct-all.srx           |  231 -
 .../data-r2/distinct/no-distinct-node.srx          |   31 -
 .../data-r2/distinct/no-distinct-num.srx           |  121 -
 .../data-r2/distinct/no-distinct-opt.srx           |   35 -
 .../data-r2/distinct/no-distinct-str.srx           |  101 -
 .../data-r2/expr-builtin/data-builtin-1.ttl        |   20 -
 .../data-r2/expr-builtin/data-builtin-2.ttl        |   14 -
 .../data-r2/expr-builtin/data-langMatches-de.ttl   |    8 -
 .../data-r2/expr-builtin/data-langMatches.ttl      |    7 -
 .../expr-builtin/lang-case-insensitive-eq.srx      |   98 -
 .../expr-builtin/lang-case-insensitive-ne.srx      |   17 -
 .../expr-builtin/lang-case-sensitivity-eq.rq       |   11 -
 .../expr-builtin/lang-case-sensitivity-ne.rq       |   12 -
 .../data-r2/expr-builtin/lang-case-sensitivity.ttl |    7 -
 .../data-r2/expr-builtin/manifest.ttl              |  273 -
 .../data-r2/expr-builtin/manifest.ttl.bak          |  234 -
 .../data-r2/expr-builtin/q-blank-1.rq              |    7 -
 .../data-r2/expr-builtin/q-datatype-1.rq           |    7 -
 .../data-r2/expr-builtin/q-datatype-2.rq           |    9 -
 .../data-r2/expr-builtin/q-datatype-3.rq           |    9 -
 .../data-r2/expr-builtin/q-iri-1.rq                |    7 -
 .../data-r2/expr-builtin/q-isliteral-1.rq          |    7 -
 .../data-r2/expr-builtin/q-lang-1.rq               |    9 -
 .../data-r2/expr-builtin/q-lang-2.rq               |    7 -
 .../data-r2/expr-builtin/q-lang-3.rq               |    6 -
 .../data-r2/expr-builtin/q-langMatches-1.rq        |    4 -
 .../data-r2/expr-builtin/q-langMatches-2.rq        |    4 -
 .../data-r2/expr-builtin/q-langMatches-3.rq        |    4 -
 .../data-r2/expr-builtin/q-langMatches-4.rq        |    4 -
 .../data-r2/expr-builtin/q-langMatches-de-de.rq    |    7 -
 .../data-r2/expr-builtin/q-str-1.rq                |    7 -
 .../data-r2/expr-builtin/q-str-2.rq                |    7 -
 .../data-r2/expr-builtin/q-str-3.rq                |    7 -
 .../data-r2/expr-builtin/q-str-4.rq                |    7 -
 .../data-r2/expr-builtin/q-uri-1.rq                |    7 -
 .../data-r2/expr-builtin/result-blank-1.ttl        |   16 -
 .../data-r2/expr-builtin/result-datatype-1.ttl     |   32 -
 .../data-r2/expr-builtin/result-datatype-2.srx     |   31 -
 .../data-r2/expr-builtin/result-datatype-3.srx     |   21 -
 .../data-r2/expr-builtin/result-iri-1.ttl          |   16 -
 .../data-r2/expr-builtin/result-isliteral-1.ttl    |   28 -
 .../data-r2/expr-builtin/result-lang-1.srx         |   36 -
 .../data-r2/expr-builtin/result-lang-2.srx         |   31 -
 .../data-r2/expr-builtin/result-lang-3.srx         |   16 -
 .../data-r2/expr-builtin/result-langMatches-1.ttl  |   14 -
 .../data-r2/expr-builtin/result-langMatches-2.ttl  |   21 -
 .../data-r2/expr-builtin/result-langMatches-3.ttl  |   28 -
 .../data-r2/expr-builtin/result-langMatches-4.ttl  |   14 -
 .../data-r2/expr-builtin/result-langMatches-de.ttl |   16 -
 .../data-r2/expr-builtin/result-sameTerm-eq.ttl    |  188 -
 .../expr-builtin/result-sameTerm-not-eq.ttl        |  370 -
 .../data-r2/expr-builtin/result-sameTerm.ttl       |  188 -
 .../data-r2/expr-builtin/result-str-1.ttl          |   40 -
 .../data-r2/expr-builtin/result-str-2.ttl          |   16 -
 .../data-r2/expr-builtin/result-str-3.ttl          |   24 -
 .../data-r2/expr-builtin/result-str-4.ttl          |   15 -
 .../data-r2/expr-builtin/result-uri-1.ttl          |   16 -
 .../data-r2/expr-builtin/sameTerm-eq.rq            |   11 -
 .../data-r2/expr-builtin/sameTerm-not-eq.rq        |   11 -
 .../data-r2/expr-builtin/sameTerm.rq               |   11 -
 .../data-r2/expr-equals/data-eq.ttl                |   23 -
 .../data-r2/expr-equals/manifest.ttl               |  143 -
 .../data-r2/expr-equals/manifest.ttl.bak           |  142 -
 .../data-r2/expr-equals/query-eq-1.rq              |    7 -
 .../data-r2/expr-equals/query-eq-2.rq              |    7 -
 .../data-r2/expr-equals/query-eq-3.rq              |    7 -
 .../data-r2/expr-equals/query-eq-4.rq              |    7 -
 .../data-r2/expr-equals/query-eq-5.rq              |    7 -
 .../data-r2/expr-equals/query-eq-graph-1.rq        |    6 -
 .../data-r2/expr-equals/query-eq-graph-2.rq        |    6 -
 .../data-r2/expr-equals/query-eq-graph-3.rq        |    6 -
 .../data-r2/expr-equals/query-eq-graph-4.rq        |    6 -
 .../data-r2/expr-equals/query-eq-graph-5.rq        |    7 -
 .../data-r2/expr-equals/query-eq2-1.rq             |    8 -
 .../data-r2/expr-equals/query-eq2-2.rq             |    8 -
 .../data-r2/expr-equals/query-eq2-graph-1.rq       |    7 -
 .../data-r2/expr-equals/result-eq-1.ttl            |   37 -
 .../data-r2/expr-equals/result-eq-2.ttl            |   37 -
 .../data-r2/expr-equals/result-eq-3.ttl            |   12 -
 .../data-r2/expr-equals/result-eq-4.ttl            |   12 -
 .../data-r2/expr-equals/result-eq-5.ttl            |   12 -
 .../data-r2/expr-equals/result-eq-graph-1.ttl      |   20 -
 .../data-r2/expr-equals/result-eq-graph-2.ttl      |   22 -
 .../data-r2/expr-equals/result-eq-graph-3.ttl      |   11 -
 .../data-r2/expr-equals/result-eq-graph-4.ttl      |   11 -
 .../data-r2/expr-equals/result-eq-graph-5.ttl      |   11 -
 .../data-r2/expr-equals/result-eq2-1.ttl           |  288 -
 .../data-r2/expr-equals/result-eq2-2.ttl           |  104 -
 .../data-r2/expr-equals/result-eq2-graph-1.ttl     |  229 -
 .../test-suite-archive/data-r2/expr-ops/data.ttl   |    7 -
 .../data-r2/expr-ops/manifest.ttl                  |   87 -
 .../data-r2/expr-ops/manifest.ttl.bak              |   79 -
 .../data-r2/expr-ops/query-ge-1.rq                 |    5 -
 .../data-r2/expr-ops/query-le-1.rq                 |    5 -
 .../data-r2/expr-ops/query-minus-1.rq              |    6 -
 .../data-r2/expr-ops/query-mul-1.rq                |    6 -
 .../data-r2/expr-ops/query-plus-1.rq               |    6 -
 .../data-r2/expr-ops/query-unminus-1.rq            |    5 -
 .../data-r2/expr-ops/query-unplus-1.rq             |    5 -
 .../data-r2/expr-ops/result-ge-1.srx               |   21 -
 .../data-r2/expr-ops/result-le-1.srx               |   21 -
 .../data-r2/expr-ops/result-minus-1.srx            |   16 -
 .../data-r2/expr-ops/result-mul-1.srx              |   26 -
 .../data-r2/expr-ops/result-plus-1.srx             |   21 -
 .../data-r2/expr-ops/result-unminus-1.srx          |   16 -
 .../data-r2/expr-ops/result-unplus-1.srx           |   16 -
 .../data-r2/extended-manifest-evaluation.ttl       |   13 -
 .../test-suite-archive/data-r2/files-to-fix        |   37 -
 .../test/resources/test-suite-archive/data-r2/foo  |    4 -
 .../test-suite-archive/data-r2/graph/data-g1.ttl   |    5 -
 .../test-suite-archive/data-r2/graph/data-g2.ttl   |    4 -
 .../data-r2/graph/data-g3-dup.ttl                  |    5 -
 .../test-suite-archive/data-r2/graph/data-g3.ttl   |    5 -
 .../test-suite-archive/data-r2/graph/data-g4.ttl   |    4 -
 .../test-suite-archive/data-r2/graph/graph-01.rq   |    3 -
 .../test-suite-archive/data-r2/graph/graph-01.ttl  |   29 -
 .../test-suite-archive/data-r2/graph/graph-02.rq   |    3 -
 .../test-suite-archive/data-r2/graph/graph-02.ttl  |    8 -
 .../test-suite-archive/data-r2/graph/graph-03.rq   |    6 -
 .../test-suite-archive/data-r2/graph/graph-03.ttl  |   36 -
 .../test-suite-archive/data-r2/graph/graph-04.rq   |    6 -
 .../test-suite-archive/data-r2/graph/graph-04.ttl  |    9 -
 .../test-suite-archive/data-r2/graph/graph-05.rq   |    3 -
 .../test-suite-archive/data-r2/graph/graph-05.ttl  |   29 -
 .../test-suite-archive/data-r2/graph/graph-06.rq   |    6 -
 .../test-suite-archive/data-r2/graph/graph-06.ttl  |   23 -
 .../test-suite-archive/data-r2/graph/graph-07.rq   |    8 -
 .../test-suite-archive/data-r2/graph/graph-07.ttl  |   43 -
 .../test-suite-archive/data-r2/graph/graph-08.rq   |    7 -
 .../test-suite-archive/data-r2/graph/graph-08.ttl  |   31 -
 .../test-suite-archive/data-r2/graph/graph-09.rq   |    7 -
 .../test-suite-archive/data-r2/graph/graph-09.ttl  |   11 -
 .../test-suite-archive/data-r2/graph/graph-10.rq   |    7 -
 .../test-suite-archive/data-r2/graph/graph-10.ttl  |   11 -
 .../test-suite-archive/data-r2/graph/graph-11.rq   |    8 -
 .../test-suite-archive/data-r2/graph/graph-11.ttl  |  108 -
 .../test-suite-archive/data-r2/graph/manifest.ttl  |  180 -
 .../data-r2/graph/manifest.ttl.bak                 |  165 -
 .../test-suite-archive/data-r2/i18n/.htaccess      |    6 -
 .../data-r2/i18n/kanji-01-results.ttl              |   22 -
 .../test-suite-archive/data-r2/i18n/kanji-01.rq    |    7 -
 .../data-r2/i18n/kanji-02-results.ttl              |   11 -
 .../test-suite-archive/data-r2/i18n/kanji-02.rq    |    7 -
 .../test-suite-archive/data-r2/i18n/kanji.ttl      |   20 -
 .../test-suite-archive/data-r2/i18n/manifest.ttl   |   78 -
 .../data-r2/i18n/manifest.ttl.bak                  |   77 -
 .../data-r2/i18n/normalization-01-results.ttl      |   15 -
 .../data-r2/i18n/normalization-01.rq               |    6 -
 .../data-r2/i18n/normalization-01.ttl              |   23 -
 .../data-r2/i18n/normalization-02-results.ttl      |   14 -
 .../data-r2/i18n/normalization-02.rq               |    8 -
 .../data-r2/i18n/normalization-02.ttl              |    8 -
 .../data-r2/i18n/normalization-03-results.ttl      |   14 -
 .../data-r2/i18n/normalization-03.rq               |    8 -
 .../data-r2/i18n/normalization-03.ttl              |    9 -
 .../data-r2/manifest-evaluation.ttl                |   39 -
 .../test-suite-archive/data-r2/manifest-syntax.ttl |   14 -
 .../data-r2/open-world/data-1.ttl                  |   17 -
 .../data-r2/open-world/data-2.ttl                  |   20 -
 .../data-r2/open-world/data-3.ttl                  |   15 -
 .../data-r2/open-world/data-4.ttl                  |   15 -
 .../data-r2/open-world/date-1-result.srx           |   20 -
 .../data-r2/open-world/date-1.rq                   |    8 -
 .../data-r2/open-world/date-2-result.srx           |   36 -
 .../data-r2/open-world/date-2.rq                   |    8 -
 .../data-r2/open-world/date-3-result.srx           |   36 -
 .../data-r2/open-world/date-3.rq                   |    8 -
 .../data-r2/open-world/date-4-result.srx           |   36 -
 .../data-r2/open-world/date-4.rq                   |    8 -
 .../data-r2/open-world/manifest.ttl                |  223 -
 .../data-r2/open-world/manifest.ttl.bak            |  219 -
 .../data-r2/open-world/open-cmp-01-result.srx      |   24 -
 .../data-r2/open-world/open-cmp-01.rq              |    8 -
 .../data-r2/open-world/open-cmp-02-result.srx      |   46 -
 .../data-r2/open-world/open-cmp-02.rq              |    8 -
 .../data-r2/open-world/open-eq-01-result.srx       |   11 -
 .../data-r2/open-world/open-eq-01.rq               |   13 -
 .../data-r2/open-world/open-eq-02-result.srx       |   16 -
 .../data-r2/open-world/open-eq-02.rq               |    8 -
 .../data-r2/open-world/open-eq-03-result.srx       |   28 -
 .../data-r2/open-world/open-eq-03.rq               |   14 -
 .../data-r2/open-world/open-eq-04-result.srx       |   28 -
 .../data-r2/open-world/open-eq-04.rq               |   14 -
 .../data-r2/open-world/open-eq-05-result.srx       |   20 -
 .../data-r2/open-world/open-eq-05.rq               |   11 -
 .../data-r2/open-world/open-eq-06-result.srx       |   12 -
 .../data-r2/open-world/open-eq-06.rq               |   12 -
 .../data-r2/open-world/open-eq-07-result.srx       |  182 -
 .../data-r2/open-world/open-eq-07.rq               |    9 -
 .../data-r2/open-world/open-eq-08-result.srx       |  602 -
 .../data-r2/open-world/open-eq-08.rq               |    9 -
 .../data-r2/open-world/open-eq-09-result.srx       |   14 -
 .../data-r2/open-world/open-eq-09.rq               |    9 -
 .../data-r2/open-world/open-eq-10-result.srx       |  742 -
 .../data-r2/open-world/open-eq-10.rq               |    9 -
 .../data-r2/open-world/open-eq-11-result.srx       |  742 -
 .../data-r2/open-world/open-eq-11.rq               |    9 -
 .../data-r2/open-world/open-eq-12-result.srx       |  154 -
 .../data-r2/open-world/open-eq-12.rq               |   10 -
 .../open-world/sameTerm-StringSimpleLiteralCmp.srx |   56 -
 .../sameTerm-eq-StringSimpleLiteralCmp.srx         |   56 -
 .../data-r2/open-world/sameTerm-eq.srx             |   56 -
 .../data-r2/open-world/sameTerm-manifest.ttl       |   61 -
 .../sameTerm-not-eq-StringSimpleLiteralCmp.srx     |   56 -
 .../data-r2/open-world/sameTerm-not-eq.srx         |   17 -
 .../data-r2/open-world/sameTerm.srx                |   56 -
 .../data-r2/open-world/sameTerm.ttl                |    8 -
 .../data-r2/optional-filter/data-1.ttl             |   12 -
 .../data-r2/optional-filter/expr-1-result.ttl      |   27 -
 .../data-r2/optional-filter/expr-1.rq              |   10 -
 .../data-r2/optional-filter/expr-2-result.ttl      |   17 -
 .../data-r2/optional-filter/expr-2.rq              |    9 -
 .../data-r2/optional-filter/expr-3-result.ttl      |   22 -
 .../data-r2/optional-filter/expr-3.rq              |    9 -
 .../data-r2/optional-filter/expr-4-result.ttl      |   24 -
 .../data-r2/optional-filter/expr-4.rq              |   10 -
 .../expr-5-result-not-simplified.ttl               |   24 -
 .../optional-filter/expr-5-result-simplified.ttl   |   27 -
 .../data-r2/optional-filter/expr-5.rq              |   13 -
 .../data-r2/optional-filter/manifest.ttl           |   68 -
 .../data-r2/optional-filter/manifest.ttl.bak       |   42 -
 .../data-r2/optional/complex-data-1.ttl            |   21 -
 .../data-r2/optional/complex-data-2.ttl            |   32 -
 .../test-suite-archive/data-r2/optional/data.ttl   |   11 -
 .../data-r2/optional/manifest.ttl                  |   99 -
 .../data-r2/optional/manifest.ttl.bak              |   45 -
 .../test-suite-archive/data-r2/optional/q-opt-1.rq |    7 -
 .../test-suite-archive/data-r2/optional/q-opt-2.rq |    8 -
 .../test-suite-archive/data-r2/optional/q-opt-3.rq |    8 -
 .../data-r2/optional/q-opt-complex-1.rq            |   11 -
 .../data-r2/optional/q-opt-complex-2.rq            |   16 -
 .../data-r2/optional/q-opt-complex-3.rq            |   17 -
 .../data-r2/optional/q-opt-complex-4.rq            |   15 -
 .../data-r2/optional/result-opt-1.ttl              |   25 -
 .../data-r2/optional/result-opt-2.ttl              |   32 -
 .../data-r2/optional/result-opt-3.ttl              |   33 -
 .../data-r2/optional/result-opt-complex-1.ttl      |   34 -
 .../data-r2/optional/result-opt-complex-2.ttl      |   16 -
 .../data-r2/optional/result-opt-complex-3.ttl      |   33 -
 .../data-r2/optional/result-opt-complex-4.ttl      |   48 -
 .../data-r2/reduced/manifest.ttl                   |   38 -
 .../data-r2/reduced/reduced-1.rq                   |    7 -
 .../data-r2/reduced/reduced-1.srx                  |   24 -
 .../data-r2/reduced/reduced-2.rq                   |    7 -
 .../data-r2/reduced/reduced-2.srx                  |  101 -
 .../data-r2/reduced/reduced-star.ttl               |    8 -
 .../data-r2/reduced/reduced-str.ttl                |   29 -
 .../test-suite-archive/data-r2/regex/manifest.ttl  |   57 -
 .../data-r2/regex/manifest.ttl.bak                 |   56 -
 .../data-r2/regex/regex-data-01.ttl                |    5 -
 .../data-r2/regex/regex-query-001.rq               |    8 -
 .../data-r2/regex/regex-query-002.rq               |    8 -
 .../data-r2/regex/regex-query-003.rq               |    8 -
 .../data-r2/regex/regex-query-004.rq               |    7 -
 .../data-r2/regex/regex-result-001.ttl             |   10 -
 .../data-r2/regex/regex-result-002.ttl             |   14 -
 .../data-r2/regex/regex-result-003.ttl             |   10 -
 .../data-r2/regex/regex-result-004.ttl             |   14 -
 .../data-r2/solution-seq/data.ttl                  |   18 -
 .../data-r2/solution-seq/manifest.ttl              |  117 -
 .../data-r2/solution-seq/manifest.ttl.bak          |   89 -
 .../data-r2/solution-seq/slice-01.rq               |    6 -
 .../data-r2/solution-seq/slice-02.rq               |    7 -
 .../data-r2/solution-seq/slice-03.rq               |    6 -
 .../data-r2/solution-seq/slice-04.rq               |    6 -
 .../data-r2/solution-seq/slice-10.rq               |    6 -
 .../data-r2/solution-seq/slice-11.rq               |    6 -
 .../data-r2/solution-seq/slice-12.rq               |    6 -
 .../data-r2/solution-seq/slice-13.rq               |    6 -
 .../data-r2/solution-seq/slice-20.rq               |    8 -
 .../data-r2/solution-seq/slice-21.rq               |    7 -
 .../data-r2/solution-seq/slice-22.rq               |    7 -
 .../data-r2/solution-seq/slice-23.rq               |    7 -
 .../data-r2/solution-seq/slice-24.rq               |    7 -
 .../data-r2/solution-seq/slice-results-01.ttl      |   12 -
 .../data-r2/solution-seq/slice-results-02.ttl      |   47 -
 .../data-r2/solution-seq/slice-results-03.ttl      |    6 -
 .../data-r2/solution-seq/slice-results-04.ttl      |   32 -
 .../data-r2/solution-seq/slice-results-10.ttl      |   42 -
 .../data-r2/solution-seq/slice-results-11.ttl      |   47 -
 .../data-r2/solution-seq/slice-results-12.ttl      |    6 -
 .../data-r2/solution-seq/slice-results-13.ttl      |   22 -
 .../data-r2/solution-seq/slice-results-20.ttl      |   12 -
 .../data-r2/solution-seq/slice-results-21.ttl      |   18 -
 .../data-r2/solution-seq/slice-results-22.ttl      |    6 -
 .../data-r2/solution-seq/slice-results-23.ttl      |   32 -
 .../data-r2/solution-seq/slice-results-24.ttl      |   22 -
 .../data-r2/sort/.manifest.ttl.swp                 |  Bin 20480 -> 0 bytes
 .../data-r2/sort/data-sort-1.ttl                   |    7 -
 .../data-r2/sort/data-sort-11.ttl                  |   15 -
 .../data-r2/sort/data-sort-3.ttl                   |   17 -
 .../data-r2/sort/data-sort-4.ttl                   |   22 -
 .../data-r2/sort/data-sort-6.ttl                   |   20 -
 .../data-r2/sort/data-sort-7.ttl                   |   19 -
 .../data-r2/sort/data-sort-8.ttl                   |   13 -
 .../data-r2/sort/data-sort-9.ttl                   |   10 -
 .../data-r2/sort/data-sort-builtin.ttl             |    7 -
 .../data-r2/sort/data-sort-function.ttl            |    6 -
 .../data-r2/sort/data-sort-numbers.ttl             |    7 -
 .../data-r2/sort/extended-manifest.ttl             |   19 -
 .../test-suite-archive/data-r2/sort/manifest.ttl   |  148 -
 .../data-r2/sort/manifest.ttl.bak                  |  114 -
 .../data-r2/sort/query-sort-1.rq                   |    4 -
 .../data-r2/sort/query-sort-10.rq                  |    4 -
 .../data-r2/sort/query-sort-2.rq                   |    4 -
 .../data-r2/sort/query-sort-3.rq                   |    6 -
 .../data-r2/sort/query-sort-4.rq                   |    8 -
 .../data-r2/sort/query-sort-5.rq                   |    8 -
 .../data-r2/sort/query-sort-6.rq                   |    5 -
 .../data-r2/sort/query-sort-9.rq                   |    4 -
 .../data-r2/sort/query-sort-builtin.rq             |    4 -
 .../data-r2/sort/query-sort-function.rq            |    5 -
 .../data-r2/sort/query-sort-numbers.rq             |    4 -
 .../data-r2/sort/result-sort-1.rdf                 |   38 -
 .../data-r2/sort/result-sort-10.rdf                |   38 -
 .../data-r2/sort/result-sort-11.ttl                |   49 -
 .../data-r2/sort/result-sort-2.rdf                 |   38 -
 .../data-r2/sort/result-sort-3.rdf                 |   56 -
 .../data-r2/sort/result-sort-4.rdf                 |   71 -
 .../data-r2/sort/result-sort-5.rdf                 |   72 -
 .../data-r2/sort/result-sort-6.rdf                 |   42 -
 .../data-r2/sort/result-sort-7.rdf                 |   59 -
 .../data-r2/sort/result-sort-8.rdf                 |   48 -
 .../data-r2/sort/result-sort-9.rdf                 |   38 -
 .../data-r2/sort/result-sort-builtin.ttl           |   25 -
 .../data-r2/sort/result-sort-function.ttl          |   25 -
 .../data-r2/sort/result-sort-numbers.ttl           |   25 -
 .../data-r2/syntax-sparql1/manifest.ttl            |  524 -
 .../data-r2/syntax-sparql1/manifest.ttl.bak        |  523 -
 .../data-r2/syntax-sparql1/syntax-basic-01.rq      |    2 -
 .../data-r2/syntax-sparql1/syntax-basic-02.rq      |    1 -
 .../data-r2/syntax-sparql1/syntax-basic-03.rq      |    4 -
 .../data-r2/syntax-sparql1/syntax-basic-04.rq      |    3 -
 .../data-r2/syntax-sparql1/syntax-basic-05.rq      |    3 -
 .../data-r2/syntax-sparql1/syntax-basic-06.rq      |    3 -
 .../data-r2/syntax-sparql1/syntax-bnodes-01.rq     |    2 -
 .../data-r2/syntax-sparql1/syntax-bnodes-02.rq     |    2 -
 .../data-r2/syntax-sparql1/syntax-bnodes-03.rq     |    2 -
 .../data-r2/syntax-sparql1/syntax-bnodes-04.rq     |    3 -
 .../data-r2/syntax-sparql1/syntax-bnodes-05.rq     |    5 -
 .../data-r2/syntax-sparql1/syntax-expr-01.rq       |    2 -
 .../data-r2/syntax-sparql1/syntax-expr-02.rq       |    2 -
 .../data-r2/syntax-sparql1/syntax-expr-03.rq       |    2 -
 .../data-r2/syntax-sparql1/syntax-expr-04.rq       |    3 -
 .../data-r2/syntax-sparql1/syntax-expr-05.rq       |    4 -
 .../data-r2/syntax-sparql1/syntax-forms-01.rq      |    2 -
 .../data-r2/syntax-sparql1/syntax-forms-02.rq      |    2 -
 .../syntax-sparql1/syntax-limit-offset-01.rq       |    5 -
 .../syntax-sparql1/syntax-limit-offset-02.rq       |    7 -
 .../syntax-sparql1/syntax-limit-offset-03.rq       |    7 -
 .../syntax-sparql1/syntax-limit-offset-04.rq       |    5 -
 .../data-r2/syntax-sparql1/syntax-lists-01.rq      |    2 -
 .../data-r2/syntax-sparql1/syntax-lists-02.rq      |    2 -
 .../data-r2/syntax-sparql1/syntax-lists-03.rq      |    1 -
 .../data-r2/syntax-sparql1/syntax-lists-04.rq      |    1 -
 .../data-r2/syntax-sparql1/syntax-lists-05.rq      |    1 -
 .../data-r2/syntax-sparql1/syntax-lit-01.rq        |    3 -
 .../data-r2/syntax-sparql1/syntax-lit-02.rq        |    3 -
 .../data-r2/syntax-sparql1/syntax-lit-03.rq        |    3 -
 .../data-r2/syntax-sparql1/syntax-lit-04.rq        |    3 -
 .../data-r2/syntax-sparql1/syntax-lit-05.rq        |    3 -
 .../data-r2/syntax-sparql1/syntax-lit-06.rq        |    3 -
 .../data-r2/syntax-sparql1/syntax-lit-07.rq        |    3 -
 .../data-r2/syntax-sparql1/syntax-lit-08.rq        |    3 -
 .../data-r2/syntax-sparql1/syntax-lit-09.rq        |    6 -
 .../data-r2/syntax-sparql1/syntax-lit-10.rq        |    5 -
 .../data-r2/syntax-sparql1/syntax-lit-11.rq        |    3 -
 .../data-r2/syntax-sparql1/syntax-lit-12.rq        |    3 -
 .../data-r2/syntax-sparql1/syntax-lit-13.rq        |    3 -
 .../data-r2/syntax-sparql1/syntax-lit-14.rq        |    3 -
 .../data-r2/syntax-sparql1/syntax-lit-15.rq        |    3 -
 .../data-r2/syntax-sparql1/syntax-lit-16.rq        |    3 -
 .../data-r2/syntax-sparql1/syntax-lit-17.rq        |    3 -
 .../data-r2/syntax-sparql1/syntax-lit-18.rq        |    3 -
 .../data-r2/syntax-sparql1/syntax-lit-19.rq        |    3 -
 .../data-r2/syntax-sparql1/syntax-lit-20.rq        |    3 -
 .../data-r2/syntax-sparql1/syntax-order-01.rq      |    4 -
 .../data-r2/syntax-sparql1/syntax-order-02.rq      |    4 -
 .../data-r2/syntax-sparql1/syntax-order-03.rq      |    4 -
 .../data-r2/syntax-sparql1/syntax-order-04.rq      |    4 -
 .../data-r2/syntax-sparql1/syntax-order-05.rq      |    4 -
 .../data-r2/syntax-sparql1/syntax-order-06.rq      |    5 -
 .../data-r2/syntax-sparql1/syntax-order-07.rq      |    4 -
 .../data-r2/syntax-sparql1/syntax-pat-01.rq        |    3 -
 .../data-r2/syntax-sparql1/syntax-pat-02.rq        |    4 -
 .../data-r2/syntax-sparql1/syntax-pat-03.rq        |    7 -
 .../data-r2/syntax-sparql1/syntax-pat-04.rq        |    8 -
 .../data-r2/syntax-sparql1/syntax-qname-01.rq      |    3 -
 .../data-r2/syntax-sparql1/syntax-qname-02.rq      |    3 -
 .../data-r2/syntax-sparql1/syntax-qname-03.rq      |    3 -
 .../data-r2/syntax-sparql1/syntax-qname-04.rq      |    4 -
 .../data-r2/syntax-sparql1/syntax-qname-05.rq      |    3 -
 .../data-r2/syntax-sparql1/syntax-qname-06.rq      |    3 -
 .../data-r2/syntax-sparql1/syntax-qname-07.rq      |    4 -
 .../data-r2/syntax-sparql1/syntax-qname-08.rq      |    5 -
 .../data-r2/syntax-sparql1/syntax-struct-01.rq     |    4 -
 .../data-r2/syntax-sparql1/syntax-struct-02.rq     |    4 -
 .../data-r2/syntax-sparql1/syntax-struct-03.rq     |    4 -
 .../data-r2/syntax-sparql1/syntax-struct-05.rq     |    4 -
 .../data-r2/syntax-sparql1/syntax-struct-06.rq     |    4 -
 .../data-r2/syntax-sparql1/syntax-struct-07.rq     |    4 -
 .../data-r2/syntax-sparql1/syntax-struct-08.rq     |    4 -
 .../data-r2/syntax-sparql1/syntax-struct-09.rq     |    4 -
 .../data-r2/syntax-sparql1/syntax-struct-10.rq     |    4 -
 .../data-r2/syntax-sparql1/syntax-struct-11.rq     |    4 -
 .../data-r2/syntax-sparql1/syntax-struct-12.rq     |    4 -
 .../data-r2/syntax-sparql1/syntax-struct-13.rq     |    6 -
 .../data-r2/syntax-sparql1/syntax-struct-14.rq     |    6 -
 .../data-r2/syntax-sparql1/syntax-union-01.rq      |    5 -
 .../data-r2/syntax-sparql1/syntax-union-02.rq      |    5 -
 .../data-r2/syntax-sparql2/manifest.ttl            |  348 -
 .../data-r2/syntax-sparql2/manifest.ttl.bak        |  347 -
 .../data-r2/syntax-sparql2/syntax-bnode-01.rq      |    2 -
 .../data-r2/syntax-sparql2/syntax-bnode-02.rq      |    4 -
 .../data-r2/syntax-sparql2/syntax-bnode-03.rq      |    3 -
 .../data-r2/syntax-sparql2/syntax-dataset-01.rq    |    4 -
 .../data-r2/syntax-sparql2/syntax-dataset-02.rq    |    4 -
 .../data-r2/syntax-sparql2/syntax-dataset-03.rq    |    5 -
 .../data-r2/syntax-sparql2/syntax-dataset-04.rq    |    7 -
 .../data-r2/syntax-sparql2/syntax-esc-01.rq        |    2 -
 .../data-r2/syntax-sparql2/syntax-esc-02.rq        |    2 -
 .../data-r2/syntax-sparql2/syntax-esc-03.rq        |    2 -
 .../data-r2/syntax-sparql2/syntax-esc-04.rq        |    3 -
 .../data-r2/syntax-sparql2/syntax-esc-05.rq        |    5 -
 .../data-r2/syntax-sparql2/syntax-form-ask-02.rq   |    1 -
 .../syntax-sparql2/syntax-form-construct01.rq      |    1 -
 .../syntax-sparql2/syntax-form-construct02.rq      |    1 -
 .../syntax-sparql2/syntax-form-construct03.rq      |    5 -
 .../syntax-sparql2/syntax-form-construct04.rq      |    5 -
 .../syntax-sparql2/syntax-form-construct06.rq      |    1 -
 .../syntax-sparql2/syntax-form-describe01.rq       |    1 -
 .../syntax-sparql2/syntax-form-describe02.rq       |    1 -
 .../syntax-sparql2/syntax-form-select-01.rq        |    1 -
 .../syntax-sparql2/syntax-form-select-02.rq        |    1 -
 .../data-r2/syntax-sparql2/syntax-function-01.rq   |    2 -
 .../data-r2/syntax-sparql2/syntax-function-02.rq   |    2 -
 .../data-r2/syntax-sparql2/syntax-function-03.rq   |    3 -
 .../data-r2/syntax-sparql2/syntax-function-04.rq   |    4 -
 .../data-r2/syntax-sparql2/syntax-general-01.rq    |    1 -
 .../data-r2/syntax-sparql2/syntax-general-02.rq    |    1 -
 .../data-r2/syntax-sparql2/syntax-general-03.rq    |    1 -
 .../data-r2/syntax-sparql2/syntax-general-04.rq    |    1 -
 .../data-r2/syntax-sparql2/syntax-general-05.rq    |    1 -
 .../data-r2/syntax-sparql2/syntax-general-06.rq    |    1 -
 .../data-r2/syntax-sparql2/syntax-general-07.rq    |    1 -
 .../data-r2/syntax-sparql2/syntax-general-08.rq    |    1 -
 .../data-r2/syntax-sparql2/syntax-general-09.rq    |    1 -
 .../data-r2/syntax-sparql2/syntax-general-10.rq    |    1 -
 .../data-r2/syntax-sparql2/syntax-general-11.rq    |    1 -
 .../data-r2/syntax-sparql2/syntax-general-12.rq    |    2 -
 .../data-r2/syntax-sparql2/syntax-general-13.rq    |    3 -
 .../data-r2/syntax-sparql2/syntax-general-14.rq    |    3 -
 .../data-r2/syntax-sparql2/syntax-graph-01.rq      |    6 -
 .../data-r2/syntax-sparql2/syntax-graph-02.rq      |    6 -
 .../data-r2/syntax-sparql2/syntax-graph-03.rq      |    6 -
 .../data-r2/syntax-sparql2/syntax-graph-04.rq      |    7 -
 .../data-r2/syntax-sparql2/syntax-graph-05.rq      |    7 -
 .../data-r2/syntax-sparql2/syntax-keywords-01.rq   |    4 -
 .../data-r2/syntax-sparql2/syntax-keywords-02.rq   |    4 -
 .../data-r2/syntax-sparql2/syntax-keywords-03.rq   |    4 -
 .../data-r2/syntax-sparql2/syntax-lists-01.rq      |    2 -
 .../data-r2/syntax-sparql2/syntax-lists-02.rq      |    2 -
 .../data-r2/syntax-sparql2/syntax-lists-03.rq      |    3 -
 .../data-r2/syntax-sparql2/syntax-lists-04.rq      |    3 -
 .../data-r2/syntax-sparql2/syntax-lists-05.rq      |    3 -
 .../data-r2/syntax-sparql3/manifest.ttl            |  329 -
 .../data-r2/syntax-sparql3/manifest.ttl.bak        |  328 -
 .../data-r2/syntax-sparql3/syn-01.rq               |    3 -
 .../data-r2/syntax-sparql3/syn-02.rq               |    3 -
 .../data-r2/syntax-sparql3/syn-03.rq               |    2 -
 .../data-r2/syntax-sparql3/syn-04.rq               |    3 -
 .../data-r2/syntax-sparql3/syn-05.rq               |    3 -
 .../data-r2/syntax-sparql3/syn-06.rq               |    3 -
 .../data-r2/syntax-sparql3/syn-07.rq               |    4 -
 .../data-r2/syntax-sparql3/syn-08.rq               |    4 -
 .../data-r2/syntax-sparql3/syn-bad-01.rq           |    3 -
 .../data-r2/syntax-sparql3/syn-bad-02.rq           |    4 -
 .../data-r2/syntax-sparql3/syn-bad-03.rq           |    4 -
 .../data-r2/syntax-sparql3/syn-bad-04.rq           |    4 -
 .../data-r2/syntax-sparql3/syn-bad-05.rq           |    3 -
 .../data-r2/syntax-sparql3/syn-bad-06.rq           |    3 -
 .../data-r2/syntax-sparql3/syn-bad-07.rq           |    3 -
 .../data-r2/syntax-sparql3/syn-bad-08.rq           |    3 -
 .../data-r2/syntax-sparql3/syn-bad-09.rq           |    3 -
 .../data-r2/syntax-sparql3/syn-bad-10.rq           |    3 -
 .../data-r2/syntax-sparql3/syn-bad-11.rq           |    3 -
 .../data-r2/syntax-sparql3/syn-bad-12.rq           |    3 -
 .../data-r2/syntax-sparql3/syn-bad-13.rq           |    3 -
 .../data-r2/syntax-sparql3/syn-bad-14.rq           |    3 -
 .../data-r2/syntax-sparql3/syn-bad-15.rq           |    3 -
 .../data-r2/syntax-sparql3/syn-bad-16.rq           |    4 -
 .../data-r2/syntax-sparql3/syn-bad-17.rq           |    4 -
 .../data-r2/syntax-sparql3/syn-bad-18.rq           |    4 -
 .../data-r2/syntax-sparql3/syn-bad-19.rq           |    4 -
 .../data-r2/syntax-sparql3/syn-bad-20.rq           |    4 -
 .../data-r2/syntax-sparql3/syn-bad-21.rq           |    4 -
 .../data-r2/syntax-sparql3/syn-bad-22.rq           |    4 -
 .../data-r2/syntax-sparql3/syn-bad-23.rq           |    4 -
 .../data-r2/syntax-sparql3/syn-bad-24.rq           |    4 -
 .../data-r2/syntax-sparql3/syn-bad-25.rq           |    1 -
 .../data-r2/syntax-sparql3/syn-bad-26.rq           |    5 -
 .../data-r2/syntax-sparql3/syn-bad-27.rq           |    2 -
 .../data-r2/syntax-sparql3/syn-bad-28.rq           |    2 -
 .../data-r2/syntax-sparql3/syn-bad-29.rq           |    2 -
 .../data-r2/syntax-sparql3/syn-bad-30.rq           |    2 -
 .../data-r2/syntax-sparql3/syn-bad-31.rq           |    6 -
 .../data-r2/syntax-sparql3/syn-bad-bnode-dot.rq    |    2 -
 .../syn-bad-bnodes-missing-pvalues-01.rq           |    3 -
 .../syn-bad-bnodes-missing-pvalues-02.rq           |    2 -
 .../syntax-sparql3/syn-bad-empty-optional-01.rq    |    2 -
 .../syntax-sparql3/syn-bad-empty-optional-02.rq    |    2 -
 .../syn-bad-filter-missing-parens.rq               |    2 -
 .../data-r2/syntax-sparql3/syn-bad-lone-list.rq    |    2 -
 .../data-r2/syntax-sparql3/syn-bad-lone-node.rq    |    2 -
 .../syntax-sparql3/syn-blabel-cross-filter.rq      |    7 -
 .../syntax-sparql3/syn-blabel-cross-graph-bad.rq   |    7 -
 .../syn-blabel-cross-optional-bad.rq               |    9 -
 .../syntax-sparql3/syn-blabel-cross-union-bad.rq   |   11 -
 .../data-r2/syntax-sparql4/manifest.ttl            |   91 -
 .../data-r2/syntax-sparql4/manifest.ttl.bak        |   90 -
 .../data-r2/syntax-sparql4/syn-09.rq               |    6 -
 .../data-r2/syntax-sparql4/syn-10.rq               |    6 -
 .../data-r2/syntax-sparql4/syn-11.rq               |    6 -
 .../data-r2/syntax-sparql4/syn-bad-34.rq           |    6 -
 .../data-r2/syntax-sparql4/syn-bad-35.rq           |    6 -
 .../data-r2/syntax-sparql4/syn-bad-36.rq           |    6 -
 .../data-r2/syntax-sparql4/syn-bad-37.rq           |    6 -
 .../data-r2/syntax-sparql4/syn-bad-38.rq           |    6 -
 .../syntax-sparql4/syn-bad-GRAPH-breaks-BGP.rq     |    9 -
 .../syntax-sparql4/syn-bad-OPT-breaks-BGP.rq       |    9 -
 .../syntax-sparql4/syn-bad-UNION-breaks-BGP.rq     |   11 -
 .../syn-leading-digits-in-prefixed-names.rq        |    8 -
 .../data-r2/syntax-sparql5/manifest.ttl            |   27 -
 .../data-r2/syntax-sparql5/syntax-reduced-01.rq    |    1 -
 .../data-r2/syntax-sparql5/syntax-reduced-02.rq    |    1 -
 .../data-r2/triple-match/data-01.ttl               |    4 -
 .../data-r2/triple-match/data-02.ttl               |    7 -
 .../data-r2/triple-match/data-03.ttl               |    4 -
 .../data-r2/triple-match/dawg-data-01.ttl          |   29 -
 .../data-r2/triple-match/dawg-tp-01.rq             |    4 -
 .../data-r2/triple-match/dawg-tp-02.rq             |    5 -
 .../data-r2/triple-match/dawg-tp-03.rq             |    2 -
 .../data-r2/triple-match/dawg-tp-04.rq             |    8 -
 .../data-r2/triple-match/dawg-tp-05.rq             |    5 -
 .../data-r2/triple-match/manifest.ttl              |   60 -
 .../data-r2/triple-match/manifest.ttl.bak          |   59 -
 .../data-r2/triple-match/result-tp-01.ttl          |   20 -
 .../data-r2/triple-match/result-tp-02.ttl          |   20 -
 .../data-r2/triple-match/result-tp-03.ttl          |   13 -
 .../data-r2/triple-match/result-tp-04.ttl          |   18 -
 .../data-r2/type-promotion/false.ttl               |    9 -
 .../data-r2/type-promotion/manifest.ttl            |  406 -
 .../data-r2/type-promotion/manifest.ttl.bak        |  405 -
 .../data-r2/type-promotion/tP-byte-short-fail.rq   |   10 -
 .../data-r2/type-promotion/tP-byte-short.rq        |   10 -
 .../data-r2/type-promotion/tP-decimal-decimal.rq   |   10 -
 .../type-promotion/tP-double-decimal-fail.rq       |   10 -
 .../data-r2/type-promotion/tP-double-decimal.rq    |   10 -
 .../data-r2/type-promotion/tP-double-double.rq     |   10 -
 .../data-r2/type-promotion/tP-double-float-fail.rq |   10 -
 .../data-r2/type-promotion/tP-double-float.rq      |   10 -
 .../type-promotion/tP-float-decimal-fail.rq        |   10 -
 .../data-r2/type-promotion/tP-float-decimal.rq     |   10 -
 .../data-r2/type-promotion/tP-float-float.rq       |   10 -
 .../data-r2/type-promotion/tP-int-short.rq         |   10 -
 .../data-r2/type-promotion/tP-integer-short.rq     |   10 -
 .../data-r2/type-promotion/tP-long-short.rq        |   10 -
 .../type-promotion/tP-negativeInteger-short.rq     |   10 -
 .../type-promotion/tP-nonNegativeInteger-short.rq  |   10 -
 .../type-promotion/tP-nonPositiveInteger-short.rq  |   10 -
 .../type-promotion/tP-positiveInteger-short.rq     |   10 -
 .../data-r2/type-promotion/tP-short-byte-fail.rq   |   10 -
 .../data-r2/type-promotion/tP-short-decimal.rq     |   10 -
 .../data-r2/type-promotion/tP-short-double.rq      |   10 -
 .../data-r2/type-promotion/tP-short-float.rq       |   10 -
 .../data-r2/type-promotion/tP-short-int-fail.rq    |   10 -
 .../data-r2/type-promotion/tP-short-long-fail.rq   |   10 -
 .../data-r2/type-promotion/tP-short-short-fail.rq  |   10 -
 .../data-r2/type-promotion/tP-short-short.rq       |   10 -
 .../type-promotion/tP-unsignedByte-short.rq        |   10 -
 .../data-r2/type-promotion/tP-unsignedInt-short.rq |   10 -
 .../type-promotion/tP-unsignedLong-short.rq        |   10 -
 .../type-promotion/tP-unsignedShort-short.rq       |   10 -
 .../data-r2/type-promotion/tP.ttl                  |   28 -
 .../data-r2/type-promotion/true.ttl                |    9 -
 .../test/resources/test-suite-archive/data-r2/x    |    8 -
 .../test/resources/test-suite-archive/earl.html    |  204 -
 .../src/test/resources/test-suite-archive/r2.html  |14471 ---------------
 .../resources/test-suite-archive/result-set.n3     |   88 -
 .../test/resources/test-suite-archive/test-dawg.n3 |  116 -
 .../resources/test-suite-archive/test-manifest.n3  |  163 -
 .../resources/test-suite-archive/test-query.n3     |   76 -
 .../test/resources/test-suite-archive/tests.css    |   37 -
 platform/marmotta-user/pom.xml                     |    4 +-
 platform/marmotta-versioning/pom.xml               |    4 +-
 platform/pom.xml                                   |    2 +-
 pom.xml                                            |   35 +-
 1154 files changed, 6036 insertions(+), 40613 deletions(-)
----------------------------------------------------------------------