You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by an...@apache.org on 2013/06/25 00:43:11 UTC
[1/7] MARMOTTA-261 : Remove sesame-tools-rio-jsonld
Updated Branches:
refs/heads/develop 230aea8a9 -> 467d70557
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0017.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0017.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0017.jsonld
deleted file mode 100644
index 7e39ca8..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0017.jsonld
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@id": "a/b",
- "@type": "http://www.w3.org/2000/01/rdf-schema#Resource"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0017.sparql
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0017.sparql b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0017.sparql
deleted file mode 100644
index 10ea9d2..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0017.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
-
-ASK WHERE {
- <http://json-ld.org/test-suite/tests/a/b> a rdfs:Resource
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0018.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0018.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0018.jsonld
deleted file mode 100644
index 64ee0c9..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0018.jsonld
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@id": "#frag",
- "@type": "http://www.w3.org/2000/01/rdf-schema#Resource"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0018.sparql
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0018.sparql b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0018.sparql
deleted file mode 100644
index 316d105..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0018.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
-
-ASK WHERE {
- <http://json-ld.org/test-suite/tests/rdf-0018.jsonld#frag> a rdfs:Resource
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0019.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0019.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0019.jsonld
deleted file mode 100644
index 0e0e3e3..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0019.jsonld
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "@context": {
- "foaf": "http://xmlns.com/foaf/0.1/",
- "knows": {"@id": "http://xmlns.com/foaf/0.1/knows", "@type": "@id"}
- },
- "@id": "http://greggkellogg.net/foaf#me",
- "knows": "http://manu.sporny.org/#me"
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0019.sparql
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0019.sparql b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0019.sparql
deleted file mode 100644
index 4943c00..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0019.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-
-ASK WHERE {
- <http://greggkellogg.net/foaf#me> foaf:knows <http://manu.sporny.org/#me> .
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0020.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0020.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0020.jsonld
deleted file mode 100644
index 804b2fc..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0020.jsonld
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "@context": {
- "xsd": "http://www.w3.org/2001/XMLSchema#",
- "created": {"@id": "http://purl.org/dc/terms/created", "@type": "xsd:date"}
- },
- "@id": "http://greggkellogg.net/foaf#me",
- "created": "1957-02-27"
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0020.sparql
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0020.sparql b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0020.sparql
deleted file mode 100644
index 0fc1f0f..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0020.sparql
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX dcterms: <http://purl.org/dc/terms/>
-PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
-
-ASK WHERE {
- <http://greggkellogg.net/foaf#me> dcterms:created "1957-02-27"^^xsd:date
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0021.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0021.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0021.jsonld
deleted file mode 100644
index fdf8e8d..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0021.jsonld
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@context": { "measure": "http://example/measure#"},
- "measure:cups": 5.3
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0021.sparql
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0021.sparql b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0021.sparql
deleted file mode 100644
index 25d6a15..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0021.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
-
-ASK WHERE {
- _:a <http://example/measure#cups> "5.3"^^xsd:double
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0022.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0022.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0022.jsonld
deleted file mode 100644
index 061de81..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0022.jsonld
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@context": { "measure": "http://example/measure#"},
- "measure:cups": 5.3e0
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0022.sparql
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0022.sparql b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0022.sparql
deleted file mode 100644
index 25d6a15..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0022.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
-
-ASK WHERE {
- _:a <http://example/measure#cups> "5.3"^^xsd:double
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0023.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0023.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0023.jsonld
deleted file mode 100644
index be26079..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0023.jsonld
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@context": { "chem": "http://example/chem#"},
- "chem:protons": 12
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0023.sparql
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0023.sparql b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0023.sparql
deleted file mode 100644
index de5e17b..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0023.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
-
-ASK WHERE {
- _:a <http://example/chem#protons> "12"^^xsd:integer
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0024.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0024.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0024.jsonld
deleted file mode 100644
index 777318a..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0024.jsonld
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@context": { "sensor": "http://example/sensor#"},
- "sensor:active": true
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0024.sparql
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0024.sparql b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0024.sparql
deleted file mode 100644
index 6f5547a..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0024.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
-
-ASK WHERE {
- _:a <http://example/sensor#active> "true"^^xsd:boolean
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0025.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0025.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0025.jsonld
deleted file mode 100644
index 55f40e3..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0025.jsonld
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "@context": {
- "knows": {"@id": "http://xmlns.com/foaf/0.1/knows", "@list": true}
- },
- "@id": "http://greggkellogg.net/foaf#me",
- "knows": ["Manu Sporny"]
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0025.sparql
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0025.sparql b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0025.sparql
deleted file mode 100644
index 92cde3e..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0025.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-
-ASK WHERE {
- <http://greggkellogg.net/foaf#me> foaf:knows ("Manu Sporny") .
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0026.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0026.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0026.jsonld
deleted file mode 100644
index bb3ba6a..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0026.jsonld
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@context": {"rdfs": "http://www.w3.org/2000/01/rdf-schema#"},
- "@type": ["rdfs:Resource", "rdfs:Class"]
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0026.sparql
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0026.sparql b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0026.sparql
deleted file mode 100644
index e175ca3..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0026.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
-
-ASK WHERE {
- [a rdfs:Resource, rdfs:Class]
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-manifest.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-manifest.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-manifest.jsonld
deleted file mode 100644
index 00e0cb0..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-manifest.jsonld
+++ /dev/null
@@ -1,166 +0,0 @@
-{
- "@context": "http://json-ld.org/test-suite/context.jsonld",
- "@id": "",
- "@type": "jld:Manifest",
- "rdfs:comment": "JSON-LD to RDF tests use SPARQL queries to determine results",
- "name": "rdf",
- "sequence": [
- {
- "@type": ["test:TestCase", "jld:RDFTest"],
- "input": "rdf-0001.jsonld",
- "name": "Plain literal with URIs",
- "purpose": "Tests generation of a triple using full URIs and a plain literal.",
- "sparql": "rdf-0001.sparql"
- }, {
- "@type": ["test:TestCase", "jld:RDFTest"],
- "input": "rdf-0002.jsonld",
- "name": "Plain literal with CURIE from default context",
- "purpose": "Tests generation of a triple using a CURIE defined in the default context.",
- "sparql": "rdf-0002.sparql"
- }, {
- "@type": ["test:TestCase", "jld:RDFTest"],
- "input": "rdf-0003.jsonld",
- "name": "Default subject is BNode",
- "purpose": "Tests that a BNode is created if no explicit subject is set.",
- "sparql": "rdf-0003.sparql"
- }, {
- "@type": ["test:TestCase", "jld:RDFTest"],
- "input": "rdf-0004.jsonld",
- "name": "Literal with language tag",
- "purpose": "Tests that a plain literal is created with a language tag.",
- "sparql": "rdf-0004.sparql"
- }, {
- "@type": ["test:TestCase", "jld:RDFTest"],
- "input": "rdf-0005.jsonld",
- "name": "Extended character set literal",
- "purpose": "Tests that a literal may be created using extended characters.",
- "sparql": "rdf-0005.sparql"
- }, {
- "@type": ["test:TestCase", "jld:RDFTest"],
- "input": "rdf-0006.jsonld",
- "name": "Typed literal",
- "purpose": "Tests creation of a literal with a datatype.",
- "sparql": "rdf-0006.sparql"
- }, {
- "@type": ["test:TestCase", "jld:RDFTest"],
- "input": "rdf-0007.jsonld",
- "name": "Tests 'a' generates rdf:type and object is implicit IRI",
- "purpose": "Verify that 'a' is an alias for rdf:type, and the object is created as an IRI.",
- "sparql": "rdf-0007.sparql"
- }, {
- "@type": ["test:TestCase", "jld:RDFTest"],
- "input": "rdf-0008.jsonld",
- "name": "Test prefix defined in @context",
- "purpose": "Generate an IRI using a prefix defined within an @context.",
- "sparql": "rdf-0008.sparql"
- }, {
- "@type": ["test:TestCase", "jld:RDFTest"],
- "input": "rdf-0009.jsonld",
- "name": "Test using default prefix",
- "purpose": "The empty string may be used to define the default prefix.",
- "sparql": "rdf-0009.sparql"
- }, {
- "@type": ["test:TestCase", "jld:RDFTest"],
- "input": "rdf-0010.jsonld",
- "name": "Test object processing defines object",
- "purpose": "A property referencing an associative array gets object from subject of array.",
- "sparql": "rdf-0010.sparql"
- }, {
- "@type": ["test:TestCase", "jld:RDFTest"],
- "input": "rdf-0011.jsonld",
- "name": "Test object processing defines object with implicit BNode",
- "purpose": "If no @ is specified, a BNode is created, and will be used as the object of an enclosing property.",
- "sparql": "rdf-0011.sparql"
- }, {
- "@type": ["test:TestCase", "jld:RDFTest"],
- "input": "rdf-0012.jsonld",
- "name": "Multiple Objects for a Single Property",
- "purpose": "Tests that Multiple Objects are for a Single Property using array syntax.",
- "sparql": "rdf-0012.sparql"
- }, {
- "@type": ["test:TestCase", "jld:RDFTest"],
- "input": "rdf-0013.jsonld",
- "name": "Creation of an empty list",
- "purpose": "Tests that [[]] generates an empty list.",
- "sparql": "rdf-0013.sparql"
- }, {
- "@type": ["test:TestCase", "jld:RDFTest"],
- "input": "rdf-0014.jsonld",
- "name": "Creation of a list with single element",
- "purpose": "Tests that [[a]] generates list.",
- "sparql": "rdf-0014.sparql"
- }, {
- "@type": ["test:TestCase", "jld:RDFTest"],
- "input": "rdf-0015.jsonld",
- "name": "Creation of a list with multiple elements",
- "purpose": "Tests that list with multiple elements.",
- "sparql": "rdf-0015.sparql"
- }, {
- "@type": ["test:TestCase", "jld:RDFTest"],
- "input": "rdf-0016.jsonld",
- "name": "Empty IRI expands to resource location",
- "purpose": "Expanding an empty IRI uses the test file location.",
- "sparql": "rdf-0016.sparql"
- }, {
- "@type": ["test:TestCase", "jld:RDFTest"],
- "input": "rdf-0017.jsonld",
- "name": "Relative IRI expands relative resource location",
- "purpose": "Expanding a relative IRI uses the test file location.",
- "sparql": "rdf-0017.sparql"
- }, {
- "@type": ["test:TestCase", "jld:RDFTest"],
- "input": "rdf-0018.jsonld",
- "name": "Frag ID expands relative resource location",
- "purpose": "Expanding a fragment uses the test file location.",
- "sparql": "rdf-0018.sparql"
- }, {
- "@type": ["test:TestCase", "jld:RDFTest"],
- "input": "rdf-0019.jsonld",
- "name": "Test type coercion to anyURI",
- "purpose": "Tests coercion of object to anyURI when specified.",
- "sparql": "rdf-0019.sparql"
- }, {
- "@type": ["test:TestCase", "jld:RDFTest"],
- "input": "rdf-0020.jsonld",
- "name": "Test type coercion to typed literal",
- "purpose": "Tests coercion of object to a typed literal when specified.",
- "sparql": "rdf-0020.sparql"
- }, {
- "@type": ["test:TestCase", "jld:RDFTest"],
- "input": "rdf-0021.jsonld",
- "name": "Test coercion of decimal value to double",
- "purpose": "Tests that a decimal value generates a xsd:double typed literal.",
- "sparql": "rdf-0021.sparql"
- }, {
- "@type": ["test:TestCase", "jld:RDFTest"],
- "input": "rdf-0022.jsonld",
- "name": "Test coercion of double value",
- "purpose": "Tests that a decimal value generates a xsd:double typed literal;.",
- "sparql": "rdf-0022.sparql"
- }, {
- "@type": ["test:TestCase", "jld:RDFTest"],
- "input": "rdf-0023.jsonld",
- "name": "Test coercion of integer value",
- "purpose": "Tests that a decimal value generates a xsd:integer typed literal.",
- "sparql": "rdf-0023.sparql"
- }, {
- "@type": ["test:TestCase", "jld:RDFTest"],
- "input": "rdf-0024.jsonld",
- "name": "Test coercion of boolean value",
- "purpose": "Tests that a decimal value generates a xsd:boolean typed literal.",
- "sparql": "rdf-0024.sparql"
- }, {
- "@type": ["test:TestCase", "jld:RDFTest"],
- "input": "rdf-0025.jsonld",
- "name": "Test list coercion with single element",
- "purpose": "Tests that an array with a single element on a property with @list coercion creates an RDF Collection.",
- "sparql": "rdf-0025.sparql"
- }, {
- "@type": ["test:TestCase", "jld:RDFTest"],
- "input": "rdf-0026.jsonld",
- "name": "Test creation of multiple types",
- "purpose": "Tests that @type with an array of types creates multiple types.",
- "sparql": "rdf-0026.sparql"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/simplify-0001-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/simplify-0001-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/simplify-0001-in.jsonld
deleted file mode 100644
index a99e5e4..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/simplify-0001-in.jsonld
+++ /dev/null
@@ -1,44 +0,0 @@
-{
- "rdfs:label" : "string1024",
- "@context" : {
- "void" : "http://rdfs.org/ns/void#",
- "dtype" : "http://www.linkedmodel.org/schema/dtype#",
- "ontology" : "http://omv.ontoware.org/2005/05/ontology#",
- "dimension" : "http://qudt.org/schema/dimension#",
- "owl1" : "http://www.w3.org/2002/07/owl#",
- "creativecommons1" : "http://creativecommons.org/ns#",
- "qudt-quantity" : "http://qudt.org/vocab/quantity#",
- "voag1" : "http://voag.linkedmodel.org/schema/voag#",
- "qudt" : "http://qudt.org/schema/qudt#",
- "xsd1" : "http://www.w3.org/2001/XMLSchema#",
- "vaem1" : "http://www.linkedmodel.org/schema/vaem#",
- "unit1" : "http://qudt.org/vocab/unit#",
- "skos" : "http://www.w3.org/2004/02/skos/core#",
- "qudt-dimension1" : "http://qudt.org/vocab/dimension#",
- "rdfs" : "http://www.w3.org/2000/01/rdf-schema#",
- "rdf" : "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
- "dc1" : "http://purl.org/dc/elements/1.1/",
- "quantity1" : "http://qudt.org/schema/quantity#"
- },
- "owl1:equivalentClass" : {
- "owl1:onDatatype" : {
- "@id" : "xsd1:string"
- },
- "owl1:withRestrictions" : {
- "@list" : [
- {
- "xsd1:maxLength" : {
- "@value" : "1024",
- "@type" : "xsd1:nonNegativeInteger"
- }
- }
- ]
- },
- "@type" : "rdfs:Datatype"
- },
- "@id" : "http://qudt.org/schema/qudt#string1024",
- "rdfs:subClassOf" : {
- "@id" : "xsd1:string"
- },
- "@type" : "rdfs:Datatype"
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/simplify-0001-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/simplify-0001-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/simplify-0001-out.jsonld
deleted file mode 100644
index 8cb158b..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/simplify-0001-out.jsonld
+++ /dev/null
@@ -1,37 +0,0 @@
-{
- "@context" : {
- "qudt" : "http://qudt.org/schema/qudt#",
- "onDatatype" : {
- "@id" : "http://www.w3.org/2002/07/owl#onDatatype",
- "@type" : "@id"
- },
- "xsd1" : "http://www.w3.org/2001/XMLSchema#",
- "rdfs" : "http://www.w3.org/2000/01/rdf-schema#",
- "maxLength" : "http://www.w3.org/2001/XMLSchema#maxLength",
- "equivalentClass" : "http://www.w3.org/2002/07/owl#equivalentClass",
- "withRestrictions" : "http://www.w3.org/2002/07/owl#withRestrictions",
- "label" : "http://www.w3.org/2000/01/rdf-schema#label",
- "subClassOf" : {
- "@id" : "http://www.w3.org/2000/01/rdf-schema#subClassOf",
- "@type" : "@id"
- }
- },
- "equivalentClass" : {
- "onDatatype" : "xsd1:string",
- "withRestrictions" : {
- "@list" : [
- {
- "maxLength" : {
- "@value" : "1024",
- "@type" : "http://www.w3.org/2001/XMLSchema#nonNegativeInteger"
- }
- }
- ]
- },
- "@type" : "rdfs:Datatype"
- },
- "@id" : "qudt:string1024",
- "label" : "string1024",
- "@type" : "rdfs:Datatype",
- "subClassOf" : "xsd1:string"
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/simplify-manifest.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/simplify-manifest.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/simplify-manifest.jsonld
deleted file mode 100644
index 4f7d4a7..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/simplify-manifest.jsonld
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "@context": "http://json-ld.org/test-suite/context.jsonld",
- "@id": "",
- "@type": "jld:Manifest",
- "rdfs:comment": "JSON-LD to Simplify tests use object compare",
- "name": "simplify",
- "sequence": [{
- "@type": ["test:TestCase", "jld:SimplifyTest"],
- "name": "nested objects of the same type",
- "input": "simplify-0001-in.jsonld",
- "expect": "simplify-0001-out.jsonld"
- }]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/libraries/ldclient/ldclient-provider-rdf/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-rdf/pom.xml b/libraries/ldclient/ldclient-provider-rdf/pom.xml
index 3f81d0b..5241bbe 100644
--- a/libraries/ldclient/ldclient-provider-rdf/pom.xml
+++ b/libraries/ldclient/ldclient-provider-rdf/pom.xml
@@ -56,8 +56,8 @@
<artifactId>sesame-rio-n3</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>sesame-tools-rio-jsonld</artifactId>
+ <groupId>com.github.jsonld-java</groupId>
+ <artifactId>jsonld-java-sesame</artifactId>
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b133e54..503f0e7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1180,11 +1180,6 @@
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
- <artifactId>sesame-tools-rio-jsonld</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.marmotta</groupId>
<artifactId>sesame-tools-facading</artifactId>
<version>${project.version}</version>
</dependency>
@@ -1213,9 +1208,9 @@
<version>0.0.8</version>
</dependency>
<dependency>
- <groupId>dfki.km.json</groupId>
- <artifactId>jsonld-java</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <groupId>com.github.jsonld-java</groupId>
+ <artifactId>jsonld-java-sesame</artifactId>
+ <version>0.2</version>
</dependency>
<!-- Freemarker -->
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/platform/marmotta-core/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/pom.xml b/platform/marmotta-core/pom.xml
index 5344b84..b5412e7 100644
--- a/platform/marmotta-core/pom.xml
+++ b/platform/marmotta-core/pom.xml
@@ -518,8 +518,8 @@
<artifactId>sesame-tools-rio-rss</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>sesame-tools-rio-jsonld</artifactId>
+ <groupId>com.github.jsonld-java</groupId>
+ <artifactId>jsonld-java-sesame</artifactId>
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
[5/7] MARMOTTA-261 : Remove sesame-tools-rio-jsonld
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/ext/java/de/dfki/km/json/jsonld/JSONLDUtils.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/ext/java/de/dfki/km/json/jsonld/JSONLDUtils.java b/commons/sesame-tools-rio-jsonld/src/ext/java/de/dfki/km/json/jsonld/JSONLDUtils.java
deleted file mode 100644
index 8e67644..0000000
--- a/commons/sesame-tools-rio-jsonld/src/ext/java/de/dfki/km/json/jsonld/JSONLDUtils.java
+++ /dev/null
@@ -1,855 +0,0 @@
-package de.dfki.km.json.jsonld;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-public class JSONLDUtils {
-
- public static class NameGenerator {
- private String prefix;
- private int count;
-
- public NameGenerator(String prefix) {
- this.prefix = prefix;
- this.count = -1;
- }
-
- public String next() {
- count += 1;
- return current();
- }
-
- public String current() {
- return "_:" + prefix + count;
- }
-
- public boolean inNamespace(String iri) {
- return iri.startsWith("_:" + prefix);
- }
- }
-
- public static Map<String, String> getKeywords(Object ctx) {
- Map<String, String> rval = new HashMap<String, String>();
- rval.put("@id", "@id");
- rval.put("@language", "@language");
- rval.put("@value", "@value");
- rval.put("@type", "@type");
-
- if (ctx != null && ctx instanceof Map) {
- Map<String, String> keywords = new HashMap<String, String>();
- for (String key : ((Map<String, Object>) ctx).keySet()) {
- Object value = ((Map<String, String>) ctx).get(key);
- if (value instanceof String && rval.containsKey(value)) {
- keywords.put((String) value, key);
- }
- }
-
- rval.putAll(keywords);
- }
- return rval;
- }
-
- public static String getTermIri(Object ctx, String term) {
- String rval = null;
-
- if (((Map<String, Object>) ctx).containsKey(term)) {
- Object t = ((Map<String, Object>) ctx).get(term);
- if (t instanceof String) {
- rval = (String) t;
- } else if (t instanceof Map && ((Map<String, Object>) t).containsKey("@id")) {
- rval = (String) ((Map<String, Object>) t).get("@id");
- }
- }
-
- return rval;
- }
-
- public static Map<String, Object> mergeContexts(Object ctxOne, Object ctxTwo) {
-
- Map<String, Object> ctx1;
- Map<String, Object> ctx2;
-
- if (ctxOne instanceof List) {
- ctx1 = mergeContexts(new HashMap<String, Object>(), ctxOne);
- } else {
- ctx1 = (Map<String, Object>) ctxOne;
- }
-
- Map<String, Object> merged = (Map<String, Object>) clone(ctx1);
-
- if (ctxTwo instanceof List) {
- for (Object i : (List<Object>) ctxTwo) {
- merged = mergeContexts(merged, i);
- }
- } else {
- ctx2 = (Map<String, Object>) ctxTwo;
-
- for (String key : ctx2.keySet()) {
- if (!key.startsWith("@")) {
- for (String mkey : merged.keySet()) {
- if (merged.get(mkey).equals(ctx2.get(key))) {
- // FIXME: update related @coerce rules
- merged.remove(mkey);
- break;
- }
- }
- }
- }
-
- // merge contexts
- for (String key : ctx2.keySet()) {
- merged.put(key, ctx2.get(key));
- }
- }
- return merged;
- }
-
- @Deprecated
- // TODO: it may make sense to keep this function, as usedCtx can be null
- public static String compactIRI(Map<String, Object> ctx, String iri) {
- return compactIRI(ctx, iri, null);
- }
-
- public static String compactIRI(Map<String, Object> ctx, String iri, Map<String, Object> usedCtx) {
- String rval = null;
-
- for (String key : ctx.keySet()) {
- if (!key.startsWith("@")) {
- if (iri.equals(getTermIri(ctx, key))) {
- // compact to a term
- rval = key;
- if (usedCtx != null) {
- usedCtx.put(key, clone(ctx.get(key)));
- }
- break;
- }
- }
- }
-
- // term not found, if term is keyword, use alias
- if (rval == null) {
- Map<String, String> keywords = getKeywords(ctx);
- if (keywords.containsKey(iri)) {
- rval = keywords.get(iri);
- if (!rval.equals(iri) && usedCtx != null) {
- usedCtx.put(rval, iri);
- }
- }
- }
-
- if (rval == null) {
- // rval still not found, check the context for a CURIE prefix
- for (String key : ctx.keySet()) {
- if (!key.startsWith("@")) {
- String ctxIRI = getTermIri(ctx, key);
-
- if (ctxIRI != null) {
- if (iri.startsWith(ctxIRI) && iri.length() > ctxIRI.length()) {
- rval = key + ":" + iri.substring(ctxIRI.length());
- if (usedCtx != null) {
- usedCtx.put(key, clone(ctx.get(key)));
- }
- break;
- }
- }
- }
- }
- }
-
- if (rval == null) {
- // could not compact IRI
- rval = iri;
- }
-
- return rval;
- }
-
- @Deprecated
- // TODO: dep'd for backwards compatibility, but perhaps it's a valid
- // function as usedCtx can be null
- public static String getCoercionType(Map<String, Object> ctx, String property) {
- return getCoercionType(ctx, property, new HashMap<String, Object>());
- }
-
- public static String getCoercionType(Map<String, Object> ctx, String property, Map<String, Object> usedCtx) {
- String rval = null;
-
- // get expanded property
- String p = expandTerm(ctx, property, null);
-
- // built-in type coercion JSON-LD-isms
- if ("@id".equals(p) || "@type".equals(p)) {
- rval = "@id";
- } else {
- p = compactIRI(ctx, p, null);// , null);
-
- if (ctx.containsKey(p) && ctx.get(p) instanceof Map && ((Map<String, String>) ctx.get(p)).containsKey("@type")) {
- String type = ((Map<String, String>) ctx.get(p)).get("@type");
- rval = expandTerm(ctx, type, usedCtx);
- if (usedCtx != null) {
- usedCtx.put(p, clone(ctx.get(p)));
- }
- }
-
- }
-
- return rval;
- }
-
- @Deprecated
- // TODO: remove depreciated
- public static String expandTerm(Map<String, Object> ctx, String term) {
- return expandTerm(ctx, term, null);
- }
-
- public static String expandTerm(Map<String, Object> ctx, String term, Map<String, Object> usedCtx) {
- Map<String, String> keywords = getKeywords(ctx);
- String rval = term;
-
- // 1. If the property has a colon, it has a prefix or an absolute IRI:
- int idx = term.indexOf(":");
- if (idx != -1) {
- String prefix = term.substring(0, idx);
-
- // 1.1 See if the prefix is in the context:
- if (ctx.containsKey(prefix)) {
- String iri = getTermIri(ctx, prefix);
- rval = iri + term.substring(idx + 1);
- if (usedCtx != null) {
- usedCtx.put(prefix, clone(ctx.get(prefix)));
- }
- }
- } else if (ctx.containsKey(term)) {
- // 2. If the property is in the context, then it's a term.
- rval = getTermIri(ctx, term); // TODO: assuming string
- if (usedCtx != null) {
- usedCtx.put(term, clone(ctx.get(term)));
- }
- } else {
- // 3. The property is a keyword.
- for (String k : keywords.keySet()) {
- String v = keywords.get(k);
- if (v.equals(term)) {
- rval = k;
- break;
- }
- }
-
- }
-
- if (!term.equals(rval)) {
- //recurse
- return expandTerm(ctx, rval, usedCtx);
- } else {
- return rval;
- }
- }
-
- public static boolean isReference(Object value) {
- return (value != null && value instanceof Map && ((Map<String, Object>) value).containsKey("@id") && ((Map<String, Object>) value).size() == 1);
- }
-
- public static boolean isSubject(Object value) {
- boolean rval = false;
- if (value != null && value instanceof Map && !((Map<String, Object>) value).containsKey("@value")) {
- rval = ((Map<String, Object>) value).size() > 1 || !((Map<String, Object>) value).containsKey("@id");
- }
- return rval;
- }
-
- public static boolean isBlankNode(Object v) {
- return isSubject(v) && (!((Map<String, Object>) v).containsKey("@id") || isNamedBlankNode(v));
- }
-
- public static boolean isNamedBlankNode(Object v) {
- return v instanceof Map && ((Map<String, Object>) v).containsKey("@id") && isBlankNodeIri(((Map<String, Object>) v).get("@id"));
- }
-
- public static boolean isBlankNodeIri(Object input) {
- return input instanceof String && ((String) input).startsWith("_:");
- }
-
- public static Object clone(Object value) {// throws
- // CloneNotSupportedException {
- Object rval = null;
- if (value instanceof Cloneable) {
- try {
- rval = value.getClass().getMethod("clone").invoke(value);
- } catch (Exception e) {
- rval = e;
- }
- }
- if (rval == null || rval instanceof Exception) {
- // the object wasn't cloneable, or an error occured
- if (value instanceof String || value instanceof Number || value instanceof Boolean) {
- // strings numbers and booleans are immutable
- rval = value;
- } else {
- // TODO: making this throw runtime exception so it doesn't have
- // to be caught
- // because simply it should never fail in the case of JSON-LD
- // and means that
- // the input JSON-LD is invalid
- throw new RuntimeException(new CloneNotSupportedException((rval instanceof Exception ? ((Exception) rval).getMessage() : "")));
- }
- }
- return rval;
- }
-
- public static int compare(Object v1, Object v2) {
- int rval = 0;
-
- // TODO: not sure if we should allow this, but as long as the tests pass it "should" be ok.
- if (v1 == null && v2 == null) {
- return 0;
- }
-
- if (v1 instanceof List && v2 instanceof List) {
- if (((List) v1).size() != ((List) v2).size()) {
- rval = 1;
- } else {
- // TODO: should the order of things in the list matter?
- for (int i = 0; i < ((List<Object>) v1).size() && rval == 0; i++) {
- rval = compare(((List<Object>) v1).get(i), ((List<Object>) v2).get(i));
- }
- }
- } else if (v1 instanceof Number && v2 instanceof Number) {
- // TODO: this is VERY sketchy
- double n1 = ((Number) v1).doubleValue();
- double n2 = ((Number) v2).doubleValue();
-
- rval = (n1 < n2 ? -1 : (n1 > n2 ? 1 : 0));
- } else if (v1 instanceof String && v2 instanceof String) {
- rval = ((String) v1).compareTo((String) v2);
- if (rval > 1)
- rval = 1;
- else if (rval < -1)
- rval = -1;
- } else if (v1 instanceof Map && v2 instanceof Map) {
- throw new RuntimeException("I don't know how I should handle this case yet!");
- /*
- * TODO: not sure what to do here exactly...
- *
- * python can compare objects using the < and > operators. js pretends it can (i.e. it doesn't throw an error) but always returns false. thus the js
- * code and the py code are inconsistant.
- *
- * // TODO: this assumes the order of keys doesn't matter if (((Map) v1).size() != ((Map) v2).size() ) { rval = 1; } else { if (((Map) v1).size() !=
- * ((Map) v2).size()) { rval = 1; } else { for (Object k1: ((Map) v1).keySet()) { rval = ((Map) v2).containsKey(k1) ? compare(((Map) v1).get(k1),
- * ((Map) v2).get(k1)) : 1; if (rval != 0) { break; } } } } } else if (v1 instanceof Boolean && v2 instanceof Boolean) { //rval = (v1 == v2 ? 0 :
- * 1);
- */
- } else {
- // TODO: this is probably something I don't want to allow either
- throw new RuntimeException("compare unspecified for these objects");
- // rval = (v1.equals(v2) ? 0 : 1);
- }
- return rval;
- }
-
- public static int compareBlankNodeObjects(Map<String, Object> a, Map<String, Object> b) {
- int rval = 0;
-
- // the keys tend to come up unsorted, so try the following lines if this
- // causes trouble
- // List<String> akeys = new ArrayList<String>();
- // akeys.addAll(a.keySet());
- // Collections.sort(akeys);
-
- for (String p : a.keySet()) {
-
- if (!p.equals("@id")) { // TODO: this should ignore "ignoreKeyword" keywords as well
- int lenA = (a.get(p) instanceof List ? ((List<Object>) a.get(p)).size() : 1);
- int lenB = (b.get(p) instanceof List ? ((List<Object>) b.get(p)).size() : 1);
- rval = compare(lenA, lenB);
-
- if (rval == 0) {
- List<Object> objsA;
- List<Object> objsB;
-
- if (a.get(p) instanceof List) {
- objsA = (List<Object>) clone((List<Object>) a.get(p));
- objsB = (List<Object>) clone((List<Object>) b.get(p));
- } else {
- objsA = new ArrayList<Object>();
- objsA.add(a.get(p));
- objsB = new ArrayList<Object>();
- objsB.add(b.get(p));
- }
-
- for (int i = 0; i < objsA.size(); i++) {
- Object e = objsA.get(i);
- if (isNamedBlankNode(e)) {
- objsA.remove(i);
- --i;
- }
- }
- for (int i = 0; i < objsB.size(); i++) {
- Object e = objsB.get(i);
- if (isNamedBlankNode(e)) {
- objsB.remove(i);
- --i;
- }
- }
-
- rval = compare(objsA.size(), objsB.size());
-
- if (rval == 0) {
- Collections.sort(objsA, new Comparator<Object>() {
- public int compare(Object o1, Object o2) {
- return compareObjects(o1, o2);
- }
- });
- Collections.sort(objsB, new Comparator<Object>() {
- public int compare(Object o1, Object o2) {
- return compareObjects(o1, o2);
- }
- });
- for (int i = 0; i < objsA.size() && rval == 0; ++i) {
- rval = compareObjects(objsA.get(i), objsB.get(i));
- if (rval != 0) {
- break;
- }
- }
- }
- }
- if (rval != 0) {
- break;
- }
- }
- }
-
- return rval;
- }
-
- public static int compareObjects(Object o1, Object o2) {
- int rval = 0;
- if (o1 instanceof String) {
- if (o2 instanceof String) {
- rval = compare(o1, o2);
- } else {
- rval = -1;
- }
- } else if (o2 instanceof String) {
- rval = 1;
- } else if (o1 instanceof Map) {
- rval = compareObjectKeys(o1, o2, "@value");
- if (rval == 0) {
- if (((Map) o1).containsKey("@value")) {
- rval = compareObjectKeys(o1, o2, "@type");
- if (rval == 0) {
- rval = compareObjectKeys(o1, o2, "@language");
- }
- } else {
- rval = compare(((Map<String, Object>) o1).get("@id"), ((Map<String, Object>) o2).get("@id"));
- }
- }
-
- }
- return rval;
- }
-
- private static int compareObjectKeys(Object o1, Object o2, String key) {
- int rval = 0;
- if (((Map<String, Object>) o1).containsKey(key)) {
- if (((Map<String, Object>) o2).containsKey(key)) {
- rval = compare(((Map<String, Object>) o1).get(key), ((Map<String, Object>) o2).get(key));
- } else {
- rval = -1;
- }
- } else if (((Map<String, Object>) o2).containsKey(key)) {
- rval = 1;
- }
- return rval;
- }
-
- public static void rotate(List<Object> a) {
- if (a.size() > 0) {
- Object tmp = a.remove(0);
- a.add(tmp);
- }
- }
-
- public static int compareSerializations(String s1, String s2) {
- int rval = 0;
- if (s1.length() == s2.length()) {
- rval = compare(s1, s2);
- } else if (s1.length() > s2.length()) {
- rval = compare(s1.substring(0, s2.length()), s2);
- } else {
- rval = compare(s1, s2.substring(0, s1.length()));
- }
-
- return rval;
- }
-
- public static String serializeProperties(Map<String, Object> b) {
- String rval = "";
-
- Boolean first = true;
- for (String p : b.keySet()) {
- if (!"@id".equals(p)) {
- if (first) {
- first = false;
- } else {
- rval += "|";
- }
-
- rval += "<" + p + ">";
-
- List<Object> objs = null;
- if (b.get(p) instanceof List) {
- objs = (List<Object>) b.get(p);
- } else {
- objs = new ArrayList<Object>();
- objs.add(b.get(p));
- }
-
- for (Object o : objs) {
- if (o instanceof Map) {
- if (((Map) o).containsKey("@id")) { // iri
- if (isBlankNodeIri(((Map<String, Object>) o).get("@id"))) {
- rval += "_:";
- } else {
- rval += "<" + ((Map<String, Object>) o).get("@id") + ">";
- }
- } else { // literal
- rval += "\"" + ((Map<String, Object>) o).get("@value") + "\"";
- if (((Map<String, Object>) o).containsKey("@type")) {
- rval += "^^<" + ((Map<String, Object>) o).get("@type") + ">";
- } else if (((Map<String, Object>) o).containsKey("@language")) {
- rval += "@" + ((Map<String, Object>) o).get("@language");
- }
- }
- } else {
- rval += "\"" + o + "\"";
- }
- }
- }
- }
-
- return rval;
- }
-
- public static void setProperty(Map<String, Object> s, String p, Object o) {
- if (s.containsKey(p)) {
- if (s.get(p) instanceof List) {
- ((List<Object>) s.get(p)).add(o);
- } else {
- List<Object> tmp = new ArrayList<Object>();
- tmp.add(s.get(p));
- tmp.add(o);
- s.put(p, tmp);
- }
- } else {
- s.put(p, o);
- }
- }
-
- /**
- * Recursively frames the given input according to the given frame.
- *
- * @param subjects
- * a map of subjects in the graph.
- * @param input
- * the input to frame.
- * @param frame
- * the frame to use.
- * @param embeds
- * a map of previously embedded subjects, used to prevent cycles.
- * @param autoembed
- * true if auto-embed is on, false if not.
- * @param parent
- * the parent object (for subframing).
- * @param parentKey
- * the parent key (for subframing).
- * @param options
- * the framing options.
- * @return the framed input.
- */
- public static Object frame(Map subjects, List input, Object frame, HashMap embeds, boolean autoembed, Object parent, String parentKey, Map options) {
- Object rval = null;
-
- int limit = -1;
- List frames = null;
-
- if (frame instanceof List) {
- rval = new ArrayList();
- frames = (List) frame;
- if (frames.isEmpty()) {
- frames.add(new HashMap());
- }
- } else {
- frames = new ArrayList();
- frames.add(frame);
- limit = 1;
- }
-
- boolean omitOn = false;
- if (options != null) {
- if (options.containsKey("defaults")) {
- Map defopts = (Map) options.get("defaults");
- if (defopts.containsKey("omitDefaultOn")) {
- omitOn = (Boolean) defopts.get("omitDefaultOn");
- }
- }
- }
-
- List<List> values = new ArrayList<List>();
- for (Object f : frames) {
- if (!(f instanceof List || f instanceof Map)) {
- throw new RuntimeException("Invalid JSON - LD frame. Frame type is not a map or array.");
- }
- List vali = new ArrayList();
- for (Object n : input) {
- if (n instanceof Map && ((Map) n).containsKey("@id") && subjects.containsKey(((Map) n).get("@id"))) {
- n = subjects.get(((Map) n).get("@id"));
- }
-
- if (JSONLDUtils.isType(n, (Map) f) || JSONLDUtils.isDuckType(n, (Map) f)) {
- vali.add(n);
- limit -= 1;
- if (limit == 0) {
- break;
- }
- }
- }
- values.add(vali);
- if (limit == 0) {
- break;
- }
- }
-
- for (int i = 0; i < frames.size(); i++) {
- Object f = frames.get(i);
- List v = values.get(i);
-
- for (Object value : v) {
- if (JSONLDUtils.isSubject(value)) {
- value = subframe(subjects, (Map) value, (Map) f, embeds, autoembed, parent, parentKey, options);
- }
-
- if (rval == null) {
- rval = value;
- } else {
- if (!((JSONLDUtils.isReference(value) && embeds.containsKey(((Map) value).get("@id"))) && parent == null)) {
- ((List) rval).add(value);
- }
- }
- }
- }
-
- return rval;
- }
-
- /**
- * Subframes a value.
- *
- * @param subjects
- * a map of subjects in the graph.
- * @param value
- * the value to subframe.
- * @param frame
- * the frame to use.
- * @param embeds
- * a map of previously embedded subjects, used to prevent cycles.
- * @param autoembed
- * true if auto-embed is on, false if not.
- * @param parent
- * the parent object.
- * @param parentKey
- * the parent key.
- * @param options
- * the framing options.
- * @return the framed input.
- */
- private static Object subframe(Map subjects, Map value, Map frame, HashMap embeds, boolean autoembed, Object parent, String parentKey, Map options) {
- String iri = (String) value.get("@id");
- Map embed = (Map) embeds.get(iri);
-
- boolean embedOn = (((frame.containsKey("@embed") && (Boolean) frame.get("@embed")) || (!frame.containsKey("@embed") && (Boolean) ((Map) options
- .get("defaults")).get("embedOn"))) && (embed == null || ((Boolean) embed.get("autoembed") && !autoembed)));
-
- if (!embedOn) {
- Map tmp = new HashMap();
- tmp.put("@id", value.get("@id"));
- return tmp;
- } else {
- if (embed == null) {
- embed = new HashMap();
- embeds.put(iri, embed);
- } else if (embed.get("parent") != null) {
- Object objs = ((Map) embed.get("parent")).get(embed.get("key"));
- if (objs instanceof List) {
- for (int i = 0; i < ((List) objs).size(); i++) {
- Object oi = ((List) objs).get(i);
- if (oi instanceof Map && ((Map) oi).containsKey("@id") && ((Map) oi).get("@id").equals(iri)) {
- Map tmp = new HashMap();
- tmp.put("@id", value.get("id"));
- ((List) objs).set(i, tmp);
- break;
- }
- }
- } else {
- Map tmp = new HashMap();
- tmp.put("@id", value.get("@id"));
- ((Map) embed.get("parent")).put(embed.get("key"), tmp);
- }
-
- removeDependentEmbeds(iri, embeds);
- }
-
- embed.put("autoembed", autoembed);
- embed.put("parent", parent);
- embed.put("key", parentKey);
-
- boolean explicitOn = (frame.containsKey("@explicit") ? (Boolean) frame.get("@explicit") : (Boolean) ((Map) options.get("defaults"))
- .get("explicitOn"));
-
- if (explicitOn) {
- for (String key : new HashSet<String>((Set<String>) value.keySet())) {
- if (!"@id".equals(key) && !frame.containsKey(key)) {
- value.remove(key);
- }
- }
- }
-
- for (String key : (Set<String>) value.keySet()) {
- Object v = value.get(key);
- if (!key.startsWith("@")) {
- Object f = frame.get(key);
- boolean _autoembed = (f == null);
- if (_autoembed) {
- f = value.get(key) instanceof List ? new ArrayList() : new HashMap();
- }
- List input = null;
- if (value.get(key) instanceof List) {
- input = (List) value.get(key);
- } else {
- List tmp = new ArrayList();
- tmp.add(value.get(key));
- input = tmp;
- }
- for (int n = 0; n < input.size(); n++) {
- Object in = input.get(n);
- if (in instanceof Map && ((Map) in).containsKey("@id") && subjects.containsKey(((Map) in).get("@id"))) {
- input.set(n, subjects.get(((Map) in).get("@id")));
- }
- }
- value.put(key, frame(subjects, input, f, embeds, _autoembed, value, key, options));
- }
- }
-
- for (String key : (Set<String>) frame.keySet()) {
- Object f = frame.get(key);
- if (!key.startsWith("@") && (!value.containsKey(key) || value.get(key) == null)) {
- if (f instanceof List) {
- value.put(key, new ArrayList());
- } else {
- // TODO: jsonld.js and pyld.js have a block here that will never be reached
- // because they can only run if the previous if was true
-
- boolean omitOn = ((Map) f).containsKey("@omitDefault") ? (Boolean) ((Map) f).get("@omitDefault") : (Boolean) ((Map) options
- .get("defaults")).get("omitDefaultOn");
-
- if (!omitOn) {
- if (((Map) f).containsKey("@default")) {
- value.put(key, ((Map) f).get("@default"));
- } else {
- value.put(key, null);
- }
- }
- }
- }
- }
- }
- return value;
- }
-
- private static void removeDependentEmbeds(String iri, Map embeds) {
- Set<String> iris = new HashSet(embeds.keySet());
- for (String i : iris) {
- if (embeds.containsKey(i) && ((Map) embeds.get(i)).get("parent") != null && iri.equals(((Map) ((Map) embeds.get(i)).get("parent")).get("@id"))) {
- embeds.remove(i);
- removeDependentEmbeds(i, embeds);
- }
- }
- }
-
- /**
- * Returns True if the given src matches the given frame via duck-typing.
- *
- * @param src
- * the input.
- * @param frame
- * the frame to check against.
- * @return True if the src matches the frame.
- */
- private static boolean isDuckType(Object src, Map frame) {
- String rType = "@type";
- if (!frame.containsKey(rType)) {
- Set<String> props1 = frame.keySet();
- Set<String> props = new HashSet<String>();
- for (String p : props1) {
- if (!p.startsWith("@")) {
- props.add(p);
- }
- }
- if (props.isEmpty()) {
- return true;
- }
- if (src instanceof Map && ((Map) src).containsKey("@id")) {
- for (String i : props) {
- if (!((Map) src).containsKey(i)) {
- return false;
- }
- }
- return true;
- }
- }
- return false;
- }
-
- /**
- * Returns True if the given source is a subject and has one of the given types in the given frame.
- *
- * @param src
- * the input.
- * @param frame
- * the frame with types to look for.
- * @return True if the src has one of the given types.
- */
- private static boolean isType(Object src, Map frame) {
- String rType = "@type";
- if (frame.containsKey(rType) && src instanceof Map && ((Map) src).containsKey(rType)) {
- List tmp = null;
- if (((Map) src).get(rType) instanceof List) {
- tmp = (List) ((Map) src).get(rType);
- } else {
- tmp = new ArrayList();
- tmp.add(((Map) src).get(rType));
- }
- List types = null;
- if (frame.get(rType) instanceof List) {
- types = (List) frame.get(rType);
- } else {
- types = new ArrayList();
- types.add(frame.get(rType));
- }
-
- for (Object typ : types) {
- for (Object i : tmp) {
- if (i.equals(typ)) {
- return true;
- }
- }
- }
- }
- return false;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/ext/java/de/dfki/km/json/jsonld/impl/SesameJSONLDSerializer.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/ext/java/de/dfki/km/json/jsonld/impl/SesameJSONLDSerializer.java b/commons/sesame-tools-rio-jsonld/src/ext/java/de/dfki/km/json/jsonld/impl/SesameJSONLDSerializer.java
deleted file mode 100644
index 7301de8..0000000
--- a/commons/sesame-tools-rio-jsonld/src/ext/java/de/dfki/km/json/jsonld/impl/SesameJSONLDSerializer.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package de.dfki.km.json.jsonld.impl;
-
-import java.util.Iterator;
-
-import org.openrdf.model.Graph;
-import org.openrdf.model.Literal;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class SesameJSONLDSerializer extends de.dfki.km.json.jsonld.JSONLDSerializer {
- private static final Logger LOG = LoggerFactory.getLogger(SesameJSONLDSerializer.class);
-
- public void importGraph(Graph model, Resource... contexts) {
- Iterator<Statement> statements = model.match(null, null, null, contexts);
- while (statements.hasNext()) {
- handleStatement(statements.next());
- }
- }
-
- public void handleStatement(Statement nextStatement) {
- Resource subject = nextStatement.getSubject();
- URI predicate = nextStatement.getPredicate();
- Value object = nextStatement.getObject();
-
- if (object instanceof Literal) {
- Literal literal = (Literal) object;
- String value = literal.getLabel();
- URI datatypeURI = literal.getDatatype();
- String language = literal.getLanguage();
-
- String datatype;
-
- if (datatypeURI == null) {
- datatype = null;
- } else {
- datatype = datatypeURI.stringValue();
- }
-
- triple(subject.stringValue(), predicate.stringValue(), value, datatype, language);
- } else {
- triple(subject.stringValue(), predicate.stringValue(), object.stringValue());
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/ext/java/de/dfki/km/json/jsonld/impl/SesameTripleCallback.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/ext/java/de/dfki/km/json/jsonld/impl/SesameTripleCallback.java b/commons/sesame-tools-rio-jsonld/src/ext/java/de/dfki/km/json/jsonld/impl/SesameTripleCallback.java
deleted file mode 100644
index 4d1a3c7..0000000
--- a/commons/sesame-tools-rio-jsonld/src/ext/java/de/dfki/km/json/jsonld/impl/SesameTripleCallback.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package de.dfki.km.json.jsonld.impl;
-
-import org.openrdf.model.Graph;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.impl.GraphImpl;
-
-import de.dfki.km.json.jsonld.JSONLDTripleCallback;
-
-public class SesameTripleCallback implements JSONLDTripleCallback {
-
- private ValueFactory vf;
-
- private Graph storageGraph;
-
- public SesameTripleCallback() {
- this(new GraphImpl());
- }
-
- public SesameTripleCallback(Graph nextGraph) {
- setStorageGraph(nextGraph);
- }
-
- @Override
- public void triple(String s, String p, String o) {
- if (s == null || p == null || o == null) {
- // TODO: i don't know what to do here!!!!
- return;
- }
-
- // This method is always called with three URIs as subject predicate and
- // object
- Statement result = vf.createStatement(vf.createURI(s), vf.createURI(p), vf.createURI(o));
- storageGraph.add(result);
- }
-
- @Override
- public void triple(String s, String p, String value, String datatype, String language) {
-
- if (s == null || p == null || value == null) {
- // TODO: i don't know what to do here!!!!
- return;
- }
-
- URI subject = vf.createURI(s);
-
- URI predicate = vf.createURI(p);
-
- Value object;
- if (language != null) {
- object = vf.createLiteral(value, language);
- } else if (datatype != null) {
- object = vf.createLiteral(value, vf.createURI(datatype));
- } else {
- object = vf.createLiteral(value);
- }
-
- Statement result = vf.createStatement(subject, predicate, object);
- storageGraph.add(result);
- }
-
- /**
- * @return the storageGraph
- */
- public Graph getStorageGraph() {
- return storageGraph;
- }
-
- /**
- * @param storageGraph
- * the storageGraph to set
- */
- public void setStorageGraph(Graph storageGraph) {
- this.storageGraph = storageGraph;
-
- if (storageGraph != null) {
- vf = storageGraph.getValueFactory();
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/main/java/org/apache/marmotta/commons/sesame/rio/jsonld/JsonLdParser.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/main/java/org/apache/marmotta/commons/sesame/rio/jsonld/JsonLdParser.java b/commons/sesame-tools-rio-jsonld/src/main/java/org/apache/marmotta/commons/sesame/rio/jsonld/JsonLdParser.java
deleted file mode 100644
index bf47ea3..0000000
--- a/commons/sesame-tools-rio-jsonld/src/main/java/org/apache/marmotta/commons/sesame/rio/jsonld/JsonLdParser.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.marmotta.commons.sesame.rio.jsonld;
-
-import com.google.common.base.Preconditions;
-import de.dfki.km.json.jsonld.JSONLDProcessor;
-import de.dfki.km.json.jsonld.JSONLDTripleCallback;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
-import org.openrdf.OpenRDFException;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.rio.RDFParseException;
-import org.openrdf.rio.helpers.RDFParserBase;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.util.Map;
-
-/**
- * Add file description here!
- * <p/>
- * Author: Sebastian Schaffert
- */
-public class JsonLdParser extends RDFParserBase implements JSONLDTripleCallback {
-
- private static Logger log = LoggerFactory.getLogger(JsonLdParser.class);
-
- JSONLDProcessor processor;
-
- /**
- * Creates a new RDFParserBase that will use a {@link org.openrdf.model.impl.ValueFactoryImpl} to
- * create RDF model objects.
- */
- public JsonLdParser() {
- processor = new JSONLDProcessor();
- }
-
- /**
- * Creates a new RDFParserBase that will use the supplied ValueFactory to
- * create RDF model objects.
- *
- * @param valueFactory A ValueFactory.
- */
- public JsonLdParser(ValueFactory valueFactory) {
- super(valueFactory);
- processor = new JSONLDProcessor();
- }
-
- /**
- * Gets the RDF format that this parser can parse.
- */
- @Override
- public RDFFormat getRDFFormat() {
- return RDFFormat.JSONLD;
- }
-
- /**
- * Parses the data from the supplied InputStream, using the supplied baseURI
- * to resolve any relative URI references.
- *
- * @param in The InputStream from which to read the data.
- * @param baseURI The URI associated with the data in the InputStream.
- * @throws java.io.IOException If an I/O error occurred while data was read from the InputStream.
- * @throws org.openrdf.rio.RDFParseException
- * If the parser has found an unrecoverable parse error.
- * @throws org.openrdf.rio.RDFHandlerException
- * If the configured statement handler has encountered an
- * unrecoverable error.
- */
- @Override
- public void parse(InputStream in, String baseURI) throws IOException, RDFParseException, RDFHandlerException {
- if(baseURI != null)
- setBaseURI(baseURI);
-
- ObjectMapper mapper = new ObjectMapper();
- Map<String,Object> object = mapper.readValue(in,new TypeReference<Map<String,Object>>() {});
-
- try {
- processor.triples(object,this);
- } catch(IllegalArgumentException ex) {
- if(ex.getCause() instanceof RDFParseException)
- throw (RDFParseException)ex.getCause();
- else {
- throw new IllegalArgumentException(ex);
- }
- }
- }
-
- /**
- * Parses the data from the supplied Reader, using the supplied baseURI to
- * resolve any relative URI references.
- *
- * @param reader The Reader from which to read the data.
- * @param baseURI The URI associated with the data in the InputStream.
- * @throws java.io.IOException If an I/O error occurred while data was read from the InputStream.
- * @throws org.openrdf.rio.RDFParseException
- * If the parser has found an unrecoverable parse error.
- * @throws org.openrdf.rio.RDFHandlerException
- * If the configured statement handler has encountered an
- * unrecoverable error.
- */
- @Override
- public void parse(Reader reader, String baseURI) throws IOException, RDFParseException, RDFHandlerException {
- if(baseURI != null)
- setBaseURI(baseURI);
-
- ObjectMapper mapper = new ObjectMapper();
- Map<String,Object> object = mapper.readValue(reader,new TypeReference<Map<String,Object>>() {});
-
- try {
- processor.triples(object,this);
- } catch(IllegalArgumentException ex) {
- if(ex.getCause() instanceof RDFParseException)
- throw (RDFParseException)ex.getCause();
- else {
- throw new IllegalArgumentException(ex);
- }
- }
- }
-
-
- /**
- * Construct a triple with three URIs.
- *
- * @param s The Subject URI
- * @param p The Predicate URI
- * @param o The Object URI
- * @return The generated triple, or null to force triple generation to stop
- */
- @Override
- public void triple(String s, String p, String o) {
- // This method is always called with three URIs as subject predicate and
- // object
- try {
- rdfHandler.handleStatement(createStatement(resolveURI(s), resolveURI(p), resolveURI(o)));
- } catch (OpenRDFException e) {
- log.error("RDF Parse Error while creating statement",e);
- throw new IllegalArgumentException("RDF Parse Error while creating statement",e);
- }
- }
-
- /**
- * Constructs a triple with a Literal object, which may or may not contain a
- * language and/or a datatype.
- *
- * @param s The Subject URI
- * @param p The Predicate URI
- * @param value The literal value
- * @param datatype The literal datatype
- * @param language The literal language (NOTE: may be null if not specified!)
- * @return The generated triple, or null to force triple generation to stop
- */
- @Override
- public void triple(String s, String p, String value, String datatype, String language) {
- Preconditions.checkNotNull(s);
- Preconditions.checkNotNull(p);
- Preconditions.checkNotNull(value);
-
- try {
- URI subject = createURI(s);
-
- URI predicate = createURI(p);
-
- Value object;
- if (language != null) {
- object = createLiteral(value, language, null);
- } else if (datatype != null) {
- object = createLiteral(value, null, createURI(datatype));
- } else {
- object = createLiteral(value, null, null);
- }
-
- rdfHandler.handleStatement(createStatement(subject, predicate, object));
-
- } catch (OpenRDFException e) {
- log.error("RDF Parse Error while creating statement",e);
- throw new IllegalArgumentException("RDF Parse Error while creating statement",e);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/main/java/org/apache/marmotta/commons/sesame/rio/jsonld/JsonLdParserFactory.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/main/java/org/apache/marmotta/commons/sesame/rio/jsonld/JsonLdParserFactory.java b/commons/sesame-tools-rio-jsonld/src/main/java/org/apache/marmotta/commons/sesame/rio/jsonld/JsonLdParserFactory.java
deleted file mode 100644
index 30f453f..0000000
--- a/commons/sesame-tools-rio-jsonld/src/main/java/org/apache/marmotta/commons/sesame/rio/jsonld/JsonLdParserFactory.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.marmotta.commons.sesame.rio.jsonld;
-
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFParser;
-import org.openrdf.rio.RDFParserFactory;
-
-/**
- * Add file description here!
- * <p/>
- * Author: Sebastian Schaffert
- */
-public class JsonLdParserFactory implements RDFParserFactory {
-
- /**
- * Returns the RDF format for this factory.
- */
- @Override
- public RDFFormat getRDFFormat() {
- return RDFFormat.JSONLD;
- }
-
- /**
- * Returns a RDFParser instance.
- */
- @Override
- public RDFParser getParser() {
- return new JsonLdParser();
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/main/java/org/apache/marmotta/commons/sesame/rio/jsonld/JsonLdWriter.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/main/java/org/apache/marmotta/commons/sesame/rio/jsonld/JsonLdWriter.java b/commons/sesame-tools-rio-jsonld/src/main/java/org/apache/marmotta/commons/sesame/rio/jsonld/JsonLdWriter.java
deleted file mode 100644
index f6d13ad..0000000
--- a/commons/sesame-tools-rio-jsonld/src/main/java/org/apache/marmotta/commons/sesame/rio/jsonld/JsonLdWriter.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.marmotta.commons.sesame.rio.jsonld;
-
-import de.dfki.km.json.jsonld.impl.SesameJSONLDSerializer;
-import org.openrdf.model.Statement;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.rio.RDFWriter;
-import org.openrdf.rio.RioSetting;
-import org.openrdf.rio.WriterConfig;
-
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Collection;
-
-/**
- * JSON-LD RIO Writer
- *
- * @author Sebastian Schaffert
- * @author Sergio Fernández
- */
-public class JsonLdWriter implements RDFWriter {
-
- private PrintWriter writer;
- private WriterConfig config;
-
- SesameJSONLDSerializer serializer;
-
- public JsonLdWriter(OutputStream out) {
- writer = new PrintWriter(new OutputStreamWriter(out));
- serializer = new SesameJSONLDSerializer();
- }
-
-
- public JsonLdWriter(Writer writer) {
- this.writer = new PrintWriter(writer);
- serializer = new SesameJSONLDSerializer();
- }
-
-
- /**
- * Gets the RDF format that this RDFWriter uses.
- */
- @Override
- public RDFFormat getRDFFormat() {
- return RDFFormat.JSONLD;
- }
-
- /**
- * Signals the start of the RDF data. This method is called before any data
- * is reported.
- *
- * @throws org.openrdf.rio.RDFHandlerException
- * If the RDF handler has encountered an unrecoverable error.
- */
- @Override
- public void startRDF() throws RDFHandlerException {
- }
-
- /**
- * Signals the end of the RDF data. This method is called when all data has
- * been reported.
- *
- * @throws org.openrdf.rio.RDFHandlerException
- * If the RDF handler has encountered an unrecoverable error.
- */
- @Override
- public void endRDF() throws RDFHandlerException {
- writer.print(serializer.asString());
- writer.flush();
- }
-
- /**
- * Handles a namespace declaration/definition. A namespace declaration
- * associates a (short) prefix string with the namespace's URI. The prefix
- * for default namespaces, which do not have an associated prefix, are
- * represented as empty strings.
- *
- * @param prefix The prefix for the namespace, or an empty string in case of a
- * default namespace.
- * @param uri The URI that the prefix maps to.
- * @throws org.openrdf.rio.RDFHandlerException
- * If the RDF handler has encountered an unrecoverable error.
- */
- @Override
- public void handleNamespace(String prefix, String uri) throws RDFHandlerException {
- serializer.setPrefix(uri,prefix);
- }
-
- /**
- * Handles a statement.
- *
- * @param st The statement.
- * @throws org.openrdf.rio.RDFHandlerException
- * If the RDF handler has encountered an unrecoverable error.
- */
- @Override
- public void handleStatement(Statement st) throws RDFHandlerException {
- serializer.handleStatement(st);
- }
-
- /**
- * Handles a comment.
- *
- * @param comment The comment.
- * @throws org.openrdf.rio.RDFHandlerException
- * If the RDF handler has encountered an unrecoverable error.
- */
- @Override
- public void handleComment(String comment) throws RDFHandlerException {
-
- }
-
- /**
- * @return A collection of {@link RioSetting}s that are supported by this
- * RDFWriter.
- * @since 2.7.0
- */
- @Override
- public Collection<RioSetting<?>> getSupportedSettings() {
- return new ArrayList<RioSetting<?>>();
- }
-
- /**
- * Retrieves the current writer configuration as a single object.
- *
- * @return a writer configuration object representing the current
- * configuration of the writer.
- * @since 2.7.0
- */
- @Override
- public WriterConfig getWriterConfig() {
- return config;
- }
-
- /**
- * Sets all supplied writer configuration options.
- *
- * @param config
- * a writer configuration object.
- * @since 2.7.0
- */
- @Override
- public void setWriterConfig(WriterConfig config) {
- this.config = config;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/main/java/org/apache/marmotta/commons/sesame/rio/jsonld/JsonLdWriterFactory.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/main/java/org/apache/marmotta/commons/sesame/rio/jsonld/JsonLdWriterFactory.java b/commons/sesame-tools-rio-jsonld/src/main/java/org/apache/marmotta/commons/sesame/rio/jsonld/JsonLdWriterFactory.java
deleted file mode 100644
index 959b2e3..0000000
--- a/commons/sesame-tools-rio-jsonld/src/main/java/org/apache/marmotta/commons/sesame/rio/jsonld/JsonLdWriterFactory.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.marmotta.commons.sesame.rio.jsonld;
-
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFWriter;
-import org.openrdf.rio.RDFWriterFactory;
-
-import java.io.OutputStream;
-import java.io.Writer;
-
-/**
- * Add file description here!
- * <p/>
- * Author: Sebastian Schaffert
- */
-public class JsonLdWriterFactory implements RDFWriterFactory {
-
- /**
- * Returns the RDF format for this factory.
- */
- @Override
- public RDFFormat getRDFFormat() {
- return RDFFormat.JSONLD;
- }
-
- /**
- * Returns an RDFWriter instance that will write to the supplied output
- * stream.
- *
- * @param out The OutputStream to write the RDF to.
- */
- @Override
- public RDFWriter getWriter(OutputStream out) {
- return new JsonLdWriter(out);
- }
-
- /**
- * Returns an RDFWriter instance that will write to the supplied writer.
- *
- * @param writer The Writer to write the RDF to.
- */
- @Override
- public RDFWriter getWriter(Writer writer) {
- return new JsonLdWriter(writer);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/main/resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/main/resources/META-INF/LICENSE b/commons/sesame-tools-rio-jsonld/src/main/resources/META-INF/LICENSE
deleted file mode 100644
index e21dc40..0000000
--- a/commons/sesame-tools-rio-jsonld/src/main/resources/META-INF/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-
-This library bundles the JSON-LD java library, which is available under a
-"New BSD" license. For details, see https://github.com/tristan/jsonld-java.
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/main/resources/META-INF/NOTICE b/commons/sesame-tools-rio-jsonld/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 3de9434..0000000
--- a/commons/sesame-tools-rio-jsonld/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,9 +0,0 @@
-Apache Marmotta JSON-LD
-Copyright 2012-2013 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-Additionally, it includes the following 3rd party modules:
-
- jsonld-java licensed under the New BSD License
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/main/resources/META-INF/services/org.openrdf.rio.RDFParserFactory
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/main/resources/META-INF/services/org.openrdf.rio.RDFParserFactory b/commons/sesame-tools-rio-jsonld/src/main/resources/META-INF/services/org.openrdf.rio.RDFParserFactory
deleted file mode 100644
index 7864661..0000000
--- a/commons/sesame-tools-rio-jsonld/src/main/resources/META-INF/services/org.openrdf.rio.RDFParserFactory
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.marmotta.commons.sesame.rio.jsonld.JsonLdParserFactory
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/main/resources/META-INF/services/org.openrdf.rio.RDFWriterFactory
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/main/resources/META-INF/services/org.openrdf.rio.RDFWriterFactory b/commons/sesame-tools-rio-jsonld/src/main/resources/META-INF/services/org.openrdf.rio.RDFWriterFactory
deleted file mode 100644
index 72b825d..0000000
--- a/commons/sesame-tools-rio-jsonld/src/main/resources/META-INF/services/org.openrdf.rio.RDFWriterFactory
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.marmotta.commons.sesame.rio.jsonld.JsonLdWriterFactory
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/java/org/apache/marmotta/commons/sesame/rio/jsonld/TestJSONLdParser.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/java/org/apache/marmotta/commons/sesame/rio/jsonld/TestJSONLdParser.java b/commons/sesame-tools-rio-jsonld/src/test/java/org/apache/marmotta/commons/sesame/rio/jsonld/TestJSONLdParser.java
deleted file mode 100644
index 01c46b3..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/java/org/apache/marmotta/commons/sesame/rio/jsonld/TestJSONLdParser.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.marmotta.commons.sesame.rio.jsonld;
-/*
- * Copyright (c) 2013 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.apache.commons.io.IOUtils;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.openrdf.query.BooleanQuery;
-import org.openrdf.query.QueryLanguage;
-import org.openrdf.repository.Repository;
-import org.openrdf.repository.RepositoryConnection;
-import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.sail.memory.MemoryStore;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-
-import static java.util.Arrays.asList;
-import static org.hamcrest.CoreMatchers.everyItem;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeThat;
-
-/**
- * Add file description here!
- * <p/>
- * Author: Sebastian Schaffert
- */
-@RunWith(Parameterized.class)
-public class TestJSONLdParser {
-
- private static Logger log = LoggerFactory.getLogger(TestJSONLdParser.class);
-
- private String fileName;
-
- public TestJSONLdParser(String fileName) {
- this.fileName = fileName;
- }
-
- // return the list of rdf-NNNN.jsonld files
- @Parameterized.Parameters(name = "{0}")
- public static Collection<Object[]> data() {
- int[] skip = new int[] {1,2,8,9,10,11,12,14,15,16,17,18,21,22,25};
- ArrayList<Object[]> list = new ArrayList<Object[]>();
- for(int i=1; i<=26; i++) {
- if(Arrays.binarySearch(skip,i) == -1) {
- list.add(new Object[] {"rdf-"+String.format("%04d",i)});
- }
- }
- return list;
- }
-
-
- @Test
- public void runTest() throws Exception {
- log.info("running test {} ...", fileName);
-
- InputStream jsonLD = this.getClass().getResourceAsStream(fileName+".jsonld");
- InputStream sparql = this.getClass().getResourceAsStream(fileName+".sparql");
- assumeThat("Could not load testfiles", asList(jsonLD, sparql), everyItem(notNullValue(InputStream.class)));
-
- Repository repository = new SailRepository(new MemoryStore());
- repository.initialize();
-
- RepositoryConnection connection = repository.getConnection();
- try {
- connection.add(jsonLD,"http://localhost/jsonld/", RDFFormat.JSONLD);
- connection.commit();
- } catch(Exception ex) {
- fail("parsing "+fileName+" failed!");
- }
- assertTrue(connection.size() > 0);
-
- int count = connection.getStatements(null, null, null, false).asList().size();
- assertTrue(count > 0);
-
- BooleanQuery sparqlQuery = (BooleanQuery)connection.prepareQuery(QueryLanguage.SPARQL, IOUtils.toString(sparql));
- assertTrue("SPARQL query evaluation for "+fileName+" failed",sparqlQuery.evaluate());
-
- connection.close();
- repository.shutDown();
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/logback.xml b/commons/sesame-tools-rio-jsonld/src/test/resources/logback.xml
deleted file mode 100644
index 1bfecff..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/logback.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<configuration>
- <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
- </encoder>
- </appender>
- <root level="${root-level:-INFO}">
- <appender-ref ref="CONSOLE"/>
- </root>
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0001-context.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0001-context.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0001-context.jsonld
deleted file mode 100644
index 8eddd02..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0001-context.jsonld
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "@context": {
- "dc": "http://purl.org/dc/elements/1.1/",
- "ex": "http://example.org/vocab#",
- "ex:authored": {
- "@type": "@id"
- },
- "ex:contains": {
- "@type": "@id"
- },
- "foaf": "http://xmlns.com/foaf/0.1/"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0001-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0001-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0001-in.jsonld
deleted file mode 100644
index bb26e1a..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0001-in.jsonld
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "@id": [
- {
- "@id": "http://example.org/test#chapter",
- "http://purl.org/dc/elements/1.1/description": "Fun",
- "http://purl.org/dc/elements/1.1/title": "Chapter One"
- },
- {
- "@id": "http://example.org/test#jane",
- "http://example.org/vocab#authored": "http://example.org/test#chapter",
- "http://xmlns.com/foaf/0.1/name": "Jane"
- },
- {
- "@id": "http://example.org/test#john",
- "http://xmlns.com/foaf/0.1/name": "John"
- },
- {
- "@id": "http://example.org/test#library",
- "http://example.org/vocab#contains": {
- "@id": "http://example.org/test#book",
- "http://example.org/vocab#contains": "http://example.org/test#chapter",
- "http://purl.org/dc/elements/1.1/contributor": "Writer",
- "http://purl.org/dc/elements/1.1/title": "My Book"
- }
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0001-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0001-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0001-out.jsonld
deleted file mode 100644
index 678a298..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0001-out.jsonld
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "@context": {
- "dc": "http://purl.org/dc/elements/1.1/",
- "ex": "http://example.org/vocab#",
- "ex:authored": {
- "@type": "@id"
- },
- "ex:contains": {
- "@type": "@id"
- },
- "foaf": "http://xmlns.com/foaf/0.1/"
- },
- "@id": [
- {
- "@id": "http://example.org/test#chapter",
- "dc:description": "Fun",
- "dc:title": "Chapter One"
- },
- {
- "@id": "http://example.org/test#jane",
- "ex:authored": "http://example.org/test#chapter",
- "foaf:name": "Jane"
- },
- {
- "@id": "http://example.org/test#john",
- "foaf:name": "John"
- },
- {
- "@id": "http://example.org/test#library",
- "ex:contains": {
- "@id": "http://example.org/test#book",
- "dc:contributor": "Writer",
- "dc:title": "My Book",
- "ex:contains": "http://example.org/test#chapter"
- }
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0002-context.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0002-context.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0002-context.jsonld
deleted file mode 100644
index 4ad288e..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0002-context.jsonld
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "@context": {
- "dc": "http://purl.org/dc/terms/",
- "ex": "http://example.org/test#"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0002-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0002-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0002-in.jsonld
deleted file mode 100644
index 580e172..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0002-in.jsonld
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@id": "http://example.org/test#thing",
- "http://purl.org/dc/terms/title": "Title"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0002-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0002-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0002-out.jsonld
deleted file mode 100644
index 79117e9..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0002-out.jsonld
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "@context": {
- "dc": "http://purl.org/dc/terms/",
- "ex": "http://example.org/test#"
- },
- "@id": "ex:thing",
- "dc:title": "Title"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0003-context.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0003-context.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0003-context.jsonld
deleted file mode 100644
index 58040b8..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0003-context.jsonld
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "@context": {
- "dc": "http://purl.org/dc/elements/1.1/",
- "ex": "http://example.org/vocab#",
- "ex:contains": {
- "@type": "@id"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0003-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0003-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0003-in.jsonld
deleted file mode 100644
index 9b70fba..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0003-in.jsonld
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "@id": "http://example.org/test#book",
- "http://example.org/vocab#contains": {
- "@id": "http://example.org/test#chapter"
- },
- "http://purl.org/dc/elements/1.1/title": "Title"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0003-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0003-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0003-out.jsonld
deleted file mode 100644
index d0c0e7e..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0003-out.jsonld
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "@context": {
- "dc": "http://purl.org/dc/elements/1.1/",
- "ex": "http://example.org/vocab#",
- "ex:contains": {
- "@type": "@id"
- }
- },
- "@id": "http://example.org/test#book",
- "dc:title": "Title",
- "ex:contains": "http://example.org/test#chapter"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0004-context.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0004-context.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0004-context.jsonld
deleted file mode 100644
index 81b7978..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0004-context.jsonld
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/test#",
- "ex:int": {
- "@type": "xsd:integer"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- }
-}
\ No newline at end of file
[3/7] MARMOTTA-261 : Remove sesame-tools-rio-jsonld
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0012-frame.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0012-frame.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0012-frame.jsonld
deleted file mode 100644
index 2159726..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0012-frame.jsonld
+++ /dev/null
@@ -1,11 +0,0 @@
-[
- {
- "@context": {
- "sp": "http://smartplatforms.org/terms#"
- },
- "@type": "http://smartplatforms.org/terms#Medication"
- },
- {
- "@type": "http://smartplatforms.org/terms#Fulfillment"
- }
-]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0012-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0012-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0012-in.jsonld
deleted file mode 100644
index d06cec5..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0012-in.jsonld
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "@id": [
- {
- "@id": "http://example.org/med-1",
- "@type": "http://smartplatforms.org/terms#Medication",
- "http://smartplatforms.org/terms#hasFulfillment": {
- "@id": "http://example.org/fill-1"
- },
- "http://smartplatforms.org/terms#label": "Lisinopril"
- },
- {
- "@id": "http://example.org/fill-1",
- "@type": "http://smartplatforms.org/terms#Fulfillment",
- "http://smartplatforms.org/terms#hasMedication": {
- "@id": "http://example.org/med-1"
- },
- "http://smartplatforms.org/terms#label": "30 pills on 2/2/2011"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0012-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0012-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0012-out.jsonld
deleted file mode 100644
index 920dfca..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0012-out.jsonld
+++ /dev/null
@@ -1,24 +0,0 @@
-[
- {
- "@context": {
- "sp": "http://smartplatforms.org/terms#"
- },
- "@id": "http://example.org/med-1",
- "@type": "sp:Medication",
- "sp:hasFulfillment": {
- "@id": "http://example.org/fill-1"
- },
- "sp:label": "Lisinopril"
- },
- {
- "@context": {
- "sp": "http://smartplatforms.org/terms#"
- },
- "@id": "http://example.org/fill-1",
- "@type": "sp:Fulfillment",
- "sp:hasMedication": {
- "@id": "http://example.org/med-1"
- },
- "sp:label": "30 pills on 2/2/2011"
- }
-]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0013-frame.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0013-frame.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0013-frame.jsonld
deleted file mode 100644
index 0637a08..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0013-frame.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0013-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0013-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0013-in.jsonld
deleted file mode 100644
index e95cc1b..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0013-in.jsonld
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "@id": [
- {
- "@id": "looker",
- "canSee": [
- {
- "@id": "forgotten"
- },
- {
- "@id": "spotted"
- }
- ]
- },
- {
- "@id": "spotted"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0013-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0013-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0013-out.jsonld
deleted file mode 100644
index c58f9cb..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0013-out.jsonld
+++ /dev/null
@@ -1,19 +0,0 @@
-[
- {
- "@id": "forgotten"
- },
- {
- "@id": "looker",
- "canSee": [
- {
- "@id": "forgotten"
- },
- {
- "@id": "spotted"
- }
- ]
- },
- {
- "@id": "spotted"
- }
-]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0014-frame.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0014-frame.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0014-frame.jsonld
deleted file mode 100644
index a8b5073..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0014-frame.jsonld
+++ /dev/null
@@ -1,7 +0,0 @@
-[
- {
- "@type": [
- "Node"
- ]
- }
-]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0014-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0014-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0014-in.jsonld
deleted file mode 100644
index 86fb3bc..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0014-in.jsonld
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "@id": "a",
- "@type": "Node",
- "sees": {
- "@id": "b",
- "@type": "Node",
- "sees": {
- "remember_me": "This value should not disappear."
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0014-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0014-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0014-out.jsonld
deleted file mode 100644
index ed0b011..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0014-out.jsonld
+++ /dev/null
@@ -1,17 +0,0 @@
-[
- {
- "@id": "a",
- "@type": "Node",
- "sees": {
- "@id": "b"
- }
- },
- {
- "@id": "b",
- "@type": "Node",
- "sees": {
- "@id": "_:c14n0",
- "remember_me": "This value should not disappear."
- }
- }
-]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0015-frame.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0015-frame.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0015-frame.jsonld
deleted file mode 100644
index bfe8672..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0015-frame.jsonld
+++ /dev/null
@@ -1,227 +0,0 @@
-[
- {
- "@context": {
- "api": "http://smartplatforms.org/terms/api#",
- "dcterms": "http://purl.org/dc/terms/",
- "foaf": "http://xmlns.com/foaf/0.1/",
- "owl": "http://www.w3.org/2002/07/owl#",
- "rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
- "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
- "sp": "http://smartplatforms.org/terms#",
- "sp:abnormalInterpretation": {
- "@type": "@id"
- },
- "sp:address": {
- "@type": "@id"
- },
- "sp:alertLevel": {
- "@type": "@id"
- },
- "sp:allergicReaction": {
- "@type": "@id"
- },
- "sp:allergyExclusionName": {
- "@type": "@id"
- },
- "sp:belongsTo": {
- "@type": "@id"
- },
- "sp:bloodPressure": {
- "@type": "@id"
- },
- "sp:bodyMassIndex": {
- "@type": "@id"
- },
- "sp:bodyPosition": {
- "@type": "@id"
- },
- "sp:bodySite": {
- "@type": "@id"
- },
- "sp:category": {
- "@type": "@id"
- },
- "sp:code": {
- "@type": "@id"
- },
- "sp:created": {
- "@type": "@id"
- },
- "sp:denominator": {
- "@type": "@id"
- },
- "sp:diastolic": {
- "@type": "@id"
- },
- "sp:drugAllergen": {
- "@type": "@id"
- },
- "sp:drugClass": {
- "@type": "@id"
- },
- "sp:drugClassAllergen": {
- "@type": "@id"
- },
- "sp:drugName": {
- "@type": "@id"
- },
- "sp:encounter": {
- "@type": "@id"
- },
- "sp:encounterType": {
- "@type": "@id"
- },
- "sp:facility": {
- "@type": "@id"
- },
- "sp:foodAllergen": {
- "@type": "@id"
- },
- "sp:frequency": {
- "@type": "@id"
- },
- "sp:fulfillment": {
- "@type": "@id"
- },
- "sp:hasStatement": {
- "@type": "@id"
- },
- "sp:heartRate": {
- "@type": "@id"
- },
- "sp:height": {
- "@type": "@id"
- },
- "sp:labName": {
- "@type": "@id"
- },
- "sp:labResult": {
- "@type": "@id"
- },
- "sp:labSpecimenCollected": {
- "@type": "@id"
- },
- "sp:labStatus": {
- "@type": "@id"
- },
- "sp:maximum": {
- "@type": "@id"
- },
- "sp:medicalRecordNumber": {
- "@type": "@id"
- },
- "sp:medication": {
- "@type": "@id"
- },
- "sp:method": {
- "@type": "@id"
- },
- "sp:minimum": {
- "@type": "@id"
- },
- "sp:narrativeResult": {
- "@type": "@id"
- },
- "sp:nominalResult": {
- "@type": "@id"
- },
- "sp:nonCriticalRange": {
- "@type": "@id"
- },
- "sp:normalRange": {
- "@type": "@id"
- },
- "sp:numerator": {
- "@type": "@id"
- },
- "sp:ordinalResult": {
- "@type": "@id"
- },
- "sp:organization": {
- "@type": "@id"
- },
- "sp:oxygenSaturation": {
- "@type": "@id"
- },
- "sp:participant": {
- "@type": "@id"
- },
- "sp:person": {
- "@type": "@id"
- },
- "sp:pharmacy": {
- "@type": "@id"
- },
- "sp:problemName": {
- "@type": "@id"
- },
- "sp:provenance": {
- "@type": "@id"
- },
- "sp:provider": {
- "@type": "@id"
- },
- "sp:quantitativeResult": {
- "@type": "@id"
- },
- "sp:quantity": {
- "@type": "@id"
- },
- "sp:quantityDispensed": {
- "@type": "@id"
- },
- "sp:respiratoryRate": {
- "@type": "@id"
- },
- "sp:severity": {
- "@type": "@id"
- },
- "sp:specimenCollected": {
- "@type": "@id"
- },
- "sp:systolic": {
- "@type": "@id"
- },
- "sp:temperature": {
- "@type": "@id"
- },
- "sp:translationFidelity": {
- "@type": "@id"
- },
- "sp:valueAndUnit": {
- "@type": "@id"
- },
- "sp:vitalName": {
- "@type": "@id"
- },
- "sp:weight": {
- "@type": "@id"
- },
- "spcode": "http://smartplatforms.org/terms/codes/",
- "vcard": "http://www.w3.org/2006/vcard/ns#",
- "vcard:adr": {
- "@type": "@id"
- },
- "vcard:n": {
- "@type": "@id"
- },
- "vcard:tel": {
- "@type": "@id"
- }
- },
- "@type": [
- "http://smartplatforms.org/terms#Statement",
- "http://smartplatforms.org/terms#Fulfillment",
- "http://smartplatforms.org/terms#Alert",
- "http://smartplatforms.org/terms#AllergyExclusion",
- "http://smartplatforms.org/terms#Demographics",
- "http://smartplatforms.org/terms#Problem",
- "http://smartplatforms.org/terms#Medication",
- "http://smartplatforms.org/terms#VitalSigns",
- "http://smartplatforms.org/terms#MedicalRecord",
- "http://smartplatforms.org/terms#LabResult",
- "http://smartplatforms.org/terms#Allergy",
- "http://smartplatforms.org/terms#Encounter"
- ]
- }
-]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0015-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0015-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0015-in.jsonld
deleted file mode 100644
index fce8c8c..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0015-in.jsonld
+++ /dev/null
@@ -1,70 +0,0 @@
-[
- {
- "@id": "http://localhost:7000/records/999888",
- "@type": "http://smartplatforms.org/terms#MedicalRecord"
- },
- {
- "@id": "http://localhost:7000/records/999888",
- "http://smartplatforms.org/terms#hasStatement": {
- "@id": "http://localhost:7000/records/999888/vital_signs/c9ddca3e-3df8-4f13-9a16-eecd80aa8ff6"
- }
- },
- {
- "@id": "_:uDkkVEva509",
- "@type": "http://smartplatforms.org/terms#VitalSign"
- },
- {
- "@id": "_:uDkkVEva509",
- "http://smartplatforms.org/terms#vitalName": {
- "@id": "_:uDkkVEva510"
- }
- },
- {
- "@id": "_:uDkkVEva509",
- "http://smartplatforms.org/terms#value": "111.226458141"
- },
- {
- "@id": "_:uDkkVEva509",
- "http://smartplatforms.org/terms#unit": "mm[Hg]"
- },
- {
- "@id": "_:uDkkVEva508",
- "@type": "http://smartplatforms.org/terms#BloodPressure"
- },
- {
- "@id": "_:uDkkVEva508",
- "http://smartplatforms.org/terms#systolic": {
- "@id": "_:uDkkVEva509"
- }
- },
- {
- "@id": "http://localhost:7000/records/999888/vital_signs/c9ddca3e-3df8-4f13-9a16-eecd80aa8ff6",
- "http://smartplatforms.org/terms#bloodPressure": {
- "@id": "_:uDkkVEva508"
- }
- },
- {
- "@id": "http://localhost:7000/records/999888/vital_signs/c9ddca3e-3df8-4f13-9a16-eecd80aa8ff6",
- "@type": "http://smartplatforms.org/terms#VitalSigns"
- },
- {
- "@id": "http://localhost:7000/records/999888/vital_signs/c9ddca3e-3df8-4f13-9a16-eecd80aa8ff6",
- "http://smartplatforms.org/terms#belongsTo": {
- "@id": "http://localhost:7000/records/999888"
- }
- },
- {
- "@id": "_:uDkkVEva510",
- "http://purl.org/dc/terms/title": "Systolic blood pressure"
- },
- {
- "@id": "_:uDkkVEva510",
- "@type": "http://smartplatforms.org/terms#CodedValue"
- },
- {
- "@id": "_:uDkkVEva510",
- "http://smartplatforms.org/terms#code": {
- "@id": "http://loinc.org/codes/8480-6"
- }
- }
-]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0015-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0015-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0015-out.jsonld
deleted file mode 100644
index 8c433b3..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0015-out.jsonld
+++ /dev/null
@@ -1,44 +0,0 @@
-[
- {
- "@context": {
- "sp": "http://smartplatforms.org/terms#",
- "sp:hasStatement": {
- "@type": "@id"
- }
- },
- "@id": "http://localhost:7000/records/999888",
- "@type": "sp:MedicalRecord",
- "sp:hasStatement": "http://localhost:7000/records/999888/vital_signs/c9ddca3e-3df8-4f13-9a16-eecd80aa8ff6"
- },
- {
- "@context": {
- "dcterms": "http://purl.org/dc/terms/",
- "sp": "http://smartplatforms.org/terms#",
- "sp:belongsTo": {
- "@type": "@id"
- },
- "sp:code": {
- "@type": "@id"
- }
- },
- "@id": "http://localhost:7000/records/999888/vital_signs/c9ddca3e-3df8-4f13-9a16-eecd80aa8ff6",
- "@type": "sp:VitalSigns",
- "sp:belongsTo": "http://localhost:7000/records/999888",
- "sp:bloodPressure": {
- "@id": "_:c14n0",
- "@type": "sp:BloodPressure",
- "sp:systolic": {
- "@id": "_:c14n2",
- "@type": "sp:VitalSign",
- "sp:unit": "mm[Hg]",
- "sp:value": "111.226458141",
- "sp:vitalName": {
- "@id": "_:c14n1",
- "@type": "sp:CodedValue",
- "dcterms:title": "Systolic blood pressure",
- "sp:code": "http://loinc.org/codes/8480-6"
- }
- }
- }
- }
-]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-manifest.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-manifest.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-manifest.jsonld
deleted file mode 100644
index f3567d1..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-manifest.jsonld
+++ /dev/null
@@ -1,98 +0,0 @@
-{
- "@context": "http://json-ld.org/test-suite/context.jsonld",
- "@id": "",
- "@type": "jld:Manifest",
- "rdfs:comment": "JSON-LD to Framing tests use object compare",
- "name": "frame",
- "sequence": [{
- "@type": ["test:TestCase", "jld:FrameTest"],
- "name": "simple",
- "input": "frame-0001-in.jsonld",
- "frame": "frame-0001-frame.jsonld",
- "expect": "frame-0001-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:FrameTest"],
- "name": "reframe w/extra CURIE value",
- "input": "frame-0002-in.jsonld",
- "frame": "frame-0002-frame.jsonld",
- "expect": "frame-0002-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:FrameTest"],
- "name": "reframe (null)",
- "input": "frame-0003-in.jsonld",
- "frame": "frame-0003-frame.jsonld",
- "expect": "frame-0003-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:FrameTest"],
- "name": "reframe (type)",
- "input": "frame-0004-in.jsonld",
- "frame": "frame-0004-frame.jsonld",
- "expect": "frame-0004-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:FrameTest"],
- "name": "reframe (explicit)",
- "input": "frame-0005-in.jsonld",
- "frame": "frame-0005-frame.jsonld",
- "expect": "frame-0005-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:FrameTest"],
- "name": "reframe (non-explicit)",
- "input": "frame-0006-in.jsonld",
- "frame": "frame-0006-frame.jsonld",
- "expect": "frame-0006-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:FrameTest"],
- "name": "input has multiple types",
- "input": "frame-0007-in.jsonld",
- "frame": "frame-0007-frame.jsonld",
- "expect": "frame-0007-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:FrameTest"],
- "name": "array framing cases",
- "input": "frame-0008-in.jsonld",
- "frame": "frame-0008-frame.jsonld",
- "expect": "frame-0008-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:FrameTest"],
- "name": "default value",
- "input": "frame-0009-in.jsonld",
- "frame": "frame-0009-frame.jsonld",
- "expect": "frame-0009-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:FrameTest"],
- "name": "property CURIE conflict",
- "input": "frame-0010-in.jsonld",
- "frame": "frame-0010-frame.jsonld",
- "expect": "frame-0010-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:FrameTest"],
- "name": "@embed",
- "input": "frame-0011-in.jsonld",
- "frame": "frame-0011-frame.jsonld",
- "expect": "frame-0011-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:FrameTest"],
- "name": "Array frame",
- "input": "frame-0012-in.jsonld",
- "frame": "frame-0012-frame.jsonld",
- "expect": "frame-0012-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:FrameTest"],
- "name": "Replace existing embed",
- "input": "frame-0013-in.jsonld",
- "frame": "frame-0013-frame.jsonld",
- "expect": "frame-0013-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:FrameTest"],
- "name": "Replace existing embed on 2nd pass",
- "input": "frame-0014-in.jsonld",
- "frame": "frame-0014-frame.jsonld",
- "expect": "frame-0014-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:FrameTest"],
- "name": "Replace deeply-nested embed",
- "input": "frame-0015-in.jsonld",
- "frame": "frame-0015-frame.jsonld",
- "expect": "frame-0015-out.jsonld"
- }]
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0001-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0001-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0001-in.jsonld
deleted file mode 100644
index 39c6605..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0001-in.jsonld
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "@id": "http://example.org/test#example"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0001-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0001-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0001-out.jsonld
deleted file mode 100644
index aa595db..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0001-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"http://example.org/test#example"}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0002-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0002-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0002-in.jsonld
deleted file mode 100644
index bdcb83c..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0002-in.jsonld
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#"
- },
- "@id": "http://example.org/test#example1",
- "ex:p": [
- {
- "@id": "http://example.org/test#example2"
- },
- {
- "@id": "http://example.org/test#example2"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0002-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0002-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0002-out.jsonld
deleted file mode 100644
index 90ab0e4..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0002-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"http://example.org/test#example1","http://example.org/vocab#p":{"@id":"http://example.org/test#example2"}},{"@id":"http://example.org/test#example2"}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0003-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0003-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0003-in.jsonld
deleted file mode 100644
index efdc7a8..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0003-in.jsonld
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#"
- },
- "@type": "ex:Foo"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0003-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0003-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0003-out.jsonld
deleted file mode 100644
index 1d7f491..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0003-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0","@type":"http://example.org/vocab#Foo"}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0004-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0004-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0004-in.jsonld
deleted file mode 100644
index b6d71c5..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0004-in.jsonld
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#"
- },
- "@type": "ex:Foo",
- "ex:embed": {
- "@id": "http://example.org/test#example"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0004-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0004-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0004-out.jsonld
deleted file mode 100644
index 1296996..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0004-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0","@type":"http://example.org/vocab#Foo","http://example.org/vocab#embed":{"@id":"http://example.org/test#example"}},{"@id":"http://example.org/test#example"}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0005-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0005-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0005-in.jsonld
deleted file mode 100644
index 28264b9..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0005-in.jsonld
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#"
- },
- "@id": "http://example.org/test#example",
- "@type": "ex:Foo",
- "ex:embed": {
- "@type": "ex:Bar"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0005-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0005-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0005-out.jsonld
deleted file mode 100644
index 308a71d..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0005-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0","@type":"http://example.org/vocab#Bar"},{"@id":"http://example.org/test#example","@type":"http://example.org/vocab#Foo","http://example.org/vocab#embed":{"@id":"_:c14n0"}}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0006-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0006-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0006-in.jsonld
deleted file mode 100644
index 122aa0b..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0006-in.jsonld
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#"
- },
- "@id": "http://example.org/test#example",
- "@type": [
- "ex:Foo",
- "ex:Bar"
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0006-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0006-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0006-out.jsonld
deleted file mode 100644
index e909479..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0006-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"http://example.org/test#example","@type":["http://example.org/vocab#Foo","http://example.org/vocab#Bar"]}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0007-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0007-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0007-in.jsonld
deleted file mode 100644
index 13fe150..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0007-in.jsonld
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#",
- "ex:foo": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": "http://example.org/test#example",
- "@type": "ex:Foo",
- "ex:foo": "ex:Bar"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0007-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0007-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0007-out.jsonld
deleted file mode 100644
index d3a24f7..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0007-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"http://example.org/test#example","@type":"http://example.org/vocab#Foo","http://example.org/vocab#foo":{"@id":"http://example.org/vocab#Bar"}},{"@id":"http://example.org/vocab#Bar"}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0008-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0008-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0008-in.jsonld
deleted file mode 100644
index 311c34d..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0008-in.jsonld
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "@context": {
- "dc": "http://purl.org/dc/elements/1.1/",
- "ex": "http://example.org/vocab#",
- "ex:contains": {
- "@type": "@id"
- }
- },
- "@id": "http://example.org/test#library",
- "ex:contains": {
- "@id": "http://example.org/test#book",
- "dc:contributor": "Writer",
- "dc:title": "My Book",
- "ex:contains": {
- "@id": "http://example.org/test#chapter",
- "dc:description": "Fun",
- "dc:title": "Chapter One"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0008-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0008-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0008-out.jsonld
deleted file mode 100644
index fd9b5d9..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0008-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"http://example.org/test#book","http://example.org/vocab#contains":{"@id":"http://example.org/test#chapter"},"http://purl.org/dc/elements/1.1/contributor":"Writer","http://purl.org/dc/elements/1.1/title":"My Book"},{"@id":"http://example.org/test#chapter","http://purl.org/dc/elements/1.1/description":"Fun","http://purl.org/dc/elements/1.1/title":"Chapter One"},{"@id":"http://example.org/test#library","http://example.org/vocab#contains":{"@id":"http://example.org/test#book"}}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0009-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0009-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0009-in.jsonld
deleted file mode 100644
index ac24485..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0009-in.jsonld
+++ /dev/null
@@ -1,39 +0,0 @@
-{
- "@context": {
- "dc": "http://purl.org/dc/elements/1.1/",
- "ex": "http://example.org/vocab#",
- "ex:authored": {
- "@type": "@id"
- },
- "ex:contains": {
- "@type": "@id"
- },
- "foaf": "http://xmlns.com/foaf/0.1/",
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": [
- {
- "@id": "http://example.org/test#chapter",
- "dc:description": "Fun",
- "dc:title": "Chapter One"
- },
- {
- "@id": "http://example.org/test#jane",
- "ex:authored": "http://example.org/test#chapter",
- "foaf:name": "Jane"
- },
- {
- "@id": "http://example.org/test#john",
- "foaf:name": "John"
- },
- {
- "@id": "http://example.org/test#library",
- "ex:contains": {
- "@id": "http://example.org/test#book",
- "dc:contributor": "Writer",
- "dc:title": "My Book",
- "ex:contains": "http://example.org/test#chapter"
- }
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0009-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0009-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0009-out.jsonld
deleted file mode 100644
index 5af067a..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0009-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"http://example.org/test#book","http://example.org/vocab#contains":{"@id":"http://example.org/test#chapter"},"http://purl.org/dc/elements/1.1/contributor":"Writer","http://purl.org/dc/elements/1.1/title":"My Book"},{"@id":"http://example.org/test#chapter","http://purl.org/dc/elements/1.1/description":"Fun","http://purl.org/dc/elements/1.1/title":"Chapter One"},{"@id":"http://example.org/test#jane","http://example.org/vocab#authored":{"@id":"http://example.org/test#chapter"},"http://xmlns.com/foaf/0.1/name":"Jane"},{"@id":"http://example.org/test#john","http://xmlns.com/foaf/0.1/name":"John"},{"@id":"http://example.org/test#library","http://example.org/vocab#contains":{"@id":"http://example.org/test#book"}}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0010-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0010-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0010-in.jsonld
deleted file mode 100644
index c71bc96..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0010-in.jsonld
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#",
- "ex:validFrom": {
- "@type": "xsd:dateTime"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": "http://example.org/test#example",
- "ex:validFrom": "2011-01-25T00:00:00+0000"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0010-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0010-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0010-out.jsonld
deleted file mode 100644
index 62a7e90..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0010-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"http://example.org/test#example","http://example.org/vocab#validFrom":{"@value":"2011-01-25T00:00:00+0000","@type":"http://www.w3.org/2001/XMLSchema#dateTime"}}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0011-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0011-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0011-in.jsonld
deleted file mode 100644
index 4beabc9..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0011-in.jsonld
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#",
- "ex:validFrom": {
- "@type": "xsd:dateTime"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": "http://example.org/test#example",
- "ex:validFrom": "2011-01-25T00:00:00Z"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0011-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0011-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0011-out.jsonld
deleted file mode 100644
index cfa685c..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0011-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"http://example.org/test#example","http://example.org/vocab#validFrom":{"@value":"2011-01-25T00:00:00Z","@type":"http://www.w3.org/2001/XMLSchema#dateTime"}}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0012-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0012-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0012-in.jsonld
deleted file mode 100644
index 3c04439..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0012-in.jsonld
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#",
- "ex:date": {
- "@type": "xsd:dateTime"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": "http://example.org/test#example",
- "ex:date": [
- "2011-01-25T00:00:00Z",
- "2011-01-25T00:00:00Z"
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0012-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0012-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0012-out.jsonld
deleted file mode 100644
index a447093..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0012-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"http://example.org/test#example","http://example.org/vocab#date":{"@value":"2011-01-25T00:00:00Z","@type":"http://www.w3.org/2001/XMLSchema#dateTime"}}]
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0013-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0013-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0013-in.jsonld
deleted file mode 100644
index b49fac4..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0013-in.jsonld
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#",
- "ex:date": {
- "@type": "xsd:dateTime"
- },
- "ex:parent": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": "http://example.org/test#example1",
- "ex:date": "2011-01-25T00:00:00Z",
- "ex:embed": {
- "@id": "http://example.org/test#example2",
- "ex:parent": "http://example.org/test#example1"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0013-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0013-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0013-out.jsonld
deleted file mode 100644
index 42a9ed6..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0013-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"http://example.org/test#example1","http://example.org/vocab#date":{"@value":"2011-01-25T00:00:00Z","@type":"http://www.w3.org/2001/XMLSchema#dateTime"},"http://example.org/vocab#embed":{"@id":"http://example.org/test#example2"}},{"@id":"http://example.org/test#example2","http://example.org/vocab#parent":{"@id":"http://example.org/test#example1"}}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0014-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0014-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0014-in.jsonld
deleted file mode 100644
index 2998d9c..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0014-in.jsonld
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "@context": {
- "d": "http://purl.org/dc/elements/1.1/",
- "e": "http://example.org/vocab#",
- "e:double-zero": {
- "@type": "xsd:double"
- },
- "f": "http://xmlns.com/foaf/0.1/",
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": "http://example.org/test",
- "e:bool": true,
- "e:double": 1.23,
- "e:double-zero": 0,
- "e:int": 123
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0014-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0014-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0014-out.jsonld
deleted file mode 100644
index fc3bd59..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0014-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"http://example.org/test","http://example.org/vocab#bool":{"@value":"true","@type":"http://www.w3.org/2001/XMLSchema#boolean"},"http://example.org/vocab#double":{"@value":"1.230000e+00","@type":"http://www.w3.org/2001/XMLSchema#double"},"http://example.org/vocab#double-zero":{"@value":"0.000000e+00","@type":"http://www.w3.org/2001/XMLSchema#double"},"http://example.org/vocab#int":{"@value":"123","@type":"http://www.w3.org/2001/XMLSchema#integer"}}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0015-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0015-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0015-in.jsonld
deleted file mode 100644
index 90bceb0..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0015-in.jsonld
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "@context": {
- "e": "http://example.org/vocab#"
- },
- "@id": [
- {
- "@id": "e:A"
- },
- {
- "@id": "e:B"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0015-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0015-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0015-out.jsonld
deleted file mode 100644
index 9c936c6..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0015-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"http://example.org/vocab#A"},{"@id":"http://example.org/vocab#B"}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0016-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0016-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0016-in.jsonld
deleted file mode 100644
index 752edf5..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0016-in.jsonld
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "@context": {
- "e": "http://example.org/vocab#",
- "e:B": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": "http://example.org/test",
- "e:A": {
- "@id": "_:b1"
- },
- "e:B": "_:b1",
- "e:embed": {
- "@id": "_:b1",
- "name": "foo"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0016-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0016-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0016-out.jsonld
deleted file mode 100644
index a89213d..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0016-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0","name":"foo"},{"@id":"http://example.org/test","http://example.org/vocab#A":{"@id":"_:c14n0"},"http://example.org/vocab#B":{"@id":"_:c14n0"},"http://example.org/vocab#embed":{"@id":"_:c14n0"}}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0017-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0017-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0017-in.jsonld
deleted file mode 100644
index 17fcbc6..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0017-in.jsonld
+++ /dev/null
@@ -1,20 +0,0 @@
-[
- {
- "@context": {
- "e": "http://example.org/vocab#",
- "e:B": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": "http://example.org/test",
- "e:A": {
- "@id": "_:b1"
- },
- "e:B": "_:b1"
- },
- {
- "@id": "_:b1",
- "name": "foo"
- }
-]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0017-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0017-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0017-out.jsonld
deleted file mode 100644
index e309339..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0017-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0","name":"foo"},{"@id":"http://example.org/test","http://example.org/vocab#A":{"@id":"_:c14n0"},"http://example.org/vocab#B":{"@id":"_:c14n0"}}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0018-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0018-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0018-in.jsonld
deleted file mode 100644
index e233f90..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0018-in.jsonld
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "@context": {
- "e": "http://example.org/vocab#",
- "e:self": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": "_:b0",
- "e:self": "_:b0"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0018-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0018-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0018-out.jsonld
deleted file mode 100644
index f48c254..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0018-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0","http://example.org/vocab#self":{"@id":"_:c14n0"}}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0019-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0019-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0019-in.jsonld
deleted file mode 100644
index 186c46d..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0019-in.jsonld
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "@context": {
- "e": "http://example.org/vocab#",
- "e:self": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": [
- {
- "@id": "_:b0",
- "e:self": "_:b0"
- },
- {
- "@id": "_:b1",
- "e:self": "_:b1"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0019-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0019-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0019-out.jsonld
deleted file mode 100644
index 6c4ffb7..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0019-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0","http://example.org/vocab#self":{"@id":"_:c14n0"}},{"@id":"_:c14n1","http://example.org/vocab#self":{"@id":"_:c14n1"}}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0020-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0020-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0020-in.jsonld
deleted file mode 100644
index 23cc465..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0020-in.jsonld
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "@context": {
- "e": "http://example.org/vocab#",
- "e:A": {
- "@type": "@id"
- },
- "e:B": {
- "@type": "@id"
- },
- "e:next": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": [
- {
- "@id": "e:test",
- "e:A": "_:b1",
- "e:B": "_:b2"
- },
- {
- "@id": "_:b1",
- "e:next": "_:b3"
- },
- {
- "@id": "_:b2",
- "e:next": "_:b3"
- },
- {
- "@id": "_:b3"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0020-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0020-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0020-out.jsonld
deleted file mode 100644
index 1c9432d..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0020-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0"},{"@id":"_:c14n1","http://example.org/vocab#next":{"@id":"_:c14n0"}},{"@id":"_:c14n2","http://example.org/vocab#next":{"@id":"_:c14n0"}},{"@id":"http://example.org/vocab#test","http://example.org/vocab#A":{"@id":"_:c14n1"},"http://example.org/vocab#B":{"@id":"_:c14n2"}}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0021-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0021-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0021-in.jsonld
deleted file mode 100644
index 59142a0..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0021-in.jsonld
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "@context": {
- "e": "http://example.org/vocab#",
- "e:next": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": [
- {
- "@id": "_:b1",
- "e:next": "_:b2"
- },
- {
- "@id": "_:b2",
- "e:next": "_:b1"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0021-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0021-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0021-out.jsonld
deleted file mode 100644
index 34b36ab..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0021-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0","http://example.org/vocab#next":{"@id":"_:c14n1"}},{"@id":"_:c14n1","http://example.org/vocab#next":{"@id":"_:c14n0"}}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0022-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0022-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0022-in.jsonld
deleted file mode 100644
index 5809e45..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0022-in.jsonld
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "@context": {
- "e": "http://example.org/vocab#",
- "e:next": {
- "@type": "@id"
- },
- "e:prev": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": [
- {
- "@id": "_:b1",
- "e:next": "_:b2",
- "e:prev": "_:b2"
- },
- {
- "@id": "_:b2",
- "e:next": "_:b1",
- "e:prev": "_:b1"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0022-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0022-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0022-out.jsonld
deleted file mode 100644
index 62e0cd2..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0022-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0","http://example.org/vocab#next":{"@id":"_:c14n1"},"http://example.org/vocab#prev":{"@id":"_:c14n1"}},{"@id":"_:c14n1","http://example.org/vocab#next":{"@id":"_:c14n0"},"http://example.org/vocab#prev":{"@id":"_:c14n0"}}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0023-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0023-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0023-in.jsonld
deleted file mode 100644
index 4a8091f..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0023-in.jsonld
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "@context": {
- "e": "http://example.org/vocab#",
- "e:next": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": [
- {
- "@id": "_:b1",
- "e:next": "_:b2"
- },
- {
- "@id": "_:b2",
- "e:next": "_:b3"
- },
- {
- "@id": "_:b3",
- "e:next": "_:b1"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0023-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0023-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0023-out.jsonld
deleted file mode 100644
index e7a87e2..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0023-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0","http://example.org/vocab#next":{"@id":"_:c14n1"}},{"@id":"_:c14n1","http://example.org/vocab#next":{"@id":"_:c14n2"}},{"@id":"_:c14n2","http://example.org/vocab#next":{"@id":"_:c14n0"}}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0024-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0024-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0024-in.jsonld
deleted file mode 100644
index 34e76a2..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0024-in.jsonld
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "@context": {
- "e": "http://example.org/vocab#",
- "e:next": {
- "@type": "@id"
- },
- "e:prev": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": [
- {
- "@id": "_:b1",
- "e:next": "_:b2",
- "e:prev": "_:b3"
- },
- {
- "@id": "_:b2",
- "e:next": "_:b3",
- "e:prev": "_:b1"
- },
- {
- "@id": "_:b3",
- "e:next": "_:b1",
- "e:prev": "_:b2"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0024-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0024-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0024-out.jsonld
deleted file mode 100644
index dbb2900..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0024-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0","http://example.org/vocab#next":{"@id":"_:c14n1"},"http://example.org/vocab#prev":{"@id":"_:c14n2"}},{"@id":"_:c14n1","http://example.org/vocab#next":{"@id":"_:c14n2"},"http://example.org/vocab#prev":{"@id":"_:c14n0"}},{"@id":"_:c14n2","http://example.org/vocab#next":{"@id":"_:c14n0"},"http://example.org/vocab#prev":{"@id":"_:c14n1"}}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0025-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0025-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0025-in.jsonld
deleted file mode 100644
index f425006..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0025-in.jsonld
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "@context": {
- "e": "http://example.org/vocab#",
- "e:next": {
- "@type": "@id"
- },
- "e:prev": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": [
- {
- "@id": "_:b1",
- "e:next": "_:b2",
- "e:prev": "_:b3"
- },
- {
- "@id": "_:b3",
- "e:next": "_:b1",
- "e:prev": "_:b2"
- },
- {
- "@id": "_:b2",
- "e:next": "_:b3",
- "e:prev": "_:b1"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0025-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0025-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0025-out.jsonld
deleted file mode 100644
index dbb2900..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0025-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0","http://example.org/vocab#next":{"@id":"_:c14n1"},"http://example.org/vocab#prev":{"@id":"_:c14n2"}},{"@id":"_:c14n1","http://example.org/vocab#next":{"@id":"_:c14n2"},"http://example.org/vocab#prev":{"@id":"_:c14n0"}},{"@id":"_:c14n2","http://example.org/vocab#next":{"@id":"_:c14n0"},"http://example.org/vocab#prev":{"@id":"_:c14n1"}}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0026-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0026-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0026-in.jsonld
deleted file mode 100644
index ea9a2bd..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0026-in.jsonld
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "@context": {
- "e": "http://example.org/vocab#",
- "e:next": {
- "@type": "@id"
- },
- "e:prev": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": [
- {
- "@id": "_:b2",
- "e:next": "_:b3",
- "e:prev": "_:b1"
- },
- {
- "@id": "_:b1",
- "e:next": "_:b2",
- "e:prev": "_:b3"
- },
- {
- "@id": "_:b3",
- "e:next": "_:b1",
- "e:prev": "_:b2"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0026-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0026-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0026-out.jsonld
deleted file mode 100644
index dbb2900..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0026-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0","http://example.org/vocab#next":{"@id":"_:c14n1"},"http://example.org/vocab#prev":{"@id":"_:c14n2"}},{"@id":"_:c14n1","http://example.org/vocab#next":{"@id":"_:c14n2"},"http://example.org/vocab#prev":{"@id":"_:c14n0"}},{"@id":"_:c14n2","http://example.org/vocab#next":{"@id":"_:c14n0"},"http://example.org/vocab#prev":{"@id":"_:c14n1"}}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0027-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0027-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0027-in.jsonld
deleted file mode 100644
index 4fcac78..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0027-in.jsonld
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "@context": {
- "e": "http://example.org/vocab#",
- "e:next": {
- "@type": "@id"
- },
- "e:prev": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": [
- {
- "@id": "_:b2",
- "e:next": "_:b3",
- "e:prev": "_:b1"
- },
- {
- "@id": "_:b3",
- "e:next": "_:b1",
- "e:prev": "_:b2"
- },
- {
- "@id": "_:b1",
- "e:next": "_:b2",
- "e:prev": "_:b3"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0027-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0027-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0027-out.jsonld
deleted file mode 100644
index dbb2900..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0027-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0","http://example.org/vocab#next":{"@id":"_:c14n1"},"http://example.org/vocab#prev":{"@id":"_:c14n2"}},{"@id":"_:c14n1","http://example.org/vocab#next":{"@id":"_:c14n2"},"http://example.org/vocab#prev":{"@id":"_:c14n0"}},{"@id":"_:c14n2","http://example.org/vocab#next":{"@id":"_:c14n0"},"http://example.org/vocab#prev":{"@id":"_:c14n1"}}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0028-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0028-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0028-in.jsonld
deleted file mode 100644
index fb981bf..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0028-in.jsonld
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "@context": {
- "e": "http://example.org/vocab#",
- "e:next": {
- "@type": "@id"
- },
- "e:prev": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": [
- {
- "@id": "_:b3",
- "e:next": "_:b1",
- "e:prev": "_:b2"
- },
- {
- "@id": "_:b2",
- "e:next": "_:b3",
- "e:prev": "_:b1"
- },
- {
- "@id": "_:b1",
- "e:next": "_:b2",
- "e:prev": "_:b3"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0028-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0028-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0028-out.jsonld
deleted file mode 100644
index dbb2900..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0028-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0","http://example.org/vocab#next":{"@id":"_:c14n1"},"http://example.org/vocab#prev":{"@id":"_:c14n2"}},{"@id":"_:c14n1","http://example.org/vocab#next":{"@id":"_:c14n2"},"http://example.org/vocab#prev":{"@id":"_:c14n0"}},{"@id":"_:c14n2","http://example.org/vocab#next":{"@id":"_:c14n0"},"http://example.org/vocab#prev":{"@id":"_:c14n1"}}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0029-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0029-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0029-in.jsonld
deleted file mode 100644
index 7788b3e..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0029-in.jsonld
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "@context": {
- "e": "http://example.org/vocab#",
- "e:next": {
- "@type": "@id"
- },
- "e:prev": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": [
- {
- "@id": "_:b3",
- "e:next": "_:b1",
- "e:prev": "_:b2"
- },
- {
- "@id": "_:b1",
- "e:next": "_:b2",
- "e:prev": "_:b3"
- },
- {
- "@id": "_:b2",
- "e:next": "_:b3",
- "e:prev": "_:b1"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0029-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0029-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0029-out.jsonld
deleted file mode 100644
index dbb2900..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0029-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0","http://example.org/vocab#next":{"@id":"_:c14n1"},"http://example.org/vocab#prev":{"@id":"_:c14n2"}},{"@id":"_:c14n1","http://example.org/vocab#next":{"@id":"_:c14n2"},"http://example.org/vocab#prev":{"@id":"_:c14n0"}},{"@id":"_:c14n2","http://example.org/vocab#next":{"@id":"_:c14n0"},"http://example.org/vocab#prev":{"@id":"_:c14n1"}}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0030-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0030-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0030-in.jsonld
deleted file mode 100644
index 0ae2e0f..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0030-in.jsonld
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "@context": {
- "e": "http://example.org/vocab#",
- "e:A": {
- "@type": "@id"
- },
- "e:B": {
- "@type": "@id"
- },
- "e:C": {
- "@type": "@id"
- },
- "e:next": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": [
- {
- "@id": "e:test",
- "e:A": "_:b1",
- "e:B": "_:b2",
- "e:C": "_:b3"
- },
- {
- "@id": "_:b1",
- "e:next": "_:b2"
- },
- {
- "@id": "_:b2",
- "e:next": "_:b3"
- },
- {
- "@id": "_:b3",
- "e:next": "_:b1"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0030-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0030-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0030-out.jsonld
deleted file mode 100644
index 38e1aca..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0030-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0","http://example.org/vocab#next":{"@id":"_:c14n1"}},{"@id":"_:c14n1","http://example.org/vocab#next":{"@id":"_:c14n2"}},{"@id":"_:c14n2","http://example.org/vocab#next":{"@id":"_:c14n0"}},{"@id":"http://example.org/vocab#test","http://example.org/vocab#A":{"@id":"_:c14n0"},"http://example.org/vocab#B":{"@id":"_:c14n1"},"http://example.org/vocab#C":{"@id":"_:c14n2"}}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0031-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0031-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0031-in.jsonld
deleted file mode 100644
index 5a05ec9..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0031-in.jsonld
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#"
- },
- "@id": "_:a",
- "@type": "ex:Foo"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0031-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0031-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0031-out.jsonld
deleted file mode 100644
index 1d7f491..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0031-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0","@type":"http://example.org/vocab#Foo"}]
\ No newline at end of file
[6/7] MARMOTTA-261 : Remove sesame-tools-rio-jsonld
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/ext/java/de/dfki/km/json/jsonld/JSONLDProcessor.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/ext/java/de/dfki/km/json/jsonld/JSONLDProcessor.java b/commons/sesame-tools-rio-jsonld/src/ext/java/de/dfki/km/json/jsonld/JSONLDProcessor.java
deleted file mode 100644
index 3d0074e..0000000
--- a/commons/sesame-tools-rio-jsonld/src/ext/java/de/dfki/km/json/jsonld/JSONLDProcessor.java
+++ /dev/null
@@ -1,1386 +0,0 @@
-package de.dfki.km.json.jsonld;
-
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import de.dfki.km.json.jsonld.JSONLDUtils.NameGenerator;
-
-public class JSONLDProcessor {
-
- private static final Logger LOG = LoggerFactory.getLogger(JSONLDProcessor.class);
- private NameGenerator ngtmp;
-
- private Set<String> ignoredKeywords = new HashSet<String>();
-
- /**
- * Tells the processor to skip over the key specified by keyword any time it encounters it. Objects under this key will not be manipulated by any of the
- * processor functions and no triples will be created using it.
- *
- * @param keyword
- * The name of the key this processor should ignore.
- */
- public void ignoreKeyword(String keyword) {
- ignoredKeywords.add(keyword);
- }
-
- private Map<String, Object> edges;
- private Map<String, Object> subjects;
- private Map<String, Object> renamed;
- private Map<String, Object> serializations;
- private NameGenerator ngc14n;
-
- public Object expand(Object input) {
- return expand(new HashMap<String, Object>(), null, input);
- }
-
- private Object expand(Map<String, Object> ctx, Object property, Object value) {
- Object rval = null;
- if (value == null) {
- return null;
- } else if (property == null && value instanceof String) {
- rval = JSONLDUtils.expandTerm(ctx, (String) value);// , null));
- } else if (value instanceof List) {
- rval = new ArrayList<Object>();
- for (Object i : (List) value) {
- ((List) rval).add(expand(ctx, property, i));
- }
- } else if (value instanceof Map) {
- rval = new HashMap<String, Object>();
- if (((Map<String, Object>) value).containsKey("@context")) {
- try {
- ctx = JSONLDUtils.mergeContexts((Map<String, Object>) ctx, (Map<String, Object>) ((Map<String, Object>) value).get("@context"));
- } catch (Exception e) {
- // unable to merge contexts
- // TODO: this should probably just throw back to the calling
- // function
- e.printStackTrace();
- return null;
- }
- }
-
- rval = new HashMap<String, Object>();
- for (String key : ((Map<String, Object>) value).keySet()) {
- if ("@embed".equals(key) || "@explicit".equals(key) || "@default".equals(key) || "@omitDefault".equals(key) || ignoredKeywords.contains(key)) {
- JSONLDUtils.setProperty((Map<String, Object>) rval, key, JSONLDUtils.clone(((Map<String, Object>) value).get(key)));
- } else if (!"@context".equals(key)) {
- JSONLDUtils.setProperty((Map<String, Object>) rval, JSONLDUtils.expandTerm(ctx, key),
- expand(ctx, key, ((Map<String, Object>) value).get(key)));
- }
- }
- } else {
- // do type coercion
- String coerce = JSONLDUtils.getCoercionType(ctx, (String) property);// ,
- // null);
- Map<String, String> keywords = JSONLDUtils.getKeywords(ctx);
-
- // automatic coercion for basic JSON types
- if (coerce == null) {
- if (value instanceof Boolean) {
- coerce = JSONLDConsts.XSD_BOOLEAN;
- } else if (value instanceof Integer) {
- coerce = JSONLDConsts.XSD_INTEGER;
- } else if (value instanceof Double) {
- coerce = JSONLDConsts.XSD_DOUBLE;
- }
- }
-
- // special-case expand @id and @type (skips '@id' expansion)
- if (property.equals("@id") || property.equals(keywords.get("@id")) || property.equals("@type") || property.equals(keywords.get("@type"))) {
- rval = JSONLDUtils.expandTerm(ctx, (String) value);
- }
- // coerce to appropriate type
- else if (coerce != null) {
- rval = new HashMap<String, Object>();
-
- if (coerce.equals("@id")) {
- // expand IRI
- ((Map<String, Object>) rval).put("@id", JSONLDUtils.expandTerm(ctx, (String) value)); // ,
- // null));
- } else {
- ((Map<String, Object>) rval).put("@type", coerce);
- if (coerce.equals(JSONLDConsts.XSD_DOUBLE)) {
- DecimalFormat decimalFormat = new DecimalFormat("0.000000E0", new DecimalFormatSymbols(Locale.US));
- Double v = null;
- if (value instanceof String) {
- v = Double.parseDouble((String) value);
- } else if (value instanceof Integer) {
- // TODO: what is this? really?
- v = new Double(1.0 * (Integer) value);
- } else {
- v = (Double) value;
- }
- String dec = decimalFormat.format(v);
- Pattern p = Pattern.compile("(-?[0-9\\.]+)E((?:-*))([0-9]+)");
- Matcher matcher = p.matcher(dec);
- matcher.find();
- String sign = matcher.group(2);
- if ("".equals(sign)) {
- sign = "+";
- }
- value = matcher.group(1) + "e" + sign + (matcher.group(3).length() > 1 ? matcher.group(3) : "0" + matcher.group(3));
- } else {
- value = value.toString();
- }
- ((Map<String, Object>) rval).put("@value", value);
- }
- } else {
- // nothing to coerce
- rval = value.toString();
- }
- }
-
- return rval;
- }
-
- // TODO: note that in the spec, input is the first input, but in the ref
- // impl, context is.
- // using context here first because it matches everything else
- public Object compact(Object context, Object input) {
-
- Object rval = null;
-
- Map<String, Object> ctx;
- if (context == null) {
- ctx = new HashMap<String, Object>();
- } else if (context instanceof Map) {
- ctx = (Map<String, Object>) JSONLDUtils.clone(context);
- } else if (context instanceof List) {
- ctx = (Map<String, Object>) JSONLDUtils.mergeContexts(new HashMap<String, Object>(), context);
- } else {
- // TODO: are there any reasons that ctx shouldn't be a map?
- throw new RuntimeException("non-map or list contexts not yes supported");
- }
-
- input = expand(input);
-
- Map<String, Object> ctxOut = new HashMap<String, Object>();
- Object out = compact(ctx, null, input, ctxOut);
- rval = out;
-
- if (ctxOut.size() > 0) {
- rval = new HashMap<String, Object>();
- ((Map<String, Object>) rval).put("@context", ctxOut);
- if (out instanceof List) {
- ((Map<String, Object>) rval).put(JSONLDUtils.getKeywords(ctxOut).get("@id"), out);
- } else {
- for (String key : ((Map<String, Object>) out).keySet()) {
- ((Map<String, Object>) rval).put(key, ((Map<String, Object>) out).get(key));
- }
- }
- }
-
- return rval;
- }
-
- /*
- * TODO: this throws runtime exception. need to look at doing something more sane.
- */
- public Object compact(Map<String, Object> ctx, Object property, Object value, Map<String, Object> usedCtx) {
-
- Object rval = null;
- Map<String, String> keywords = JSONLDUtils.getKeywords(ctx);
-
- if (value == null) {
- rval = null;
- // TODO: used ctx stuff may actually be handy here
- JSONLDUtils.getCoercionType(ctx, (String) property, usedCtx);
- } else if (value instanceof List) {
- // recursively add compacted values to array
- rval = new ArrayList<Object>();
- for (Object o : (List<Object>) value) {
- ((List) rval).add(compact(ctx, property, o, usedCtx));
- }
- } else if (value instanceof Map && ((Map) value).containsKey("@id") && ((Map) value).get("@id") instanceof List) {
- // graph literal/disjoint graph
- rval = new HashMap<String, Object>();
- ((Map<String, Object>) rval).put(keywords.get("@id"), compact(ctx, property, ((Map) value).get("@id"), usedCtx));
- } else if (JSONLDUtils.isSubject(value)) { // recurse if value is a
- // subject
- // recursively handle sub-properties that aren't a sub-context
- rval = new HashMap<String, Object>();
- for (String key : ((Map<String, Object>) value).keySet()) {
- if (!"@context".equals(((Map<String, Object>) value).get(key))) {
- // set object to compacted property, only overwrite existing
- // properties if the property actually compacted
- String p = JSONLDUtils.compactIRI(ctx, key, usedCtx);
- if (!(key.equals(p)) || !((Map<String, Object>) rval).containsKey(p)) {
- ((Map<String, Object>) rval).put(p, compact(ctx, key, ((Map<String, Object>) value).get(key), usedCtx));
- }
- }
- }
- } else {
- // get coerce type
- String coerce = JSONLDUtils.getCoercionType(ctx, (String) property, usedCtx);
-
- // get type from value, to ensure coercion is valid
- String type = null;
- if (value instanceof Map) {
- // type coercion can only occur if language is not specified
- if (!((Map) value).containsKey("@language")) {
- // type must match coerce type if specified
- if (((Map) value).containsKey("@type")) {
- type = (String) ((Map<String, Object>) value).get("@type");
- } else if (((Map) value).containsKey("@id")) { // type is ID
- // (IRI)
- type = "@id";
- } else { // can be coerced to any type
- type = coerce;
- }
- }
- } else if (value instanceof String) {
- // type can be coerced to anything
- type = coerce;
- }
-
- // types that can be auto-coerced from a JSON-builtin
- if (coerce == null && (JSONLDConsts.XSD_BOOLEAN.equals(type) || JSONLDConsts.XSD_INTEGER.equals(type) || JSONLDConsts.XSD_DOUBLE.equals(type))) {
- coerce = type;
- }
-
- // do reverse type-coercion
- if (coerce != null) {
- // type is only None if a language was specified, which is an
- // error if type coercion is specified
- if (type == null) {
- throw new RuntimeException("Cannot coerce type when a language is " + "specified. The language information would be lost.");
- } else if (!type.equals(coerce)) {
- // if the value type does not match the coerce type, it is
- // an error
- throw new RuntimeException("Cannot coerce type because the type does not match.");
- } else {
- // do reverse type-coercion
- if (value instanceof Map) {
- if (((Map) value).containsKey("@id")) {
- rval = ((Map) value).get("@id");
- } else if (((Map) value).containsKey("@value")) {
- rval = ((Map) value).get("@value");
- }
- } else {
- rval = value;
- }
-
- // do basic JSON types conversion
- if (JSONLDConsts.XSD_BOOLEAN.equals(coerce)) {
- // TODO: this is a bit mad (and probably not exhaustive)
- if (rval instanceof String) {
- rval = "true".equals(rval);
- } else if (rval instanceof Integer) {
- rval = ((Integer) rval) != 0;
- } else if (rval instanceof Double) {
- rval = ((Double) rval) != 0.0;
- } else if (rval instanceof Long) {
- rval = ((Long) rval) != 0L;
- } else if (rval instanceof Float) {
- rval = ((Float) rval) != 0.0f;
- } else if (rval instanceof Short) {
- rval = ((Short) rval) != 0;
- } else if (!(rval instanceof Boolean)) {
- rval = false;
- }
- } else if (JSONLDConsts.XSD_DOUBLE.equals(coerce)) {
- if (rval instanceof String) {
- rval = Double.parseDouble((String) rval);
- } else if (rval instanceof Number) {
- rval = ((Number) rval).doubleValue();
- }
- } else if (JSONLDConsts.XSD_INTEGER.equals(coerce)) {
- if (rval instanceof String) {
- rval = Integer.parseInt((String) rval);
- } else if (rval instanceof Number) {
- rval = ((Number) rval).intValue();
- }
- }
- }
- } else if (value instanceof Map) {
- // no type-coercion, just change keywords/copy value
- rval = new HashMap<String, Object>();
- for (String key : ((Map<String, Object>) value).keySet()) {
- ((Map<String, Object>) rval).put(keywords.get(key), ((Map) value).get(key));
- }
- } else {
- rval = JSONLDUtils.clone(value);
- }
-
- if ("@id".equals(type)) {
- // compact IRI
- if (rval instanceof Map) {
- ((Map) rval).put(keywords.get("@id"), JSONLDUtils.compactIRI(ctx, (String) ((Map<String, Object>) rval).get(keywords.get("@id")), usedCtx));
- } else {
- rval = JSONLDUtils.compactIRI(ctx, (String) rval, usedCtx);
- }
- }
- }
- return rval;
- }
-
- public Object frame(Object input, Object frame) {
- return frame(input, frame, null);
- }
-
- public Object frame(Object input, Object frame, Map options) {
- Object rval = null;
-
- input = normalize(input);
-
- Object ctx = null;
-
- if (frame instanceof Map && ((Map) frame).containsKey("@context")) {
- ctx = JSONLDUtils.clone(((Map) frame).get("@context"));
- frame = expand(frame);
- } else if (frame instanceof List) {
- if (((List) frame).size() > 0) {
- Object f0 = ((List) frame).get(0);
- if (f0 instanceof Map && ((Map) f0).containsKey("@context")) {
- ctx = JSONLDUtils.clone(((Map) f0).get("@context"));
- }
-
- List tmp = new ArrayList();
- for (Object f : (List) frame) {
- tmp.add(expand(f));
- }
- frame = tmp;
- }
- }
-
- Map defaultOptions = new HashMap();
- Map tmpopts = new HashMap();
- tmpopts.put("embedOn", true);
- tmpopts.put("explicitOn", false);
- tmpopts.put("omitDefaultOn", false);
- defaultOptions.put("defaults", tmpopts);
-
- // TODO: merge in options from input
- options = defaultOptions;
-
- Map subjects = new HashMap();
- for (Object i : (List) input) {
- subjects.put(((Map) i).get("@id"), i);
- }
-
- rval = JSONLDUtils.frame(subjects, (List) input, frame, new HashMap(), false, null, null, options);
-
- if (ctx != null && rval != null) {
- if (rval instanceof List) {
- List tmp = (List) rval;
- rval = new ArrayList();
- for (Object i : tmp) {
- ((List) rval).add(compact(ctx, i));
- }
- } else {
- rval = compact(ctx, rval);
- }
- }
-
- return rval;
- }
-
- public List<? extends Map<String, Object>> normalize(Object input) {
- // because the expanded output of items from the onlinebox are the same
- // as the normalized version
- // (just inside a list) i'm going to skip implementing the normalize
- // function for now.
- // TODO: implement this properly as if data is really to be imported
- // into the OB with this method
- // this will be needed (mainly for identifying embedded items)
- List<Map<String, Object>> rval = new ArrayList<Map<String, Object>>();
-
- if (input != null) {
-
- Object expanded = expand(new HashMap<String, Object>(), null, input);
-
- nameBlankNodes(expanded);
-
- Map<String, Object> subjects = new HashMap<String, Object>();
- try {
- flatten(null, null, expanded, subjects);
- } catch (Exception e) {
- // TODO: This should probably be thrown back to the caller
- e.printStackTrace();
- LOG.error("flatten failed!");
- return null;
- }
-
- for (String key : subjects.keySet()) {
- Map<String, Object> s = (Map<String, Object>) subjects.get(key);
- // TODO: in javascript the keys are sorted and added back into
- // the array
- // in alphabetical order. however in HashMaps, this order isn't
- // kept
- rval.add(s);
- }
-
- canonicalizeBlankNodes(rval);
-
- // sort the output
- Collections.sort(rval, new Comparator<Map<String, Object>>() {
- public int compare(Map<String, Object> a, Map<String, Object> b) {
- return JSONLDUtils.compare(a.get("@id"), b.get("@id"));
- }
- });
- }
-
- return rval;
- }
-
- /**
- *
- *
- * @return a list of objects returned by tripleCallback
- */
- public void triples(Object input, JSONLDTripleCallback tripleCallback) {
- Object normalized = normalize(input);
-
- if (tripleCallback == null) {
- // TODO: make default triple callback
- }
-
- List<Object> rval = new ArrayList<Object>();
- for (Map<String, Object> e : (List<Map<String, Object>>) normalized) {
- String s = (String) e.get("@id");
-
- for (String p : e.keySet()) {
- Object obj = e.get(p);
-
- // don't generate a triple for the @id or any keys that should
- // be ignored
- if (p.equals("@id") || ignoredKeywords.contains(p)) {
- continue;
- } else if (p.equals("@type")) {
- p = JSONLDConsts.RDF_SYNTAX_NS + "type";
- }
-
- if (!(obj instanceof List)) {
- List<Object> tmp = new ArrayList<Object>();
- tmp.add(obj);
- obj = tmp;
- }
- for (Object o : (List<Object>) obj) {
- if (o instanceof String) {
- // type is a special case where the uri isn't expanded
- // out into an object
- if (p.toString().equals(JSONLDConsts.RDF_SYNTAX_NS + "type")) {
- tripleCallback.triple(s, p, o.toString());
- } else {
- tripleCallback.triple(s, p, (String) o, JSONLDConsts.XSD_STRING, null);
- }
- } else if (o instanceof Map) {
- if (((Map) o).containsKey("@value")) {
- if (((Map) o).containsKey("@type")) {
- String datatypeURI = (String) ((Map) o).get("@type");
- String value = (String) ((Map) o).get("@value");
- tripleCallback.triple(s, p, value, datatypeURI, null);
- } else if (((Map) o).containsKey("@language")) {
- tripleCallback.triple(s, p, (String) ((Map) o).get("@value"), JSONLDConsts.XSD_STRING, (String) ((Map) o).get("@language"));
- } else {
- tripleCallback.triple(s, p, (String) ((Map) o).get("@value"), JSONLDConsts.XSD_STRING, null);
- }
- } else if (((Map) o).containsKey("@id")) {
- tripleCallback.triple(s, p, (String) ((Map) o).get("@id"));
- } else {
- // TODO: have i missed anything?
- return;
- }
- }
- }
- }
- }
- }
-
- /*
- * public Object simplify(Map input) { return simplify(input, new HashMap()); }
- */
-
- public static void generateSimplifyContext(Object input, Map<String, Object> ctx) {
- if (input instanceof List) {
- for (Object o : (List) input) {
- generateSimplifyContext(o, ctx);
- }
- } else if (input instanceof Map) {
- Map<String, Object> o = (Map<String, Object>) input;
- for (String key : o.keySet()) {
- Object val = o.get(key);
- if (key.matches("^https?://.+$")) {
- int idx = key.lastIndexOf('#');
- if (idx < 0) {
- idx = key.lastIndexOf('/');
- }
- String skey = key.substring(idx + 1);
- Object keyval = key;
- if (val instanceof Map) {
- if (((Map) val).containsKey("@id")) {
- Map tmp = new HashMap();
- tmp.put("@type", "@id");
- tmp.put("@id", key);
- keyval = tmp;
- }
- }
- while (true) {
- // check if the key is already in the frame ctx
- if (ctx.containsKey(skey)) {
- // if so, check if the values are the same
- if (ctx.get(skey).equals(keyval)) {
- // if they are, skip adding this
- break;
- }
- // if not, add a _ to the simple key and try again
- skey += "_";
- } else {
- ctx.put(skey, keyval);
- break;
- }
- }
- }
- if (val instanceof Map || val instanceof List) {
- generateSimplifyContext(val, ctx);
- }
- }
- }
- }
-
- /**
- * automatically builds a frame which attempts to simplify the keys and values as much as possible
- *
- * NOTE: this is experimental and only built for specific conditions
- *
- * @param input
- * @return
- */
- public Object simplify(Map input) {
-
- Map<String, Object> origCtx = (Map<String, Object>) input.get("@context");
- Object expanded = expand(input);
- Map<String, Object> framectx = new HashMap<String, Object>();
-
- generateSimplifyContext(expanded, framectx);
-
- if (origCtx != null) {
- framectx = JSONLDUtils.mergeContexts(origCtx, framectx);
- }
-
- return compact(framectx, expanded);
- }
-
- private Map<String, Object> nestCore(Map<String, Object> rootObj, Map<String, Map<String, Object>> otherObjs) {
- Map<String, Object> rval = new HashMap<String, Object>();
- for (String key : rootObj.keySet()) {
- Object val = rootObj.get(key);
- if (ignoredKeywords.contains(key)) {
- rval.put(key, val);
- } else if (val instanceof List) {
- List<Object> lv = new ArrayList<Object>();
- for (Map<String, Object> o : (List<Map<String, Object>>) val) {
- lv.add(nestCore(o, otherObjs));
- }
- rval.put(key, lv);
- } else if (val instanceof Map) {
- // TODO: should this be true as well? ((Map) val).size() == 1
- if (((Map) val).containsKey("@id") && otherObjs.containsKey(((Map) val).get("@id"))) {
- rval.put(key, otherObjs.get(((Map) val).get("@id")));
- } else {
- rval.put(key, nestCore((Map<String, Object>) val, otherObjs));
- }
- } else {
- rval.put(key, val);
- }
- }
- return rval;
- }
-
- /**
- * expands all the objects in the input list, and nests all the non-root object lists
- * into the root object, resulting in a single object
- *
- * TODO: i'm not sure if the way i'm keeping the original context is what i really want
- *
- * @param input
- * @param rootObjId
- * @return
- */
- public Object nest(List<Map<String, Object>> input, String rootObjId) {
- Map<String, Object> rootObj = null;
- Map<String, Object> rootObjCtx = null;
- Map<String, Map<String, Object>> otherObjs = new HashMap<String, Map<String, Object>>();
- // find the root object and build a map of the non-root objects mapped by id
- for (Map<String, Object> item : input) {
- if (item.containsKey("@id")) {
- if (rootObjId.equals(item.get("@id"))) {
- rootObjCtx = (Map<String, Object>) item.get("@context");
- rootObj = (Map<String, Object>) expand(item);
- } else {
- //Map<String, Object> clone = (Map<String, Object>) JSONLDUtils.clone(item);
- //clone.remove("@id");
- otherObjs.put((String) item.get("@id"), (Map<String, Object>) expand(item));
- }
- }
- }
-
- if (rootObj == null) {
- // no object matching the root object found, should probably return an error actually
- // TODO: throw runtimeexception when the rest of the library is updated
- return input;
- }
-
- // this nests all the elements in the input once (not including the root object)
- Map<String, Map<String, Object>> nestedOthers = new HashMap<String, Map<String, Object>>();
- for (String key : otherObjs.keySet()) {
- Map<String, Object> val = otherObjs.get(key);
- nestedOthers.put(key, nestCore(val, otherObjs));
- }
- // nests the root object with the nested other objects
- Map<String, Object> rval = nestCore(rootObj, nestedOthers);
-
- // compact the results with the original root object's context
- return compact(rootObjCtx != null ? rootObjCtx : new HashMap<String, Object>(), rval);
- }
-
- public void nameBlankNodes(Object input) {
- JSONLDUtils.NameGenerator ng = new JSONLDUtils.NameGenerator("tmp");
- this.ngtmp = ng;
-
- // Map<String,Object> subjects = new HashMap<String, Object>();
- subjects = new HashMap<String, Object>();
- List<Map<String, Object>> bnodes = new ArrayList<Map<String, Object>>();
-
- collectSubjects(input, subjects, bnodes);
-
- for (Map<String, Object> bnode : bnodes) {
- if (!bnode.containsKey("@id")) {
- while (subjects.containsKey(ng.next()))
- ;
- ((Map<String, Object>) bnode).put("@id", ng.current());
- subjects.put(ng.current(), bnode);
- }
- }
- }
-
- private void flatten(Object parent, String parentProperty, Object value, Map<String, Object> subjects) throws Exception {
-
- Object flattened = null;
-
- if (value == null) {
- // drop null values
- } else if (value instanceof List) {
- for (Object v : (List<Object>) value) {
- flatten(parent, parentProperty, v, subjects);
- }
- } else if (value instanceof Map) {
- Map<String, Object> mapVal = (Map<String, Object>) value;
- if (mapVal.containsKey("@value") || "@type".equals(parentProperty)) {
- // already-expanded value
- flattened = JSONLDUtils.clone(value);
- } else if (mapVal.get("@id") instanceof List) {
- // graph literal/disjoint graph
- if (parent != null) {
- // cannot flatten embedded graph literals
- throw new Exception("Embedded graph literals cannot be flattened");
- }
-
- // top-level graph literal
- for (Object key : (List<Object>) mapVal.get("@id")) {
- if (!ignoredKeywords.contains(key)) {
- flatten(parent, parentProperty, key, subjects);
- }
- }
- } else { // regular subject
- // create of fetch existing subject
- Object subject;
- if (subjects.containsKey(mapVal.get("@id"))) {
- subject = subjects.get(mapVal.get("@id"));
- } else {
- subject = new HashMap<String, Object>();
- ((Map<String, Object>) subject).put("@id", mapVal.get("@id"));
- subjects.put((String) mapVal.get("@id"), subject);
- }
- flattened = new HashMap<String, Object>();
- ((Map<String, Object>) flattened).put("@id", ((Map<String, Object>) subject).get("@id"));
-
- for (String key : mapVal.keySet()) {
- Object v = mapVal.get(key);
-
- if (ignoredKeywords.contains(key)) {
- ((Map<String, Object>) subject).put(key, v);
- } else if (v != null && !"@id".equals(key)) {
- if (((Map<String, Object>) subject).containsKey(key)) {
- if (!(((Map<String, Object>) subject).get(key) instanceof List)) {
- Object tmp = ((Map<String, Object>) subject).get(key);
- List<Object> lst = new ArrayList<Object>();
- lst.add(tmp);
- ((Map<String, Object>) subject).put(key, lst);
- }
- } else {
- List<Object> lst = new ArrayList<Object>();
- ((Map<String, Object>) subject).put(key, lst);
- }
-
- flatten(((Map<String, Object>) subject).get(key), key, v, subjects);
- if (((List<Object>) ((Map<String, Object>) subject).get(key)).size() == 1) {
- // convert subject[key] to a single object if there
- // is only one object in the list
- ((Map<String, Object>) subject).put(key, ((List<Object>) ((Map<String, Object>) subject).get(key)).get(0));
- }
- }
- }
- }
- } else {
- // string value
- flattened = value;
- }
-
- if (flattened != null && parent != null) {
- if (parent instanceof List) {
- boolean duplicate = false;
- for (Object e : (List<Object>) parent) {
- if (JSONLDUtils.compareObjects(e, flattened) == 0) {
- duplicate = true;
- break;
- }
- }
- if (!duplicate) {
- ((List<Object>) parent).add(flattened);
- }
- } else {
- ((Map<String, Object>) parent).put(parentProperty, flattened);
- }
- }
- }
-
- private void collectEdges() {
- Map<String, Object> refs = (Map<String, Object>) this.edges.get("refs");
- Map<String, Object> props = (Map<String, Object>) this.edges.get("props");
-
- for (String iri : this.subjects.keySet()) {
- Map<String, Object> subject = (Map<String, Object>) this.subjects.get(iri);
- for (String key : subject.keySet()) {
- if (!key.equals("@id") && !ignoredKeywords.contains(key)) {
- Object object = subject.get(key);
- List<Object> tmp = null;
- if (object instanceof List) {
- tmp = (List<Object>) object;
- } else {
- tmp = new ArrayList<Object>();
- tmp.add(object);
- }
- for (Object o : tmp) {
- if (o instanceof Map && ((Map) o).containsKey("@id") && this.subjects.containsKey(((Map) o).get("@id"))) {
- Object objIri = ((Map<String, Object>) o).get("@id");
- Map<String, Object> tmp1 = new HashMap<String, Object>();
- tmp1.put("s", iri);
- tmp1.put("p", key);
- ((Map<String, List>) refs.get(objIri)).get("all").add(tmp1);
- tmp1 = new HashMap<String, Object>();
- tmp1.put("s", objIri);
- tmp1.put("p", key);
- ((Map<String, List>) props.get(iri)).get("all").add(tmp1);
- }
- }
- }
- }
- }
-
- Comparator<Object> edgesCmp = new Comparator<Object>() {
- public int compare(Object a, Object b) {
- return compareEdges(a, b);
- }
- };
-
- for (String iri : refs.keySet()) {
- List<Object> all = (List<Object>) ((Map<String, Object>) refs.get(iri)).get("all");
- Collections.sort(all, edgesCmp);
- List<Object> bnodes = new ArrayList<Object>();
- for (Object edge : all) {
- if (JSONLDUtils.isBlankNodeIri(((Map<String, Object>) edge).get("s"))) {
- bnodes.add(edge);
- }
- }
- ((Map<String, Object>) refs.get(iri)).put("bnodes", bnodes);
- }
- for (String iri : props.keySet()) {
- List<Object> all = (List<Object>) ((Map<String, Object>) props.get(iri)).get("all");
- Collections.sort(all, edgesCmp);
- List<Object> bnodes = new ArrayList<Object>();
- for (Object edge : all) {
- if (JSONLDUtils.isBlankNodeIri(((Map<String, Object>) edge).get("s"))) {
- bnodes.add(edge);
- }
- }
- ((Map<String, Object>) props.get(iri)).put("bnodes", bnodes);
- }
-
- }
-
- public void canonicalizeBlankNodes(List<Map<String, Object>> input) {
-
- this.renamed = new HashMap<String, Object>();
- this.serializations = new HashMap<String, Object>();
- this.edges = new HashMap<String, Object>();
- edges.put("refs", new HashMap<String, Object>());
- edges.put("props", new HashMap<String, Object>());
-
- this.subjects = new HashMap<String, Object>();
- List<Map<String, Object>> bnodes = new ArrayList<Map<String, Object>>();
-
- for (Map<String, Object> s : input) {
- String iri = (String) s.get("@id");
- subjects.put(iri, s);
- Map<String, Object> refs = (Map<String, Object>) edges.get("refs");
- Map<String, List> tmp = new HashMap<String, List>();
- tmp.put("all", new ArrayList<Object>());
- tmp.put("bnodes", new ArrayList<Object>());
- refs.put(iri, tmp);
- Map<String, Object> props = (Map<String, Object>) edges.get("props");
- tmp = new HashMap<String, List>();
- tmp.put("all", new ArrayList<Object>());
- tmp.put("bnodes", new ArrayList<Object>());
- props.put(iri, tmp);
-
- if (JSONLDUtils.isBlankNodeIri(iri)) {
- bnodes.add(s);
- }
- }
-
- collectEdges();
-
- this.ngc14n = new NameGenerator("c14n");
- NameGenerator c14n = this.ngc14n;
- NameGenerator ngTmp = this.ngtmp;
-
- for (Map<String, Object> bnode : bnodes) {
- String iri = (String) bnode.get("@id");
- if (c14n.inNamespace(iri)) {
- while (subjects.containsKey(ngTmp.next()))
- ;
- renameBlankNode(bnode, ngTmp.current());
- iri = (String) bnode.get("@id");
- }
- Map<String, Object> tmp = new HashMap<String, Object>();
- tmp.put("props", null);
- tmp.put("refs", null);
- serializations.put(iri, tmp);
- }
-
- Comparator<Map<String, Object>> bnodeSort = new Comparator<Map<String, Object>>() {
- private JSONLDProcessor processor;
-
- public Comparator<Map<String, Object>> setProcessor(JSONLDProcessor p) {
- processor = p;
- return this;
- }
-
- public int compare(Map<String, Object> a, Map<String, Object> b) {
- int rval = processor.deepCompareBlankNodes(a, b);
- return rval;
- }
- }.setProcessor(this);
-
- // keep sorting and naming blank nodes until they are all named
- boolean resort = true;
- while (bnodes.size() > 0) {
-
- if (resort) {
- resort = false;
- Collections.sort(bnodes, bnodeSort);
- }
-
- Map<String, Object> bnode = bnodes.get(0);
- bnodes.remove(0);
- String iri = (String) bnode.get("@id");
- resort = serializations.containsKey(iri) && ((Map<String, Object>) serializations.get(iri)).get("props") != null;
- Map<String, Object> mapping = null;
- for (String dir : new String[] { "props", "refs" }) {
- // if no serialization has been computed, name only the first
- // node
- if (serializations.containsKey(iri) && ((Map<String, Object>) serializations.get(iri)).containsKey(dir)
- && ((Map<String, Object>) serializations.get(iri)).get(dir) != null) {
- mapping = (Map<String, Object>) ((Map<String, Object>) ((Map<String, Object>) serializations.get(iri)).get(dir)).get("m");
- } else {
- mapping = new HashMap<String, Object>();
- mapping.put(iri, "s1");
- }
-
- // TODO: sort keys by value to name them in order
- List<String> keys = new ArrayList<String>(mapping.keySet());
- Collections.sort(keys, new Comparator<String>() {
- private Map<String, Object> mapping;
-
- public Comparator<String> setMapping(Map<String, Object> m) {
- this.mapping = m;
- return this;
- }
-
- public int compare(String a, String b) {
- return JSONLDUtils.compare(this.mapping.get(a), this.mapping.get(b));
- }
- }.setMapping(mapping));
-
- // name bnodes in mapping
- List<String> renamed = new ArrayList<String>();
- for (String iriK : keys) {
- if (!c14n.inNamespace(iri) && subjects.containsKey(iriK)) {
- renameBlankNode((Map<String, Object>) subjects.get(iriK), c14n.next());
- renamed.add(iriK);
- }
- }
-
- // only keep non-canonically named bnodes
- List<Map<String, Object>> tmp = bnodes;
- bnodes = new ArrayList<Map<String, Object>>();
- for (Map<String, Object> b : tmp) {
- String iriB = (String) b.get("@id");
- if (!c14n.inNamespace(iriB)) {
- for (Object i2 : renamed) {
- if (markSerializationDirty(iriB, i2, dir)) {
- resort = true;
- }
- }
- bnodes.add(b);
- }
- }
- }
- }
-
- for (String key : ((Map<String, Object>) edges.get("props")).keySet()) {
- if (((List<Object>) ((Map<String, Object>) ((Map<String, Object>) edges.get("props")).get(key)).get("bnodes")).size() > 0) {
- Map<String, Object> bnode = (Map<String, Object>) subjects.get(key);
- for (String p : bnode.keySet()) {
- if (!p.startsWith("@") && bnode.get(p) instanceof List) {
- Collections.sort((List<Object>) bnode.get(p), new Comparator<Object>() {
- public int compare(Object o1, Object o2) {
- return JSONLDUtils.compareObjects(o1, o2);
- }
-
- });
- }
- }
-
- }
- }
-
- }
-
- private boolean markSerializationDirty(String iri, Object changed, String dir) {
- boolean rval = false;
- Object s = serializations.get(iri);
- if (((Map<String, Object>) s).containsKey(dir) && ((Map<String, Object>) s).get(dir) != null
- && ((Map<String, Object>) ((Map<String, Object>) ((Map<String, Object>) s).get(dir)).get("m")).containsKey(changed)) {
- ((Map<String, Object>) s).put(dir, null);
- rval = true;
- }
- return rval;
- }
-
- private void renameBlankNode(Map<String, Object> b, String id) {
-
- String old = (String) b.get("@id");
- b.put("@id", id);
-
- subjects.put(id, subjects.get(old));
- subjects.remove(old);
-
- // update reference and property lists
- ((Map<String, Object>) edges.get("refs")).put(id, ((Map<String, Object>) edges.get("refs")).get(old));
- ((Map<String, Object>) edges.get("props")).put(id, ((Map<String, Object>) edges.get("props")).get(old));
- ((Map<String, Object>) edges.get("refs")).remove(old);
- ((Map<String, Object>) edges.get("props")).remove(old);
-
- // update references to this bnode
- List<Map<String, Object>> refs = (List<Map<String, Object>>) ((Map<String, Object>) ((Map<String, Object>) edges.get("refs")).get(id)).get("all");
- for (Map<String, Object> i : refs) {
- String iri = (String) i.get("s");
- if (iri.equals(old)) {
- iri = id;
- }
- Map<String, Object> ref = (Map<String, Object>) subjects.get(iri);
- List<Map<String, Object>> props = (List<Map<String, Object>>) ((Map<String, Object>) ((Map<String, Object>) edges.get("props")).get(iri))
- .get("all");
- for (Map<String, Object> i2 : props) {
- if (old.equals(i2.get("s"))) {
- i2.put("s", id);
- String p = (String) i2.get("p");
- List<Object> tmp = null;
- if (ref.get(p) instanceof Map) {
- tmp = new ArrayList<Object>();
- tmp.add(ref.get(p));
- } else if (ref.get(p) instanceof List) {
- tmp = (List<Object>) ref.get(p);
- } else {
- tmp = new ArrayList<Object>();
- }
-
- for (Object n : tmp) {
- if (n instanceof Map && ((Map) n).containsKey("@id") && old.equals(((Map<String, Object>) n).get("@id"))) {
- ((Map<String, Object>) n).put("@id", id);
- }
- }
- }
- }
- }
-
- // update references from this bnode
- List<Map<String, Object>> props = (List<Map<String, Object>>) ((Map<String, Object>) ((Map<String, Object>) edges.get("props")).get(id)).get("all");
- for (Map<String, Object> i : props) {
- String iri = (String) i.get("s");
- refs = (List<Map<String, Object>>) ((Map<String, Object>) ((Map<String, Object>) edges.get("refs")).get(iri)).get("all");
- for (Map<String, Object> r : refs) {
- if (old.equals(r.get("s"))) {
- r.put("s", id);
- }
- }
- }
- }
-
- private int deepCompareBlankNodes(Map<String, Object> a, Map<String, Object> b) {
- int rval = 0;
-
- String iriA = (String) a.get("@id");
- String iriB = (String) b.get("@id");
-
- if (iriA.equals(iriB)) {
- rval = 0;
- } else {
- // try a shallow compare first
- rval = shallowCompareBlankNodes(a, b);
-
- if (rval == 0) {
- // deep compare is needed
- String[] dirs = new String[] { "props", "refs" };
- for (int i = 0; rval == 0 && i < dirs.length; i++) {
- String dir = dirs[i];
- Map<String, Object> sA = (Map<String, Object>) serializations.get(iriA);
- Map<String, Object> sB = (Map<String, Object>) serializations.get(iriB);
- if (sA.get(dir) == null) {
- MappingBuilder mb = new MappingBuilder();
- if (dir.equals("refs")) {
- mb.mapping = (Map<String, String>) JSONLDUtils.clone(((Map<String, Object>) sA.get("props")).get("m"));
- mb.count = mb.mapping.size() + 1;
- }
- serializeBlankNode(sA, iriA, mb, dir);
- }
- if (sB.get(dir) == null) {
- MappingBuilder mb = new MappingBuilder();
- if (dir.equals("refs")) {
- mb.mapping = (Map<String, String>) JSONLDUtils.clone(((Map<String, Object>) sB.get("props")).get("m"));
- mb.count = mb.mapping.size() + 1;
- }
- serializeBlankNode(sB, iriB, mb, dir);
- }
-
- rval = JSONLDUtils.compare(((Map<String, Object>) sA.get(dir)).get("s"), ((Map<String, Object>) sB.get(dir)).get("s"));
- }
- }
- }
-
- return rval;
- }
-
- private void serializeBlankNode(Map<String, Object> s, String iri, MappingBuilder mb, String dir) {
- if (!(mb.processed.containsKey(iri))) {
- mb.processed.put(iri, true);
- String siri = mb.mapNode(iri);
-
- MappingBuilder original = mb.copy();
-
- List<Object> adj = (List<Object>) ((Map<String, Object>) ((Map<String, Object>) edges.get(dir)).get(iri)).get("bnodes");
- Map<String, Object> mapped = new HashMap<String, Object>();
- List<Object> notMapped = new ArrayList<Object>();
-
- for (Object i : adj) {
- if (mb.mapping.containsKey(((Map<String, Object>) i).get("s"))) {
- mapped.put(mb.mapping.get(((Map<String, Object>) i).get("s")), ((Map<String, Object>) i).get("s"));
- } else {
- notMapped.add(i);
- }
- }
-
- int combos = Math.max(1, notMapped.size());
- for (int i = 0; i < combos; ++i) {
- MappingBuilder m = (i == 0) ? mb : original.copy();
- serializeCombos(s, iri, siri, mb, dir, mapped, notMapped);
- }
- }
- }
-
- private void serializeCombos(Map<String, Object> s, String iri, String siri, MappingBuilder mb, String dir, Map<String, Object> mapped,
- List<Object> notMapped) {
- if (notMapped.size() > 0) {
- mapped = (Map<String, Object>) JSONLDUtils.clone(mapped);
- mapped.put(mb.mapNode((String) ((Map<String, Object>) notMapped.get(0)).get("s")), ((Map<String, Object>) notMapped.get(0)).get("s"));
-
- MappingBuilder original = mb.copy();
- notMapped.remove(0);
-
- int rotations = Math.max(1, notMapped.size());
- for (int r = 0; r < rotations; ++r) {
- MappingBuilder m = (r == 0) ? mb : original.copy();
- serializeCombos(s, iri, siri, m, dir, mapped, notMapped);
- JSONLDUtils.rotate(notMapped);
- }
- } else {
- List<String> keys = new ArrayList<String>(mapped.keySet());
- Collections.sort(keys);
- Map<String, Object> tmp = new HashMap<String, Object>();
- tmp.put("i", iri);
- tmp.put("k", keys);
- tmp.put("m", mapped);
- mb.adj.put(siri, tmp);
- mb.serialize(this.subjects, this.edges);
-
- if (s.get(dir) == null || JSONLDUtils.compareSerializations(mb.s, (String) ((Map<String, Object>) s.get(dir)).get("s")) <= 0) {
- for (String k : keys) {
- serializeBlankNode(s, (String) mapped.get(k), mb, dir);
- }
-
- mb.serialize(this.subjects, this.edges);
- if (s.get(dir) == null || JSONLDUtils.compareSerializations(mb.s, (String) ((Map<String, Object>) s.get(dir)).get("s")) <= 0
- && mb.s.length() >= ((String) ((Map<String, Object>) s.get(dir)).get("s")).length()) {
- tmp = new HashMap<String, Object>();
- tmp.put("s", mb.s);
- tmp.put("m", mb.mapping);
- s.put(dir, tmp);
- }
- }
- }
- }
-
- private int shallowCompareBlankNodes(Map<String, Object> a, Map<String, Object> b) {
- int rval = 0;
-
- List<String> pA = new ArrayList<String>();
- pA.addAll(a.keySet());
- List<String> pB = new ArrayList<String>();
- pB.addAll(b.keySet());
-
- rval = JSONLDUtils.compare(pA.size(), pB.size());
-
- if (rval == 0) {
- Collections.sort(pA);
- Collections.sort(pB);
- rval = JSONLDUtils.compare(pA, pB);
- }
-
- if (rval == 0) {
- rval = JSONLDUtils.compareBlankNodeObjects(a, b);
- }
-
- if (rval == 0) {
- List<Object> edgesA = (List<Object>) ((Map<String, Object>) ((Map<String, Object>) edges.get("refs")).get(a.get("@id"))).get("all");
- List<Object> edgesB = (List<Object>) ((Map<String, Object>) ((Map<String, Object>) edges.get("refs")).get(b.get("@id"))).get("all");
- rval = JSONLDUtils.compare(edgesA.size(), edgesB.size());
-
- if (rval == 0) {
- for (int i = 0; i < edgesA.size() && rval == 0; ++i) {
- rval = compareEdges(edgesA.get(i), edgesB.get(i));
- }
- }
- }
-
- return rval;
- }
-
- private int compareEdges(Object a, Object b) {
- int rval = 0;
-
- boolean bnodeA = JSONLDUtils.isBlankNodeIri(((Map<String, Object>) a).get("s"));
- boolean bnodeB = JSONLDUtils.isBlankNodeIri(((Map<String, Object>) b).get("s"));
- JSONLDUtils.NameGenerator c14n = ngc14n;
-
- if (bnodeA != bnodeB) {
- rval = bnodeA ? 1 : -1;
- } else {
-
- if (!bnodeA) {
- rval = JSONLDUtils.compare(((Map<String, Object>) a).get("s"), ((Map<String, Object>) b).get("s"));
- }
- if (rval == 0) {
- rval = JSONLDUtils.compare(((Map<String, Object>) a).get("p"), ((Map<String, Object>) b).get("p"));
- }
-
- if (rval == 0 && c14n != null) {
- boolean c14nA = c14n.inNamespace((String) ((Map<String, Object>) a).get("s"));
- boolean c14nB = c14n.inNamespace((String) ((Map<String, Object>) b).get("s"));
-
- if (c14nA != c14nB) {
- rval = c14nA ? 1 : -1;
- } else if (c14nA) {
- rval = JSONLDUtils.compare(((Map<String, Object>) a).get("s"), ((Map<String, Object>) b).get("s"));
- }
-
- }
-
- }
-
- return rval;
- }
-
- private void collectSubjects(Object input, Map<String, Object> subjects, List<Map<String, Object>> bnodes) {
- if (input == null) {
- return;
- } else if (input instanceof List) {
- for (Object o : (List<Object>) input) {
- collectSubjects(o, subjects, bnodes);
- }
- } else if (input instanceof Map) {
- if (((Map<String, Object>) input).containsKey("@id")) {
- Object id = ((Map<String, Object>) input).get("@id");
- if (id instanceof List) {
- // graph literal
- collectSubjects(id, subjects, bnodes);
- } else if (JSONLDUtils.isSubject(input)) {
- // named subject
- subjects.put((String) id, input);
- }
-
- } else if (JSONLDUtils.isBlankNode(input)) {
- bnodes.add((Map<String, Object>) input);
- }
-
- for (String key : ((Map<String, Object>) input).keySet()) {
- if (!ignoredKeywords.contains(key)) {
- collectSubjects(((Map<String, Object>) input).get(key), subjects, bnodes);
- }
- }
- }
- }
-
- /**
- * TODO: this whole thing should probably be optimized
- *
- * why doesn't Java make using maps and lists easy?!?!?!??!?
- *
- * @author tristan
- *
- */
- private class MappingBuilder {
-
- public MappingBuilder() {
- this.count = 1;
- this.processed = new HashMap<String, Boolean>();
- this.mapping = new HashMap<String, String>();
- this.adj = new HashMap<String, Object>();
-
- // this.keyStack = [{ keys: ['s1'], idx: 0 }];
- this.keyStack = new ArrayList<Object>();
- Map<String, Object> t1 = new HashMap<String, Object>();
- List<String> t2 = new ArrayList<String>();
- t2.add("s1");
- t1.put("keys", t2);
- t1.put("idx", 0);
- keyStack.add(t1);
- this.done = new HashMap<String, Boolean>();
- this.s = "";
- }
-
- public HashMap<String, Boolean> done;
- public ArrayList<Object> keyStack;
- public String s;
- public Map<String, Object> adj;
- public Map<String, Boolean> processed;
- public int count;
- public Map<String, String> mapping;
-
- /**
- * Maps the next name to the given bnode IRI if the bnode IRI isn't already in the mapping. If the given bnode IRI is canonical, then it will be given a
- * shortened form of the same name.
- *
- * @param iri
- * the blank node IRI to map the next name to.
- *
- * @return the mapped name.
- */
- public String mapNode(String iri) {
- if (!this.mapping.containsKey(iri)) {
- if (iri.startsWith("_:c14n")) {
- this.mapping.put(iri, "c" + iri.substring(6));
- } else {
- this.mapping.put(iri, "s" + this.count);
- this.count += 1;
- }
- }
- return this.mapping.get(iri);
- }
-
- public void serialize(Map<String, Object> subjects, Map<String, Object> edges) {
- if (this.keyStack.size() > 0) {
- Map<String, Object> next = (Map<String, Object>) this.keyStack.remove(this.keyStack.size() - 1);
- // for (; (Integer)next.get("idx") < ((List<String>)
- // next.get("keys")).size(); next.put("idx",
- // (Integer)next.get("idx")+1)) {
- while ((Integer) next.get("idx") < ((List<String>) next.get("keys")).size()) {
- String k = ((List<String>) next.get("keys")).get((Integer) next.get("idx"));
- if (!this.adj.containsKey(k)) {
- this.keyStack.add(next);
- break;
- }
- next.put("idx", (Integer) next.get("idx") + 1);
-
- if (this.done.containsKey(k)) {
- this.s += "_" + k;
- } else {
- this.done.put(k, true);
-
- String s = k;
- Map<String, Object> adj = (Map<String, Object>) this.adj.get(k);
- String iri = (String) adj.get("i");
- if (subjects.containsKey(iri)) {
- Map<String, Object> b = (Map<String, Object>) subjects.get(iri);
- s += "[" + JSONLDUtils.serializeProperties(b) + "]";
-
- Boolean first = true;
- s += "[";
- List<Map<String, Object>> refs = (List<Map<String, Object>>) ((Map<String, Object>) ((Map<String, Object>) edges.get("refs"))
- .get(iri)).get("all");
- for (Map<String, Object> r : refs) {
- if (first) {
- first = false;
- } else {
- s += "|";
- }
- s += "<" + r.get("p") + ">";
- s += JSONLDUtils.isBlankNodeIri(r.get("s")) ? "_:" : ("<" + r.get("s") + ">");
- }
- s += "]";
- }
-
- for (String o : (List<String>) adj.get("k")) {
- s += o;
- }
- this.s += s;
- Map<String, Object> tmp = new HashMap<String, Object>();
- tmp.put("keys", adj.get("k"));
- tmp.put("idx", 0);
- this.keyStack.add(tmp);
- this.serialize(subjects, edges);
- }
- }
- }
- }
-
- public MappingBuilder copy() {
- MappingBuilder rval = new MappingBuilder();
- rval.count = this.count;
- rval.processed = (Map<String, Boolean>) JSONLDUtils.clone(this.processed);
- rval.mapping = (Map<String, String>) JSONLDUtils.clone(this.mapping);
- rval.adj = (Map<String, Object>) JSONLDUtils.clone(this.adj);
- rval.keyStack = (ArrayList<Object>) JSONLDUtils.clone(this.keyStack);
- rval.done = (HashMap<String, Boolean>) JSONLDUtils.clone(this.done);
-
- rval.s = this.s;
- return rval;
- }
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/ext/java/de/dfki/km/json/jsonld/JSONLDSerializer.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/ext/java/de/dfki/km/json/jsonld/JSONLDSerializer.java b/commons/sesame-tools-rio-jsonld/src/ext/java/de/dfki/km/json/jsonld/JSONLDSerializer.java
deleted file mode 100644
index 5935071..0000000
--- a/commons/sesame-tools-rio-jsonld/src/ext/java/de/dfki/km/json/jsonld/JSONLDSerializer.java
+++ /dev/null
@@ -1,241 +0,0 @@
-package de.dfki.km.json.jsonld;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.io.Writer;
-
-import de.dfki.km.json.JSONUtils;
-
-/**
- * TODO:
- *
- * @author tristan
- *
- */
-public class JSONLDSerializer {
-
- private Map<String, Map<String, Object>> _subjects;
- private Map<String, Object> _context;
-
- JSONLDUtils.NameGenerator _ng;
- Map<String, String> _bns;
-
- public JSONLDSerializer() {
- reset();
- }
-
- /**
- * Resets the Serializer. Call this if you want to reuse the serializer for a different document
- */
- public void reset() {
- _subjects = new HashMap<String, Map<String, Object>>();
- _context = new HashMap<String, Object>();
- _context.put("rdf", JSONLDConsts.RDF_SYNTAX_NS);
- _context.put("rdfs", JSONLDConsts.RDF_SCHEMA_NS);
- _context.put("xsd", JSONLDConsts.XSD_NS);
-
- _ng = new JSONLDUtils.NameGenerator("bn");
- _bns = new HashMap<String, String>();
- }
-
- // some helper functions for extended classes
- protected Map<String, Object> getSubject(String subjURI) {
- return _subjects.get(subjURI);
- }
-
- protected void setSubject(String subjURI, Map<String, Object> subj) {
- _subjects.put(subjURI, subj);
- }
-
- protected String getNameForBlankNode(String node) {
- if (!_bns.containsKey(node)) {
- _bns.put(node, _ng.next());
- }
- return _bns.get(node);
- }
-
- /**
- * internal function to avoid repetition of code
- *
- * @param s
- * @param p
- * @param value
- */
- private void triple(String s, String p, Object value) {
- // get the cached object for this subject
- Map<String, Object> subj = _subjects.get(s);
- if (subj == null) {
- // if no cached object exists, create one.
- subj = new HashMap<String, Object>();
- _subjects.put(s, subj);
-
- // since this is the first time we're encountering this subject, add
- // it's @id key
- subj.put("@id", s);
- }
-
- // check for @type predicate
- if (JSONLDConsts.RDF_TYPE.equals(p)) {
- p = "@type";
- // type doesn't need to be (TODO: should it not be?) in an object
- if (value instanceof Map) {
- if (((Map) value).containsKey("@id")) {
- value = ((Map) value).get("@id");
- } else if (((Map) value).containsKey("@value")) {
- // this is a weird case, which probably shouldn't happen
- // but i'll account for it anyway.
- value = ((Map) value).get("@value");
- } // otherwise it's a string, leave it as such (TODO: it should
- // never be a list, but perhaps we should make sure)
- }
- }
-
- Object oldval = subj.get(p);
- // check if an existing value is present for this predicate
- if (oldval != null) {
- // if so, make the value a list (if it isn't already) and add the
- // new value to the end of the list
- // TODO: what if the value itself is a list, is this even possible?
- if (oldval instanceof List) {
- ((List) oldval).add(value);
- value = oldval;
- } else {
- List<Object> tmp = new ArrayList<Object>();
- tmp.add(oldval);
- tmp.add(value);
- value = tmp;
- }
- }
- // add the new value to the cache object
- subj.put(p, value);
- }
-
- /**
- * Call this to add a literal to the JSON-LD document
- *
- * @param s
- * the subjuct URI
- * @param p
- * the predicate URI
- * @param value
- * the literal value as a string
- * @param datatype
- * the datatype URI (if null, a plain literal is assumed)
- * @param language
- * the language (may be null, or an empty string)
- */
- public void triple(String s, String p, String value, String datatype, String language) {
-
- Object val;
- if (datatype == null || JSONLDConsts.XSD_STRING.equals(datatype)) {
- if (language == null || "".equals(language)) {
- val = value;
- } else {
- val = new HashMap<String, Object>();
- ((Map<String, Object>) val).put("@value", value);
- ((Map<String, Object>) val).put("@language", language);
- }
- } else {
- // compact the datatype (will return the same thing if no prefix has
- // been set for the uri)
- // datatype = JSONLDUtils.compactIRI(_context, datatype); NOTE:
- // going to leave this up to the user
- val = new HashMap<String, Object>();
- ((Map<String, Object>) val).put("@value", value);
- ((Map<String, Object>) val).put("@type", datatype);
- }
-
- triple(s, p, val);
- }
-
- /**
- * Call this to add a new object,predicate,object relation to the JSON-LD document
- *
- * @param s
- * the subject URI
- * @param p
- * the predicate URI
- * @param o
- * the object URI
- */
- public void triple(String s, String p, String o) {
- Map<String, Object> val = new HashMap<String, Object>();
- val.put("@id", o);
-
- // TODO: should we check if this object exists in the _subjects list and
- // add it if it doesn't?
- // this seems to be what the python rdflib serializer does, but it seems
- // redundant.
- triple(s, p, (Object) val);
- }
-
- public void setPrefix(String fullUri, String prefix) {
- _context.put(prefix, fullUri);
- }
-
- /**
- * Builds the JSON-LD document based on the currently stored triples, compacting the URIs based on the stored context.
- *
- * @return A Map representing the JSON-LD document.
- */
- public Object asObject() {
- JSONLDProcessor p = new JSONLDProcessor();
-
- // go through the list of subjects that were built, compact them based
- // of the current context
- // then add them to a subjects list
- List<Object> subjects = new ArrayList<Object>();
- for (Map<String, Object> subj : _subjects.values()) {
- subj = (Map<String, Object>) p.compact(_context, subj);
- subjects.add(subj);
- }
-
- if (subjects.size() == 1) {
- // if there is only one subject, make the base object this object
- Map<String, Object> rval = new HashMap<String, Object>();
- rval = (Map<String, Object>) subjects.get(0);
- rval.put("@context", _context);
- return rval;
- } else {
- return subjects;
- }
- }
-
- public void toWriter(Writer writer) {
- try {
- JSONUtils.writePrettyPrint(writer, asObject());
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- /**
- *
- * @return A String representing the JSON-LD document.
- */
- public String asString() {
- return asString(false);
- }
-
- /**
- * Returns a formated String representing the JSON-LD document using PrettyPrint writer.
- * @return A String representing the JSON-LD document.
- */
- public String asString(boolean prettyPrint) {
- // TODO: catching the exceptions here and returning JSON with the error
- // messages may not
- // be the best idea
- try {
- if (!prettyPrint)
- return JSONUtils.toString(asObject());
- else
- return JSONUtils.toPrettyString(asObject());
- } catch (Exception e) {
- return "{\"error\":\"" + e.getLocalizedMessage() + "\"}";
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/ext/java/de/dfki/km/json/jsonld/JSONLDTripleCallback.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/ext/java/de/dfki/km/json/jsonld/JSONLDTripleCallback.java b/commons/sesame-tools-rio-jsonld/src/ext/java/de/dfki/km/json/jsonld/JSONLDTripleCallback.java
deleted file mode 100644
index e332492..0000000
--- a/commons/sesame-tools-rio-jsonld/src/ext/java/de/dfki/km/json/jsonld/JSONLDTripleCallback.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package de.dfki.km.json.jsonld;
-
-public interface JSONLDTripleCallback {
- /**
- * Construct a triple with three URIs.
- *
- * @param s
- * The Subject URI
- * @param p
- * The Predicate URI
- * @param o
- * The Object URI
- * @return The generated triple, or null to force triple generation to stop
- */
- void triple(String s, String p, String o);
-
- /**
- * Constructs a triple with a Literal object, which may or may not contain a
- * language and/or a datatype.
- *
- * @param s
- * The Subject URI
- * @param p
- * The Predicate URI
- * @param value
- * The literal value
- * @param datatype
- * The literal datatype
- * @param language
- * The literal language (NOTE: may be null if not specified!)
- * @return The generated triple, or null to force triple generation to stop
- */
- void triple(String s, String p, String value, String datatype, String language);
-}
[2/7] MARMOTTA-261 : Remove sesame-tools-rio-jsonld
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0032-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0032-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0032-in.jsonld
deleted file mode 100644
index 2359444..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0032-in.jsonld
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#"
- },
- "@id": "_:b",
- "@type": "ex:Foo"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0032-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0032-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0032-out.jsonld
deleted file mode 100644
index 1d7f491..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0032-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0","@type":"http://example.org/vocab#Foo"}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0033-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0033-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0033-in.jsonld
deleted file mode 100644
index 33d4b17..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0033-in.jsonld
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#"
- },
- "@id": [
- {
- "@id": "_:a0",
- "ex:prop": {
- "@id": "_:a1"
- }
- },
- {
- "@id": "_:b0",
- "ex:prop": {
- "@id": "_:b1"
- }
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0033-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0033-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0033-out.jsonld
deleted file mode 100644
index 69a9786..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0033-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0"},{"@id":"_:c14n1","http://example.org/vocab#prop":{"@id":"_:c14n0"}},{"@id":"_:c14n2"},{"@id":"_:c14n3","http://example.org/vocab#prop":{"@id":"_:c14n2"}}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0034-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0034-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0034-in.jsonld
deleted file mode 100644
index 2909456..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0034-in.jsonld
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#"
- },
- "@id": [
- {
- "@id": "_:b0",
- "ex:prop": {
- "@id": "_:b1"
- }
- },
- {
- "@id": "_:a0",
- "ex:prop": {
- "@id": "_:a1"
- }
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0034-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0034-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0034-out.jsonld
deleted file mode 100644
index 69a9786..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0034-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0"},{"@id":"_:c14n1","http://example.org/vocab#prop":{"@id":"_:c14n0"}},{"@id":"_:c14n2"},{"@id":"_:c14n3","http://example.org/vocab#prop":{"@id":"_:c14n2"}}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0035-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0035-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0035-in.jsonld
deleted file mode 100644
index 8ba344b..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0035-in.jsonld
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#",
- "ex:p1": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": [
- {
- "@id": "_:a1",
- "ex:p1": "_:a3"
- },
- {
- "@id": "_:a2",
- "ex:p1": "_:a4"
- },
- {
- "@id": "_:a3",
- "ex:p2": "Foo"
- },
- {
- "@id": "_:a4",
- "ex:p2": "Foo"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0035-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0035-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0035-out.jsonld
deleted file mode 100644
index 1da3b40..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0035-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0","http://example.org/vocab#p1":{"@id":"_:c14n1"}},{"@id":"_:c14n1","http://example.org/vocab#p2":"Foo"},{"@id":"_:c14n2","http://example.org/vocab#p1":{"@id":"_:c14n3"}},{"@id":"_:c14n3","http://example.org/vocab#p2":"Foo"}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0036-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0036-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0036-in.jsonld
deleted file mode 100644
index 4b01746..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0036-in.jsonld
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#",
- "ex:p1": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": [
- {
- "@id": "_:a1",
- "ex:p1": "_:a4"
- },
- {
- "@id": "_:a2",
- "ex:p1": "_:a3"
- },
- {
- "@id": "_:a3",
- "ex:p2": "Foo"
- },
- {
- "@id": "_:a4",
- "ex:p2": "Foo"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0036-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0036-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0036-out.jsonld
deleted file mode 100644
index 1da3b40..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0036-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0","http://example.org/vocab#p1":{"@id":"_:c14n1"}},{"@id":"_:c14n1","http://example.org/vocab#p2":"Foo"},{"@id":"_:c14n2","http://example.org/vocab#p1":{"@id":"_:c14n3"}},{"@id":"_:c14n3","http://example.org/vocab#p2":"Foo"}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0037-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0037-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0037-in.jsonld
deleted file mode 100644
index 252c8ea..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0037-in.jsonld
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#",
- "ex:p1": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": [
- {
- "@id": "_:b1",
- "ex:p1": "_:b4"
- },
- {
- "@id": "_:b2",
- "ex:p1": "_:b3"
- },
- {
- "@id": "_:b3",
- "ex:p2": "Foo"
- },
- {
- "@id": "_:b4",
- "ex:p2": "Foo"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0037-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0037-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0037-out.jsonld
deleted file mode 100644
index 1da3b40..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0037-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0","http://example.org/vocab#p1":{"@id":"_:c14n1"}},{"@id":"_:c14n1","http://example.org/vocab#p2":"Foo"},{"@id":"_:c14n2","http://example.org/vocab#p1":{"@id":"_:c14n3"}},{"@id":"_:c14n3","http://example.org/vocab#p2":"Foo"}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0038-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0038-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0038-in.jsonld
deleted file mode 100644
index 03b6d60..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0038-in.jsonld
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#",
- "ex:p1": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": [
- {
- "@id": "_:a0",
- "ex:p1": [
- "_:a1",
- "_:a2"
- ]
- },
- {
- "@id": "_:a1",
- "ex:p1": "_:a3"
- },
- {
- "@id": "_:a2"
- },
- {
- "@id": "_:a3"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0038-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0038-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0038-out.jsonld
deleted file mode 100644
index 8f8fb4b..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0038-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0"},{"@id":"_:c14n1","http://example.org/vocab#p1":{"@id":"_:c14n0"}},{"@id":"_:c14n2","http://example.org/vocab#p1":[{"@id":"_:c14n1"},{"@id":"_:c14n3"}]},{"@id":"_:c14n3"}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0039-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0039-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0039-in.jsonld
deleted file mode 100644
index e340db7..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0039-in.jsonld
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#",
- "ex:p1": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": [
- {
- "@id": "_:b0",
- "ex:p1": [
- {},
- "_:b2"
- ]
- },
- {
- "@id": "_:b2",
- "ex:p1": {}
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0039-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0039-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0039-out.jsonld
deleted file mode 100644
index 8f8fb4b..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0039-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0"},{"@id":"_:c14n1","http://example.org/vocab#p1":{"@id":"_:c14n0"}},{"@id":"_:c14n2","http://example.org/vocab#p1":[{"@id":"_:c14n1"},{"@id":"_:c14n3"}]},{"@id":"_:c14n3"}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0040-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0040-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0040-in.jsonld
deleted file mode 100644
index 6a8201e..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0040-in.jsonld
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#",
- "ex:p1": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": [
- {
- "@id": "_:b1",
- "ex:p1": "_:b2"
- },
- {
- "@id": "_:b2",
- "ex:p1": "_:b3"
- },
- {
- "@id": "_:b3"
- },
- {
- "@id": "_:c1",
- "ex:p1": "_:c2"
- },
- {
- "@id": "_:c2",
- "ex:p1": "_:c3"
- },
- {
- "@id": "_:c3"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0040-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0040-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0040-out.jsonld
deleted file mode 100644
index 2600730..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0040-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0"},{"@id":"_:c14n1","http://example.org/vocab#p1":{"@id":"_:c14n0"}},{"@id":"_:c14n2","http://example.org/vocab#p1":{"@id":"_:c14n1"}},{"@id":"_:c14n3"},{"@id":"_:c14n4","http://example.org/vocab#p1":{"@id":"_:c14n3"}},{"@id":"_:c14n5","http://example.org/vocab#p1":{"@id":"_:c14n4"}}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0041-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0041-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0041-in.jsonld
deleted file mode 100644
index 1015f12..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0041-in.jsonld
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#",
- "ex:p1": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": [
- {
- "@id": "_:b1",
- "ex:p1": "_:b2"
- },
- {
- "@id": "_:b2",
- "ex:p1": "_:b3"
- },
- {
- "@id": "_:b3"
- },
- {
- "@id": "_:b4",
- "ex:p1": "_:b5"
- },
- {
- "@id": "_:b5",
- "ex:p1": "_:b6"
- },
- {
- "@id": "_:b6"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0041-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0041-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0041-out.jsonld
deleted file mode 100644
index 2600730..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0041-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0"},{"@id":"_:c14n1","http://example.org/vocab#p1":{"@id":"_:c14n0"}},{"@id":"_:c14n2","http://example.org/vocab#p1":{"@id":"_:c14n1"}},{"@id":"_:c14n3"},{"@id":"_:c14n4","http://example.org/vocab#p1":{"@id":"_:c14n3"}},{"@id":"_:c14n5","http://example.org/vocab#p1":{"@id":"_:c14n4"}}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0042-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0042-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0042-in.jsonld
deleted file mode 100644
index ab0a3cc..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0042-in.jsonld
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#",
- "ex:p1": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": [
- {
- "@id": "_:b1",
- "ex:p1": "_:b3"
- },
- {
- "@id": "_:b3",
- "ex:p1": {}
- },
- {
- "@id": "_:b5",
- "ex:p1": "_:b6"
- },
- {
- "@id": "_:b6",
- "ex:p1": {}
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0042-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0042-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0042-out.jsonld
deleted file mode 100644
index 2600730..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0042-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0"},{"@id":"_:c14n1","http://example.org/vocab#p1":{"@id":"_:c14n0"}},{"@id":"_:c14n2","http://example.org/vocab#p1":{"@id":"_:c14n1"}},{"@id":"_:c14n3"},{"@id":"_:c14n4","http://example.org/vocab#p1":{"@id":"_:c14n3"}},{"@id":"_:c14n5","http://example.org/vocab#p1":{"@id":"_:c14n4"}}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0043-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0043-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0043-in.jsonld
deleted file mode 100644
index 5ab536c..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0043-in.jsonld
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#"
- },
- "@id": "http://example.org/test",
- "ex:test": {
- "@language": "en",
- "@value": "test"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0043-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0043-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0043-out.jsonld
deleted file mode 100644
index 7e2f2f5..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0043-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"http://example.org/test","http://example.org/vocab#test":{"@language":"en","@value":"test"}}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0044-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0044-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0044-in.jsonld
deleted file mode 100644
index 362fae9..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0044-in.jsonld
+++ /dev/null
@@ -1,107 +0,0 @@
-{
- "@context": {
- "eg": "http://example.org/vocab#",
- "eg:p": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": [
- {
- "@id": "_:b1",
- "eg:p": [
- "_:b2",
- "_:b4",
- "_:b3"
- ]
- },
- {
- "@id": "_:b2",
- "eg:p": [
- "_:b1",
- "_:b3",
- "_:b5"
- ]
- },
- {
- "@id": "_:b3",
- "eg:p": [
- "_:b1",
- "_:b2",
- "_:b6"
- ]
- },
- {
- "@id": "_:b4",
- "eg:p": [
- "_:b1",
- "_:b5",
- "_:b6"
- ]
- },
- {
- "@id": "_:b5",
- "eg:p": [
- "_:b2",
- "_:b4",
- "_:b6"
- ]
- },
- {
- "@id": "_:b6",
- "eg:p": [
- "_:b3",
- "_:b4",
- "_:b5"
- ]
- },
- {
- "@id": "_:c1",
- "eg:p": [
- "_:c4",
- "_:c5",
- "_:c6"
- ]
- },
- {
- "@id": "_:c2",
- "eg:p": [
- "_:c4",
- "_:c5",
- "_:c6"
- ]
- },
- {
- "@id": "_:c3",
- "eg:p": [
- "_:c4",
- "_:c5",
- "_:c6"
- ]
- },
- {
- "@id": "_:c4",
- "eg:p": [
- "_:c1",
- "_:c2",
- "_:c3"
- ]
- },
- {
- "@id": "_:c5",
- "eg:p": [
- "_:c1",
- "_:c2",
- "_:c3"
- ]
- },
- {
- "@id": "_:c6",
- "eg:p": [
- "_:c1",
- "_:c2",
- "_:c3"
- ]
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0044-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0044-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0044-out.jsonld
deleted file mode 100644
index 04e86c9..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0044-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0","http://example.org/vocab#p":[{"@id":"_:c14n1"},{"@id":"_:c14n2"},{"@id":"_:c14n3"}]},{"@id":"_:c14n1","http://example.org/vocab#p":[{"@id":"_:c14n0"},{"@id":"_:c14n2"},{"@id":"_:c14n4"}]},{"@id":"_:c14n10","http://example.org/vocab#p":[{"@id":"_:c14n7"},{"@id":"_:c14n8"},{"@id":"_:c14n9"}]},{"@id":"_:c14n11","http://example.org/vocab#p":[{"@id":"_:c14n7"},{"@id":"_:c14n8"},{"@id":"_:c14n9"}]},{"@id":"_:c14n2","http://example.org/vocab#p":[{"@id":"_:c14n0"},{"@id":"_:c14n1"},{"@id":"_:c14n5"}]},{"@id":"_:c14n3","http://example.org/vocab#p":[{"@id":"_:c14n0"},{"@id":"_:c14n4"},{"@id":"_:c14n5"}]},{"@id":"_:c14n4","http://example.org/vocab#p":[{"@id":"_:c14n1"},{"@id":"_:c14n3"},{"@id":"_:c14n5"}]},{"@id":"_:c14n5","http://example.org/vocab#p":[{"@id":"_:c14n2"},{"@id":"_:c14n3"},{"@id":"_:c14n4"}]},{"@id":"_:c14n6","http://example.org/vocab#p":[{"@id":"_:c14n7"},{"@id":"_:c14n8"},{"@id":"_:c14n9"}]},{"@id":"_:c14n7","http://example.org/vocab#p":[{"@id":"_:c14n10"},{
"@id":"_:c14n11"},{"@id":"_:c14n6"}]},{"@id":"_:c14n8","http://example.org/vocab#p":[{"@id":"_:c14n10"},{"@id":"_:c14n11"},{"@id":"_:c14n6"}]},{"@id":"_:c14n9","http://example.org/vocab#p":[{"@id":"_:c14n10"},{"@id":"_:c14n11"},{"@id":"_:c14n6"}]}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0045-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0045-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0045-in.jsonld
deleted file mode 100644
index 32dfac1..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0045-in.jsonld
+++ /dev/null
@@ -1,107 +0,0 @@
-{
- "@context": {
- "eg": "http://example.org/vocab#",
- "eg:p": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": [
- {
- "@id": "_:c1",
- "eg:p": [
- "_:c4",
- "_:c5",
- "_:c6"
- ]
- },
- {
- "@id": "_:c2",
- "eg:p": [
- "_:c4",
- "_:c5",
- "_:c6"
- ]
- },
- {
- "@id": "_:c3",
- "eg:p": [
- "_:c4",
- "_:c5",
- "_:c6"
- ]
- },
- {
- "@id": "_:c4",
- "eg:p": [
- "_:c1",
- "_:c2",
- "_:c3"
- ]
- },
- {
- "@id": "_:c5",
- "eg:p": [
- "_:c1",
- "_:c2",
- "_:c3"
- ]
- },
- {
- "@id": "_:c6",
- "eg:p": [
- "_:c1",
- "_:c2",
- "_:c3"
- ]
- },
- {
- "@id": "_:b1",
- "eg:p": [
- "_:b2",
- "_:b4",
- "_:b3"
- ]
- },
- {
- "@id": "_:b2",
- "eg:p": [
- "_:b1",
- "_:b3",
- "_:b5"
- ]
- },
- {
- "@id": "_:b3",
- "eg:p": [
- "_:b1",
- "_:b2",
- "_:b6"
- ]
- },
- {
- "@id": "_:b4",
- "eg:p": [
- "_:b1",
- "_:b5",
- "_:b6"
- ]
- },
- {
- "@id": "_:b5",
- "eg:p": [
- "_:b2",
- "_:b4",
- "_:b6"
- ]
- },
- {
- "@id": "_:b6",
- "eg:p": [
- "_:b3",
- "_:b4",
- "_:b5"
- ]
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0045-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0045-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0045-out.jsonld
deleted file mode 100644
index 04e86c9..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0045-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0","http://example.org/vocab#p":[{"@id":"_:c14n1"},{"@id":"_:c14n2"},{"@id":"_:c14n3"}]},{"@id":"_:c14n1","http://example.org/vocab#p":[{"@id":"_:c14n0"},{"@id":"_:c14n2"},{"@id":"_:c14n4"}]},{"@id":"_:c14n10","http://example.org/vocab#p":[{"@id":"_:c14n7"},{"@id":"_:c14n8"},{"@id":"_:c14n9"}]},{"@id":"_:c14n11","http://example.org/vocab#p":[{"@id":"_:c14n7"},{"@id":"_:c14n8"},{"@id":"_:c14n9"}]},{"@id":"_:c14n2","http://example.org/vocab#p":[{"@id":"_:c14n0"},{"@id":"_:c14n1"},{"@id":"_:c14n5"}]},{"@id":"_:c14n3","http://example.org/vocab#p":[{"@id":"_:c14n0"},{"@id":"_:c14n4"},{"@id":"_:c14n5"}]},{"@id":"_:c14n4","http://example.org/vocab#p":[{"@id":"_:c14n1"},{"@id":"_:c14n3"},{"@id":"_:c14n5"}]},{"@id":"_:c14n5","http://example.org/vocab#p":[{"@id":"_:c14n2"},{"@id":"_:c14n3"},{"@id":"_:c14n4"}]},{"@id":"_:c14n6","http://example.org/vocab#p":[{"@id":"_:c14n7"},{"@id":"_:c14n8"},{"@id":"_:c14n9"}]},{"@id":"_:c14n7","http://example.org/vocab#p":[{"@id":"_:c14n10"},{
"@id":"_:c14n11"},{"@id":"_:c14n6"}]},{"@id":"_:c14n8","http://example.org/vocab#p":[{"@id":"_:c14n10"},{"@id":"_:c14n11"},{"@id":"_:c14n6"}]},{"@id":"_:c14n9","http://example.org/vocab#p":[{"@id":"_:c14n10"},{"@id":"_:c14n11"},{"@id":"_:c14n6"}]}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0046-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0046-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0046-in.jsonld
deleted file mode 100644
index 30b8322..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0046-in.jsonld
+++ /dev/null
@@ -1,107 +0,0 @@
-{
- "@context": {
- "eg": "http://example.org/vocab#",
- "eg:p": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": [
- {
- "@id": "_:b6",
- "eg:p": [
- "_:b3",
- "_:b4",
- "_:b5"
- ]
- },
- {
- "@id": "_:c1",
- "eg:p": [
- "_:c6",
- "_:c5",
- "_:c4"
- ]
- },
- {
- "@id": "_:b1",
- "eg:p": [
- "_:b3",
- "_:b4",
- "_:b2"
- ]
- },
- {
- "@id": "_:c4",
- "eg:p": [
- "_:c3",
- "_:c2",
- "_:c1"
- ]
- },
- {
- "@id": "_:c5",
- "eg:p": [
- "_:c1",
- "_:c2",
- "_:c3"
- ]
- },
- {
- "@id": "_:c6",
- "eg:p": [
- "_:c3",
- "_:c1",
- "_:c2"
- ]
- },
- {
- "@id": "_:b2",
- "eg:p": [
- "_:b1",
- "_:b5",
- "_:b3"
- ]
- },
- {
- "@id": "_:c2",
- "eg:p": [
- "_:c6",
- "_:c5",
- "_:c4"
- ]
- },
- {
- "@id": "_:b5",
- "eg:p": [
- "_:b6",
- "_:b4",
- "_:b2"
- ]
- },
- {
- "@id": "_:b3",
- "eg:p": [
- "_:b6",
- "_:b2",
- "_:b1"
- ]
- },
- {
- "@id": "_:b4",
- "eg:p": [
- "_:b5",
- "_:b1",
- "_:b6"
- ]
- },
- {
- "@id": "_:c3",
- "eg:p": [
- "_:c5",
- "_:c4",
- "_:c6"
- ]
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0046-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0046-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0046-out.jsonld
deleted file mode 100644
index 04e86c9..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0046-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0","http://example.org/vocab#p":[{"@id":"_:c14n1"},{"@id":"_:c14n2"},{"@id":"_:c14n3"}]},{"@id":"_:c14n1","http://example.org/vocab#p":[{"@id":"_:c14n0"},{"@id":"_:c14n2"},{"@id":"_:c14n4"}]},{"@id":"_:c14n10","http://example.org/vocab#p":[{"@id":"_:c14n7"},{"@id":"_:c14n8"},{"@id":"_:c14n9"}]},{"@id":"_:c14n11","http://example.org/vocab#p":[{"@id":"_:c14n7"},{"@id":"_:c14n8"},{"@id":"_:c14n9"}]},{"@id":"_:c14n2","http://example.org/vocab#p":[{"@id":"_:c14n0"},{"@id":"_:c14n1"},{"@id":"_:c14n5"}]},{"@id":"_:c14n3","http://example.org/vocab#p":[{"@id":"_:c14n0"},{"@id":"_:c14n4"},{"@id":"_:c14n5"}]},{"@id":"_:c14n4","http://example.org/vocab#p":[{"@id":"_:c14n1"},{"@id":"_:c14n3"},{"@id":"_:c14n5"}]},{"@id":"_:c14n5","http://example.org/vocab#p":[{"@id":"_:c14n2"},{"@id":"_:c14n3"},{"@id":"_:c14n4"}]},{"@id":"_:c14n6","http://example.org/vocab#p":[{"@id":"_:c14n7"},{"@id":"_:c14n8"},{"@id":"_:c14n9"}]},{"@id":"_:c14n7","http://example.org/vocab#p":[{"@id":"_:c14n10"},{
"@id":"_:c14n11"},{"@id":"_:c14n6"}]},{"@id":"_:c14n8","http://example.org/vocab#p":[{"@id":"_:c14n10"},{"@id":"_:c14n11"},{"@id":"_:c14n6"}]},{"@id":"_:c14n9","http://example.org/vocab#p":[{"@id":"_:c14n10"},{"@id":"_:c14n11"},{"@id":"_:c14n6"}]}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0047-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0047-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0047-in.jsonld
deleted file mode 100644
index 73235dc..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0047-in.jsonld
+++ /dev/null
@@ -1,49 +0,0 @@
-{
- "@context": {
- "eg": "http://example.org/vocab#",
- "eg:p": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": [
- {
- "@id": "_:b1",
- "eg:p": [
- "_:b2"
- ]
- },
- {
- "@id": "_:b2",
- "eg:p": [
- "_:b3"
- ]
- },
- {
- "@id": "_:b3",
- "eg:z": [
- "foo1",
- "foo2"
- ]
- },
- {
- "@id": "_:c1",
- "eg:p": [
- "_:c2"
- ]
- },
- {
- "@id": "_:c2",
- "eg:p": [
- "_:c3"
- ]
- },
- {
- "@id": "_:c3",
- "eg:z": [
- "bar1",
- "bar2"
- ]
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0047-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0047-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0047-out.jsonld
deleted file mode 100644
index e890491..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0047-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0","http://example.org/vocab#p":{"@id":"_:c14n1"}},{"@id":"_:c14n1","http://example.org/vocab#p":{"@id":"_:c14n2"}},{"@id":"_:c14n2","http://example.org/vocab#z":["bar1","bar2"]},{"@id":"_:c14n3","http://example.org/vocab#p":{"@id":"_:c14n4"}},{"@id":"_:c14n4","http://example.org/vocab#p":{"@id":"_:c14n5"}},{"@id":"_:c14n5","http://example.org/vocab#z":["foo1","foo2"]}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0048-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0048-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0048-in.jsonld
deleted file mode 100644
index b906670..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0048-in.jsonld
+++ /dev/null
@@ -1,49 +0,0 @@
-{
- "@context": {
- "eg": "http://example.org/vocab#",
- "eg:p": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": [
- {
- "@id": "_:c1",
- "eg:p": [
- "_:c2"
- ]
- },
- {
- "@id": "_:c2",
- "eg:p": [
- "_:c3"
- ]
- },
- {
- "@id": "_:c3",
- "eg:z": [
- "bar1",
- "bar2"
- ]
- },
- {
- "@id": "_:b1",
- "eg:p": [
- "_:b2"
- ]
- },
- {
- "@id": "_:b2",
- "eg:p": [
- "_:b3"
- ]
- },
- {
- "@id": "_:b3",
- "eg:z": [
- "foo1",
- "foo2"
- ]
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0048-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0048-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0048-out.jsonld
deleted file mode 100644
index e890491..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0048-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0","http://example.org/vocab#p":{"@id":"_:c14n1"}},{"@id":"_:c14n1","http://example.org/vocab#p":{"@id":"_:c14n2"}},{"@id":"_:c14n2","http://example.org/vocab#z":["bar1","bar2"]},{"@id":"_:c14n3","http://example.org/vocab#p":{"@id":"_:c14n4"}},{"@id":"_:c14n4","http://example.org/vocab#p":{"@id":"_:c14n5"}},{"@id":"_:c14n5","http://example.org/vocab#z":["foo1","foo2"]}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0049-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0049-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0049-in.jsonld
deleted file mode 100644
index 9ef190e..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0049-in.jsonld
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "@context": {
- "eg": "http://example.org/vocab#",
- "eg:p": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": "http://example.org/test#example",
- "eg:p": null
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0049-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0049-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0049-out.jsonld
deleted file mode 100644
index aa595db..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0049-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"http://example.org/test#example"}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0050-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0050-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0050-in.jsonld
deleted file mode 100644
index 15d342f..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0050-in.jsonld
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "@context": {
- "eg": "http://example.org/vocab#",
- "eg:p": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": "_:c1",
- "eg:array": [
- "value",
- null
- ],
- "eg:doc": "Test 'null' in various locations",
- "eg:null": null,
- "eg:object": {
- "prop1": "value1",
- "prop2": null
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0050-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0050-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0050-out.jsonld
deleted file mode 100644
index a061fd0..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0050-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"_:c14n0","prop1":"value1"},{"@id":"_:c14n1","http://example.org/vocab#array":"value","http://example.org/vocab#doc":"Test 'null' in various locations","http://example.org/vocab#object":{"@id":"_:c14n0"}}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0051-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0051-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0051-in.jsonld
deleted file mode 100644
index 52e673b..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0051-in.jsonld
+++ /dev/null
@@ -1,14 +0,0 @@
-[
- {
- "@id": "http://example.org/test#example",
- "http://example.org/test#property": "object1"
- },
- {
- "@id": "http://example.org/test#example",
- "http://example.org/test#property": "object2"
- },
- {
- "@id": "http://example.org/test#example",
- "http://example.org/test#property": "object3"
- }
-]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0051-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0051-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0051-out.jsonld
deleted file mode 100644
index 9540db4..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0051-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"http://example.org/test#example","http://example.org/test#property":["object1","object2","object3"]}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0052-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0052-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0052-in.jsonld
deleted file mode 100644
index 37f9ecb..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0052-in.jsonld
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "@context": {
- "http://example.org/test#property1": {
- "@type": "uri"
- },
- "http://example.org/test#property2": {
- "@type": "uri"
- },
- "uri": "@id"
- },
- "http://example.org/test#property1": {
- "http://example.org/test#property4": "foo",
- "uri": "http://example.org/test#example2"
- },
- "http://example.org/test#property2": "http://example.org/test#example3",
- "http://example.org/test#property3": {
- "uri": "http://example.org/test#example4"
- },
- "uri": "http://example.org/test#example1"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0052-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0052-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0052-out.jsonld
deleted file mode 100644
index 39fdbce..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-0052-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-[{"@id":"http://example.org/test#example1","http://example.org/test#property1":{"@id":"http://example.org/test#example2"},"http://example.org/test#property2":{"@id":"http://example.org/test#example3"},"http://example.org/test#property3":{"@id":"http://example.org/test#example4"}},{"@id":"http://example.org/test#example2","http://example.org/test#property4":"foo"},{"@id":"http://example.org/test#example3"},{"@id":"http://example.org/test#example4"}]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-manifest.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-manifest.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-manifest.jsonld
deleted file mode 100644
index bf36434..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/normalize-manifest.jsonld
+++ /dev/null
@@ -1,268 +0,0 @@
-{
- "@context": "http://json-ld.org/test-suite/context.jsonld",
- "@id": "",
- "@type": "jld:Manifest",
- "rdfs:comment": "JSON-LD to Expansion tests use object compare",
- "name": "normalize",
- "sequence": [{
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "simple id",
- "input": "normalize-0001-in.jsonld",
- "expect": "normalize-0001-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "duplicate property iri values",
- "input": "normalize-0002-in.jsonld",
- "expect": "normalize-0002-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "bnode",
- "input": "normalize-0003-in.jsonld",
- "expect": "normalize-0003-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "bnode plus embed w/subject",
- "input": "normalize-0004-in.jsonld",
- "expect": "normalize-0004-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "bnode embed",
- "input": "normalize-0005-in.jsonld",
- "expect": "normalize-0005-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "multiple rdf types",
- "input": "normalize-0006-in.jsonld",
- "expect": "normalize-0006-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "coerce CURIE value",
- "input": "normalize-0007-in.jsonld",
- "expect": "normalize-0007-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "single subject complex",
- "input": "normalize-0008-in.jsonld",
- "expect": "normalize-0008-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "multiple subjects - complex",
- "input": "normalize-0009-in.jsonld",
- "expect": "normalize-0009-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "type",
- "input": "normalize-0010-in.jsonld",
- "expect": "normalize-0010-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "type-coerced type",
- "input": "normalize-0011-in.jsonld",
- "expect": "normalize-0011-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "type-coerced type, remove duplicate reference",
- "input": "normalize-0012-in.jsonld",
- "expect": "normalize-0012-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "type-coerced type, cycle",
- "input": "normalize-0013-in.jsonld",
- "expect": "normalize-0013-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "check types",
- "input": "normalize-0014-in.jsonld",
- "expect": "normalize-0014-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "top level context",
- "input": "normalize-0015-in.jsonld",
- "expect": "normalize-0015-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "blank node - dual link - embed",
- "input": "normalize-0016-in.jsonld",
- "expect": "normalize-0016-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "blank node - dual link - non-embed",
- "input": "normalize-0017-in.jsonld",
- "expect": "normalize-0017-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "blank node - self link",
- "input": "normalize-0018-in.jsonld",
- "expect": "normalize-0018-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "blank node - disjoint self links",
- "input": "normalize-0019-in.jsonld",
- "expect": "normalize-0019-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "blank node - diamond",
- "input": "normalize-0020-in.jsonld",
- "expect": "normalize-0020-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "blank node - circle of 2",
- "input": "normalize-0021-in.jsonld",
- "expect": "normalize-0021-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "blank node - double circle of 2",
- "input": "normalize-0022-in.jsonld",
- "expect": "normalize-0022-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "blank node - circle of 3",
- "input": "normalize-0023-in.jsonld",
- "expect": "normalize-0023-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "blank node - double circle of 3 (1-2-3)",
- "input": "normalize-0024-in.jsonld",
- "expect": "normalize-0024-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "blank node - double circle of 3 (1-3-2)",
- "input": "normalize-0025-in.jsonld",
- "expect": "normalize-0025-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "blank node - double circle of 3 (2-1-3)",
- "input": "normalize-0026-in.jsonld",
- "expect": "normalize-0026-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "blank node - double circle of 3 (2-3-1)",
- "input": "normalize-0027-in.jsonld",
- "expect": "normalize-0027-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "blank node - double circle of 3 (3-2-1)",
- "input": "normalize-0028-in.jsonld",
- "expect": "normalize-0028-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "blank node - double circle of 3 (3-1-2)",
- "input": "normalize-0029-in.jsonld",
- "expect": "normalize-0029-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "blank node - point at circle of 3",
- "input": "normalize-0030-in.jsonld",
- "expect": "normalize-0030-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "bnode (1)",
- "input": "normalize-0031-in.jsonld",
- "expect": "normalize-0031-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "bnode (2)",
- "input": "normalize-0032-in.jsonld",
- "expect": "normalize-0032-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "disjoint identical subgraphs (1)",
- "input": "normalize-0033-in.jsonld",
- "expect": "normalize-0033-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "disjoint identical subgraphs (2)",
- "input": "normalize-0034-in.jsonld",
- "expect": "normalize-0034-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "reordered w/strings (1)",
- "input": "normalize-0035-in.jsonld",
- "expect": "normalize-0035-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "reordered w/strings (2)",
- "input": "normalize-0036-in.jsonld",
- "expect": "normalize-0036-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "reordered w/strings (3)",
- "input": "normalize-0037-in.jsonld",
- "expect": "normalize-0037-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "reordered 4 bnodes, reordered 2 properties (1)",
- "input": "normalize-0038-in.jsonld",
- "expect": "normalize-0038-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "reordered 4 bnodes, reordered 2 properties (2)",
- "input": "normalize-0039-in.jsonld",
- "expect": "normalize-0039-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "reordered 6 bnodes (1)",
- "input": "normalize-0040-in.jsonld",
- "expect": "normalize-0040-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "reordered 6 bnodes (2)",
- "input": "normalize-0041-in.jsonld",
- "expect": "normalize-0041-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "reordered 6 bnodes (3)",
- "input": "normalize-0042-in.jsonld",
- "expect": "normalize-0042-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "literal with language",
- "input": "normalize-0043-in.jsonld",
- "expect": "normalize-0043-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "evil (1)",
- "input": "normalize-0044-in.jsonld",
- "expect": "normalize-0044-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "evil (2)",
- "input": "normalize-0045-in.jsonld",
- "expect": "normalize-0045-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "evil (3)",
- "input": "normalize-0046-in.jsonld",
- "expect": "normalize-0046-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "deep diff (1)",
- "input": "normalize-0047-in.jsonld",
- "expect": "normalize-0047-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "deep diff (2)",
- "input": "normalize-0048-in.jsonld",
- "expect": "normalize-0048-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "remove null",
- "input": "normalize-0049-in.jsonld",
- "expect": "normalize-0049-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "nulls",
- "input": "normalize-0050-in.jsonld",
- "expect": "normalize-0050-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "merging subjects",
- "input": "normalize-0051-in.jsonld",
- "expect": "normalize-0051-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:NormalizeTest"],
- "name": "alias keywords",
- "input": "normalize-0052-in.jsonld",
- "expect": "normalize-0052-out.jsonld"
- }]
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0001.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0001.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0001.jsonld
deleted file mode 100644
index fc4e381..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0001.jsonld
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@id": "http://greggkellogg.net/foaf#me",
- "http://xmlns.com/foaf/0.1/name": "Gregg Kellogg"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0001.sparql
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0001.sparql b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0001.sparql
deleted file mode 100644
index 2e277df..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0001.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-
-ASK WHERE {
- <http://greggkellogg.net/foaf#me> foaf:name "Gregg Kellogg" .
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0002.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0002.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0002.jsonld
deleted file mode 100644
index bd662d1..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0002.jsonld
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "@context": {"foaf": "http://xmlns.com/foaf/0.1/"},
- "@id": "http://greggkellogg.net/foaf#me",
- "foaf:name": "Gregg Kellogg"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0002.sparql
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0002.sparql b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0002.sparql
deleted file mode 100644
index 2e277df..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0002.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-
-ASK WHERE {
- <http://greggkellogg.net/foaf#me> foaf:name "Gregg Kellogg" .
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0003.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0003.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0003.jsonld
deleted file mode 100644
index 7955fff..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0003.jsonld
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@context": {"foaf": "http://xmlns.com/foaf/0.1/"},
- "@type": "foaf:Person"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0003.sparql
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0003.sparql b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0003.sparql
deleted file mode 100644
index b127345..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0003.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-
-ASK WHERE {
- ?s a foaf:Person .
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0004.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0004.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0004.jsonld
deleted file mode 100644
index 31d68b8..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0004.jsonld
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "http://www.w3.org/2000/01/rdf-schema#label": {
- "@value": "A plain literal with a lang tag.",
- "@language": "en-us"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0004.sparql
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0004.sparql b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0004.sparql
deleted file mode 100644
index 1bef03c..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0004.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
-
-ASK WHERE {
- _:s rdfs:label "A plain literal with a lang tag."@en-us .
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0005.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0005.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0005.jsonld
deleted file mode 100644
index 1b04c4e..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0005.jsonld
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "@id": "http://greggkellogg.net/foaf#me",
- "http://xmlns.com/foaf/0.1/knows": {
- "http://xmlns.com/foaf/0.1/name": {"@value": "Herman Iván", "@language": "hu"}
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0005.sparql
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0005.sparql b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0005.sparql
deleted file mode 100644
index 8d2756f..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0005.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-
-ASK WHERE {
- <http://greggkellogg.net/foaf#me> foaf:knows [ foaf:name "Herman Iv\u00E1n"@hu ].
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0006.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0006.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0006.jsonld
deleted file mode 100644
index f83b97c..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0006.jsonld
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "@id": "http://greggkellogg.net/foaf#me",
- "http://purl.org/dc/terms/created": {
- "@value": "1957-02-27",
- "@type": "http://www.w3.org/2001/XMLSchema#date"
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0006.sparql
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0006.sparql b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0006.sparql
deleted file mode 100644
index 150a92f..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0006.sparql
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX dc: <http://purl.org/dc/terms/>
-PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
-
-ASK WHERE {
- <http://greggkellogg.net/foaf#me> dc:created "1957-02-27"^^xsd:date
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0007.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0007.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0007.jsonld
deleted file mode 100644
index 5d2c77d..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0007.jsonld
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@id": "http://greggkellogg.net/foaf#me",
- "@type": "http://xmlns.com/foaf/0.1/Person"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0007.sparql
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0007.sparql b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0007.sparql
deleted file mode 100644
index 1cd523d..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0007.sparql
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-
-ASK WHERE {
- <http://greggkellogg.net/foaf#me> rdf:type foaf:Person
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0008.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0008.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0008.jsonld
deleted file mode 100644
index f767f65..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0008.jsonld
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@context": {"d": "http://example.com/default#"},
- "d:foo": "bar"
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0008.sparql
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0008.sparql b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0008.sparql
deleted file mode 100644
index ae60cda..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0008.sparql
+++ /dev/null
@@ -1,3 +0,0 @@
-ASK WHERE {
- _:a <http://example.com/default#foo> "bar" .
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0009.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0009.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0009.jsonld
deleted file mode 100644
index b8cec51..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0009.jsonld
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@context": {"": "http://example.com/default#"},
- ":foo": "bar"
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0009.sparql
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0009.sparql b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0009.sparql
deleted file mode 100644
index ae60cda..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0009.sparql
+++ /dev/null
@@ -1,3 +0,0 @@
-ASK WHERE {
- _:a <http://example.com/default#foo> "bar" .
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0010.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0010.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0010.jsonld
deleted file mode 100644
index 1ecc30b..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0010.jsonld
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "@context": {"foaf": "http://xmlns.com/foaf/0.1/"},
- "@id": "http://greggkellogg.net/foaf#me",
- "foaf:knows": {
- "@id": "http://manu.sporny.org/#me",
- "foaf:name": "Manu Sporny"
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0010.sparql
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0010.sparql b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0010.sparql
deleted file mode 100644
index 09110ab..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0010.sparql
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-
-ASK WHERE {
- <http://greggkellogg.net/foaf#me> foaf:knows <http://manu.sporny.org/#me> .
- <http://manu.sporny.org/#me> foaf:name "Manu Sporny" .
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0011.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0011.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0011.jsonld
deleted file mode 100644
index 853938f..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0011.jsonld
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "@context": {
- "foaf": "http://xmlns.com/foaf/0.1/"
- },
- "@id": "http://greggkellogg.net/foaf#me",
- "foaf:knows": {
- "foaf:name": "Dave Longley"
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0011.sparql
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0011.sparql b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0011.sparql
deleted file mode 100644
index 98396d8..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0011.sparql
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-
-ASK WHERE {
- <http://greggkellogg.net/foaf#me> foaf:knows ?o .
- ?o foaf:name "Dave Longley" .
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0012.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0012.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0012.jsonld
deleted file mode 100644
index 2b32617..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0012.jsonld
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "@context": {
- "foaf": "http://xmlns.com/foaf/0.1/"
- },
- "@id": "http://greggkellogg.net/foaf#me",
- "foaf:knows": ["Manu Sporny", "Dave Longley"]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0012.sparql
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0012.sparql b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0012.sparql
deleted file mode 100644
index cebd022..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0012.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-
-ASK WHERE {
- <http://greggkellogg.net/foaf#me> foaf:knows "Manu Sporny", "Dave Longley" .
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0013.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0013.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0013.jsonld
deleted file mode 100644
index d5b025d..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0013.jsonld
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "@context": {
- "foaf": "http://xmlns.com/foaf/0.1/"
- },
- "@id": "http://greggkellogg.net/foaf#me",
- "foaf:knows": {"@list": []}
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0013.sparql
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0013.sparql b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0013.sparql
deleted file mode 100644
index 8d302ce..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0013.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-
-ASK WHERE {
- <http://greggkellogg.net/foaf#me> foaf:knows [] .
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0014.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0014.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0014.jsonld
deleted file mode 100644
index 327284f..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0014.jsonld
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "@context": {
- "foaf": "http://xmlns.com/foaf/0.1/"
- },
- "@id": "http://greggkellogg.net/foaf#me",
- "foaf:knows": {"@list": ["Manu Sporny"]}
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0014.sparql
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0014.sparql b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0014.sparql
deleted file mode 100644
index 92cde3e..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0014.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-
-ASK WHERE {
- <http://greggkellogg.net/foaf#me> foaf:knows ("Manu Sporny") .
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0015.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0015.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0015.jsonld
deleted file mode 100644
index b340db4..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0015.jsonld
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "@context": {
- "foaf": "http://xmlns.com/foaf/0.1/"
- },
- "@id": "http://greggkellogg.net/foaf#me",
- "foaf:knows": {"@list": ["Manu Sporny", "Dave Longley"]}
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0015.sparql
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0015.sparql b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0015.sparql
deleted file mode 100644
index 393a23b..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0015.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-
-ASK WHERE {
- <http://greggkellogg.net/foaf#me> foaf:knows ("Manu Sporny" "Dave Longley") .
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0016.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0016.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0016.jsonld
deleted file mode 100644
index bdd01c9..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0016.jsonld
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "@id": "",
- "@type": "http://www.w3.org/2000/01/rdf-schema#Resource"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0016.sparql
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0016.sparql b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0016.sparql
deleted file mode 100644
index 42dd56b..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/rdf-0016.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
-
-ASK WHERE {
- <http://json-ld.org/test-suite/tests/rdf-0016.jsonld> a rdfs:Resource
-}
\ No newline at end of file
[4/7] MARMOTTA-261 : Remove sesame-tools-rio-jsonld
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0004-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0004-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0004-in.jsonld
deleted file mode 100644
index 6c3f88a..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0004-in.jsonld
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "@id": "http://example.org/test",
- "http://example.org/test#int": {
- "@value": "123",
- "@type": "http://www.w3.org/2001/XMLSchema#integer"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0004-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0004-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0004-out.jsonld
deleted file mode 100644
index 3b826ea..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0004-out.jsonld
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/test#",
- "ex:int": {
- "@type": "xsd:integer"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": "http://example.org/test",
- "ex:int": 123
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0005-context.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0005-context.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0005-context.jsonld
deleted file mode 100644
index 16469c8..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0005-context.jsonld
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#",
- "ex:date": {
- "@type": "xsd:dateTime"
- },
- "ex:parent": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0005-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0005-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0005-in.jsonld
deleted file mode 100644
index c67c753..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0005-in.jsonld
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "@id": "http://example.org/test#example1",
- "http://example.org/vocab#date": {
- "@value": "2011-01-25T00:00:00Z",
- "@type": "http://www.w3.org/2001/XMLSchema#dateTime"
- },
- "http://example.org/vocab#embed": {
- "@id": "http://example.org/test#example2",
- "http://example.org/vocab#parent": {
- "@id": "http://example.org/test#example1"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0005-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0005-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0005-out.jsonld
deleted file mode 100644
index b49fac4..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0005-out.jsonld
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#",
- "ex:date": {
- "@type": "xsd:dateTime"
- },
- "ex:parent": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": "http://example.org/test#example1",
- "ex:date": "2011-01-25T00:00:00Z",
- "ex:embed": {
- "@id": "http://example.org/test#example2",
- "ex:parent": "http://example.org/test#example1"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0006-context.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0006-context.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0006-context.jsonld
deleted file mode 100644
index 3f53478..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0006-context.jsonld
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0006-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0006-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0006-in.jsonld
deleted file mode 100644
index 558acbf..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0006-in.jsonld
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "@id": "http://example.org/test",
- "http://example.org/vocab#bool": {
- "@value": "true",
- "@type": "http://www.w3.org/2001/XMLSchema#boolean"
- },
- "http://example.org/vocab#double": {
- "@value": "1.230000e+00",
- "@type": "http://www.w3.org/2001/XMLSchema#double"
- },
- "http://example.org/vocab#double-zero": {
- "@value": "0.000000e+00",
- "@type": "http://www.w3.org/2001/XMLSchema#double"
- },
- "http://example.org/vocab#int": {
- "@value": "123",
- "@type": "http://www.w3.org/2001/XMLSchema#integer"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0006-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0006-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0006-out.jsonld
deleted file mode 100644
index 8ded5f5..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0006-out.jsonld
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#"
- },
- "@id": "http://example.org/test",
- "ex:bool": true,
- "ex:double": 1.23,
- "ex:double-zero": 0,
- "ex:int": 123
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0007-context.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0007-context.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0007-context.jsonld
deleted file mode 100644
index 45b8c52..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0007-context.jsonld
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#",
- "ex:bool": {
- "@type": "xsd:boolean"
- },
- "ex:double": {
- "@type": "xsd:double"
- },
- "ex:int": {
- "@type": "xsd:integer"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0007-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0007-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0007-in.jsonld
deleted file mode 100644
index 558acbf..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0007-in.jsonld
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "@id": "http://example.org/test",
- "http://example.org/vocab#bool": {
- "@value": "true",
- "@type": "http://www.w3.org/2001/XMLSchema#boolean"
- },
- "http://example.org/vocab#double": {
- "@value": "1.230000e+00",
- "@type": "http://www.w3.org/2001/XMLSchema#double"
- },
- "http://example.org/vocab#double-zero": {
- "@value": "0.000000e+00",
- "@type": "http://www.w3.org/2001/XMLSchema#double"
- },
- "http://example.org/vocab#int": {
- "@value": "123",
- "@type": "http://www.w3.org/2001/XMLSchema#integer"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0007-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0007-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0007-out.jsonld
deleted file mode 100644
index f18bdcd..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0007-out.jsonld
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#",
- "ex:bool": {
- "@type": "xsd:boolean"
- },
- "ex:double": {
- "@type": "xsd:double"
- },
- "ex:int": {
- "@type": "xsd:integer"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": "http://example.org/test",
- "ex:bool": true,
- "ex:double": 1.23,
- "ex:double-zero": 0,
- "ex:int": 123
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0008-context.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0008-context.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0008-context.jsonld
deleted file mode 100644
index 3f53478..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0008-context.jsonld
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0008-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0008-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0008-in.jsonld
deleted file mode 100644
index 44a5b78..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0008-in.jsonld
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "@id": "http://example.org/test",
- "http://example.org/vocab#test": {
- "@language": "en",
- "@value": "test"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0008-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0008-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0008-out.jsonld
deleted file mode 100644
index 5ab536c..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0008-out.jsonld
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#"
- },
- "@id": "http://example.org/test",
- "ex:test": {
- "@language": "en",
- "@value": "test"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0009-context.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0009-context.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0009-context.jsonld
deleted file mode 100644
index 8848f73..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0009-context.jsonld
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "@context": {
- "homepage": {
- "@id": "http://xmlns.com/foaf/0.1/homepage",
- "@type": "@id"
- },
- "name": "http://xmlns.com/foaf/0.1/name"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0009-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0009-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0009-in.jsonld
deleted file mode 100644
index 057da6f..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0009-in.jsonld
+++ /dev/null
@@ -1,9 +0,0 @@
-[
- {
- "http://xmlns.com/foaf/0.1/homepage": {
- "@id": "http://john.doe.org/"
- },
- "http://xmlns.com/foaf/0.1/name": "John Doe"
- },
- {}
-]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0009-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0009-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0009-out.jsonld
deleted file mode 100644
index 09d3937..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0009-out.jsonld
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "@context": {
- "homepage": {
- "@id": "http://xmlns.com/foaf/0.1/homepage",
- "@type": "@id"
- },
- "name": "http://xmlns.com/foaf/0.1/name"
- },
- "@id": [
- {
- "homepage": "http://john.doe.org/",
- "name": "John Doe"
- },
- {
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0010-context.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0010-context.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0010-context.jsonld
deleted file mode 100644
index 5b73639..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0010-context.jsonld
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "@context": {
- "http://example.org/test#property1": {
- "@type": "uri"
- },
- "http://example.org/test#property2": {
- "@type": "uri"
- },
- "http://example.org/test#property3": {
- "@type": "uri"
- },
- "uri": "@id"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0010-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0010-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0010-in.jsonld
deleted file mode 100644
index a941054..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0010-in.jsonld
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "@id": "http://example.org/test#example1",
- "http://example.org/test#property1": {
- "@id": "http://example.org/test#example2",
- "http://example.org/test#property4": "foo"
- },
- "http://example.org/test#property2": {
- "@id": "http://example.org/test#example3"
- },
- "http://example.org/test#property3": {
- "@id": "http://example.org/test#example4"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0010-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0010-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0010-out.jsonld
deleted file mode 100644
index 5829d34..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-0010-out.jsonld
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "@context": {
- "http://example.org/test#property2": {
- "@type": "uri"
- },
- "http://example.org/test#property3": {
- "@type": "uri"
- },
- "uri": "@id"
- },
- "http://example.org/test#property1": {
- "http://example.org/test#property4": "foo",
- "uri": "http://example.org/test#example2"
- },
- "http://example.org/test#property2": "http://example.org/test#example3",
- "http://example.org/test#property3": "http://example.org/test#example4",
- "uri": "http://example.org/test#example1"
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-manifest.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-manifest.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-manifest.jsonld
deleted file mode 100644
index 319ffb4..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/compact-manifest.jsonld
+++ /dev/null
@@ -1,68 +0,0 @@
-{
- "@context": "http://json-ld.org/test-suite/context.jsonld",
- "@id": "",
- "@type": "jld:Manifest",
- "rdfs:comment": "JSON-LD to Compaction tests use object compare",
- "name": "compact",
- "sequence": [{
- "@type": ["test:TestCase", "jld:CompactTest"],
- "name": "add context",
- "input": "compact-0001-in.jsonld",
- "context": "compact-0001-context.jsonld",
- "expect": "compact-0001-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:CompactTest"],
- "name": "reduced context",
- "input": "compact-0002-in.jsonld",
- "context": "compact-0002-context.jsonld",
- "expect": "compact-0002-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:CompactTest"],
- "name": "coerced ex:contains",
- "input": "compact-0003-in.jsonld",
- "context": "compact-0003-context.jsonld",
- "expect": "compact-0003-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:CompactTest"],
- "name": "with coerce",
- "input": "compact-0004-in.jsonld",
- "context": "compact-0004-context.jsonld",
- "expect": "compact-0004-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:CompactTest"],
- "name": "with date coerce",
- "input": "compact-0005-in.jsonld",
- "context": "compact-0005-context.jsonld",
- "expect": "compact-0005-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:CompactTest"],
- "name": "native types",
- "input": "compact-0006-in.jsonld",
- "context": "compact-0006-context.jsonld",
- "expect": "compact-0006-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:CompactTest"],
- "name": "native types with coerce",
- "input": "compact-0007-in.jsonld",
- "context": "compact-0007-context.jsonld",
- "expect": "compact-0007-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:CompactTest"],
- "name": "literal with language",
- "input": "compact-0008-in.jsonld",
- "context": "compact-0008-context.jsonld",
- "expect": "compact-0008-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:CompactTest"],
- "name": "disjoint graph as array",
- "input": "compact-0009-in.jsonld",
- "context": "compact-0009-context.jsonld",
- "expect": "compact-0009-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:CompactTest"],
- "name": "alias keywords",
- "input": "compact-0010-in.jsonld",
- "context": "compact-0010-context.jsonld",
- "expect": "compact-0010-out.jsonld"
- }]
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0001-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0001-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0001-in.jsonld
deleted file mode 100644
index 39c6605..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0001-in.jsonld
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "@id": "http://example.org/test#example"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0001-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0001-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0001-out.jsonld
deleted file mode 100644
index 39c6605..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0001-out.jsonld
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "@id": "http://example.org/test#example"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0002-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0002-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0002-in.jsonld
deleted file mode 100644
index ac24485..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0002-in.jsonld
+++ /dev/null
@@ -1,39 +0,0 @@
-{
- "@context": {
- "dc": "http://purl.org/dc/elements/1.1/",
- "ex": "http://example.org/vocab#",
- "ex:authored": {
- "@type": "@id"
- },
- "ex:contains": {
- "@type": "@id"
- },
- "foaf": "http://xmlns.com/foaf/0.1/",
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": [
- {
- "@id": "http://example.org/test#chapter",
- "dc:description": "Fun",
- "dc:title": "Chapter One"
- },
- {
- "@id": "http://example.org/test#jane",
- "ex:authored": "http://example.org/test#chapter",
- "foaf:name": "Jane"
- },
- {
- "@id": "http://example.org/test#john",
- "foaf:name": "John"
- },
- {
- "@id": "http://example.org/test#library",
- "ex:contains": {
- "@id": "http://example.org/test#book",
- "dc:contributor": "Writer",
- "dc:title": "My Book",
- "ex:contains": "http://example.org/test#chapter"
- }
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0002-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0002-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0002-out.jsonld
deleted file mode 100644
index 47eda67..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0002-out.jsonld
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "@id": [
- {
- "@id": "http://example.org/test#chapter",
- "http://purl.org/dc/elements/1.1/description": "Fun",
- "http://purl.org/dc/elements/1.1/title": "Chapter One"
- },
- {
- "@id": "http://example.org/test#jane",
- "http://example.org/vocab#authored": {
- "@id": "http://example.org/test#chapter"
- },
- "http://xmlns.com/foaf/0.1/name": "Jane"
- },
- {
- "@id": "http://example.org/test#john",
- "http://xmlns.com/foaf/0.1/name": "John"
- },
- {
- "@id": "http://example.org/test#library",
- "http://example.org/vocab#contains": {
- "@id": "http://example.org/test#book",
- "http://example.org/vocab#contains": {
- "@id": "http://example.org/test#chapter"
- },
- "http://purl.org/dc/elements/1.1/contributor": "Writer",
- "http://purl.org/dc/elements/1.1/title": "My Book"
- }
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0003-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0003-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0003-in.jsonld
deleted file mode 100644
index 1581559..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0003-in.jsonld
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "@context": {
- "dc": "http://purl.org/dc/elements/1.1/",
- "ex": "http://example.org/vocab#",
- "ex:contains": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": "http://example.org/test#book",
- "dc:title": "Title",
- "ex:contains": "http://example.org/test#chapter"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0003-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0003-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0003-out.jsonld
deleted file mode 100644
index 9b70fba..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0003-out.jsonld
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "@id": "http://example.org/test#book",
- "http://example.org/vocab#contains": {
- "@id": "http://example.org/test#chapter"
- },
- "http://purl.org/dc/elements/1.1/title": "Title"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0004-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0004-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0004-in.jsonld
deleted file mode 100644
index b49fac4..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0004-in.jsonld
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#",
- "ex:date": {
- "@type": "xsd:dateTime"
- },
- "ex:parent": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": "http://example.org/test#example1",
- "ex:date": "2011-01-25T00:00:00Z",
- "ex:embed": {
- "@id": "http://example.org/test#example2",
- "ex:parent": "http://example.org/test#example1"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0004-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0004-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0004-out.jsonld
deleted file mode 100644
index c67c753..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0004-out.jsonld
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "@id": "http://example.org/test#example1",
- "http://example.org/vocab#date": {
- "@value": "2011-01-25T00:00:00Z",
- "@type": "http://www.w3.org/2001/XMLSchema#dateTime"
- },
- "http://example.org/vocab#embed": {
- "@id": "http://example.org/test#example2",
- "http://example.org/vocab#parent": {
- "@id": "http://example.org/test#example1"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0005-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0005-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0005-in.jsonld
deleted file mode 100644
index e723b25..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0005-in.jsonld
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "@context": {
- "d": "http://purl.org/dc/elements/1.1/",
- "e": "http://example.org/vocab#",
- "e:double-zero": {
- "@type": "xsd:double"
- },
- "f": "http://xmlns.com/foaf/0.1/",
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": "http://example.org/test",
- "e:bool": true,
- "e:double": 1.23,
- "e:double-zero": 0.0e0,
- "e:int": 123
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0005-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0005-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0005-out.jsonld
deleted file mode 100644
index e2a6b7d..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0005-out.jsonld
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "@id": "http://example.org/test",
- "http://example.org/vocab#bool": {
- "@value": "true",
- "@type": "http://www.w3.org/2001/XMLSchema#boolean"
- },
- "http://example.org/vocab#double": {
- "@value": "1.230000e+00",
- "@type": "http://www.w3.org/2001/XMLSchema#double"
- },
- "http://example.org/vocab#double-zero": {
- "@value": "0.000000e+00",
- "@type": "http://www.w3.org/2001/XMLSchema#double"
- },
- "http://example.org/vocab#int": {
- "@value": "123",
- "@type": "http://www.w3.org/2001/XMLSchema#integer"
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0006-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0006-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0006-in.jsonld
deleted file mode 100644
index 6c3f88a..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0006-in.jsonld
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "@id": "http://example.org/test",
- "http://example.org/test#int": {
- "@value": "123",
- "@type": "http://www.w3.org/2001/XMLSchema#integer"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0006-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0006-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0006-out.jsonld
deleted file mode 100644
index 6c3f88a..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0006-out.jsonld
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "@id": "http://example.org/test",
- "http://example.org/test#int": {
- "@value": "123",
- "@type": "http://www.w3.org/2001/XMLSchema#integer"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0007-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0007-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0007-in.jsonld
deleted file mode 100644
index 5ab536c..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0007-in.jsonld
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#"
- },
- "@id": "http://example.org/test",
- "ex:test": {
- "@language": "en",
- "@value": "test"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0007-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0007-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0007-out.jsonld
deleted file mode 100644
index 44a5b78..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0007-out.jsonld
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "@id": "http://example.org/test",
- "http://example.org/vocab#test": {
- "@language": "en",
- "@value": "test"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0008-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0008-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0008-in.jsonld
deleted file mode 100644
index 37f9ecb..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0008-in.jsonld
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "@context": {
- "http://example.org/test#property1": {
- "@type": "uri"
- },
- "http://example.org/test#property2": {
- "@type": "uri"
- },
- "uri": "@id"
- },
- "http://example.org/test#property1": {
- "http://example.org/test#property4": "foo",
- "uri": "http://example.org/test#example2"
- },
- "http://example.org/test#property2": "http://example.org/test#example3",
- "http://example.org/test#property3": {
- "uri": "http://example.org/test#example4"
- },
- "uri": "http://example.org/test#example1"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0008-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0008-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0008-out.jsonld
deleted file mode 100644
index a941054..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0008-out.jsonld
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "@id": "http://example.org/test#example1",
- "http://example.org/test#property1": {
- "@id": "http://example.org/test#example2",
- "http://example.org/test#property4": "foo"
- },
- "http://example.org/test#property2": {
- "@id": "http://example.org/test#example3"
- },
- "http://example.org/test#property3": {
- "@id": "http://example.org/test#example4"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0009-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0009-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0009-in.jsonld
deleted file mode 100644
index eca3461..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0009-in.jsonld
+++ /dev/null
@@ -1,43 +0,0 @@
-{
- "@context": {
- "authored": {
- "@id": "http://example.org/vocab#authored",
- "@type": "@id"
- },
- "contains": {
- "@id": "http://example.org/vocab#contains",
- "@type": "@id"
- },
- "contributor": "http://purl.org/dc/elements/1.1/contributor",
- "description": "http://purl.org/dc/elements/1.1/description",
- "name": "http://xmlns.com/foaf/0.1/name",
- "title": {
- "@id": "http://purl.org/dc/elements/1.1/title"
- }
- },
- "@id": [
- {
- "@id": "http://example.org/test#chapter",
- "description": "Fun",
- "title": "Chapter One"
- },
- {
- "@id": "http://example.org/test#jane",
- "authored": "http://example.org/test#chapter",
- "name": "Jane"
- },
- {
- "@id": "http://example.org/test#john",
- "name": "John"
- },
- {
- "@id": "http://example.org/test#library",
- "contains": {
- "@id": "http://example.org/test#book",
- "contains": "http://example.org/test#chapter",
- "contributor": "Writer",
- "title": "My Book"
- }
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0009-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0009-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0009-out.jsonld
deleted file mode 100644
index 47eda67..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0009-out.jsonld
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "@id": [
- {
- "@id": "http://example.org/test#chapter",
- "http://purl.org/dc/elements/1.1/description": "Fun",
- "http://purl.org/dc/elements/1.1/title": "Chapter One"
- },
- {
- "@id": "http://example.org/test#jane",
- "http://example.org/vocab#authored": {
- "@id": "http://example.org/test#chapter"
- },
- "http://xmlns.com/foaf/0.1/name": "Jane"
- },
- {
- "@id": "http://example.org/test#john",
- "http://xmlns.com/foaf/0.1/name": "John"
- },
- {
- "@id": "http://example.org/test#library",
- "http://example.org/vocab#contains": {
- "@id": "http://example.org/test#book",
- "http://example.org/vocab#contains": {
- "@id": "http://example.org/test#chapter"
- },
- "http://purl.org/dc/elements/1.1/contributor": "Writer",
- "http://purl.org/dc/elements/1.1/title": "My Book"
- }
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0010-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0010-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0010-in.jsonld
deleted file mode 100644
index 16e6232..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0010-in.jsonld
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "@context": {
- "name": "http://xmlns.com/foaf/0.1/name",
- "homepage": {
- "@id": "http://xmlns.com/foaf/0.1/homepage",
- "@type": "@id"
- },
- "know": "http://xmlns.com/foaf/0.1/knows",
- "@iri": "@id"
- },
- "@id": "#me",
- "know": [
- {
- "@id": "http://example.com/bob#me",
- "name": "Bob",
- "homepage": "http://example.com/bob"
- }, {
- "@id": "http://example.com/alice#me",
- "name": "Alice",
- "homepage": "http://example.com/alice"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0010-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0010-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0010-out.jsonld
deleted file mode 100644
index 09966fd..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-0010-out.jsonld
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "@id": "#me",
- "http://xmlns.com/foaf/0.1/knows": [
- {
- "@id": "http://example.com/bob#me",
- "http://xmlns.com/foaf/0.1/name": "Bob",
- "http://xmlns.com/foaf/0.1/homepage": {
- "@id": "http://example.com/bob"
- }
- }, {
- "@id": "http://example.com/alice#me",
- "http://xmlns.com/foaf/0.1/name": "Alice",
- "http://xmlns.com/foaf/0.1/homepage": {
- "@id": "http://example.com/alice"
- }
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-manifest.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-manifest.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-manifest.jsonld
deleted file mode 100644
index 0e044a4..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/expand-manifest.jsonld
+++ /dev/null
@@ -1,58 +0,0 @@
-{
- "@context": "http://json-ld.org/test-suite/context.jsonld",
- "@id": "",
- "@type": "jld:Manifest",
- "rdfs:comment": "JSON-LD to Expansion tests use object compare",
- "name": "expand",
- "sequence": [{
- "@type": ["test:TestCase", "jld:ExpandTest"],
- "name": "id",
- "input": "expand-0001-in.jsonld",
- "expect": "expand-0001-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:ExpandTest"],
- "name": "complex",
- "input": "expand-0002-in.jsonld",
- "expect": "expand-0002-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:ExpandTest"],
- "name": "coerced ex:contains",
- "input": "expand-0003-in.jsonld",
- "expect": "expand-0003-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:ExpandTest"],
- "name": "remove type-coercion context",
- "input": "expand-0004-in.jsonld",
- "expect": "expand-0004-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:ExpandTest"],
- "name": "native types",
- "input": "expand-0005-in.jsonld",
- "expect": "expand-0005-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:ExpandTest"],
- "name": "native expanded type",
- "input": "expand-0006-in.jsonld",
- "expect": "expand-0006-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:ExpandTest"],
- "name": "literal with language",
- "input": "expand-0007-in.jsonld",
- "expect": "expand-0007-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:ExpandTest"],
- "name": "alias keywords",
- "input": "expand-0008-in.jsonld",
- "expect": "expand-0008-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:ExpandTest"],
- "name": "terms",
- "input": "expand-0009-in.jsonld",
- "expect": "expand-0009-out.jsonld"
- }, {
- "@type": ["test:TestCase", "jld:ExpandTest"],
- "name": "do not expand aliased @id/@type",
- "input": "expand-0010-in.jsonld",
- "expect": "expand-0010-out.jsonld"
- }]
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0001-frame.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0001-frame.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0001-frame.jsonld
deleted file mode 100644
index 16faf5b..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0001-frame.jsonld
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "@context": {
- "dc": "http://purl.org/dc/elements/1.1/",
- "ex": "http://example.org/vocab#"
- },
- "@type": "ex:Library",
- "ex:contains": {
- "@type": "ex:Book",
- "ex:contains": {
- "@type": "ex:Chapter"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0001-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0001-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0001-in.jsonld
deleted file mode 100644
index d769f66..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0001-in.jsonld
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- "@context": {
- "dc": "http://purl.org/dc/elements/1.1/",
- "ex": "http://example.org/vocab#",
- "ex:contains": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": [
- {
- "@id": "http://example.org/test/#library",
- "@type": "ex:Library",
- "ex:contains": "http://example.org/test#book"
- },
- {
- "@id": "http://example.org/test#book",
- "@type": "ex:Book",
- "dc:contributor": "Writer",
- "dc:title": "My Book",
- "ex:contains": "http://example.org/test#chapter"
- },
- {
- "@id": "http://example.org/test#chapter",
- "@type": "ex:Chapter",
- "dc:description": "Fun",
- "dc:title": "Chapter One"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0001-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0001-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0001-out.jsonld
deleted file mode 100644
index 5435695..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0001-out.jsonld
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "@context": {
- "dc": "http://purl.org/dc/elements/1.1/",
- "ex": "http://example.org/vocab#"
- },
- "@id": "http://example.org/test/#library",
- "@type": "ex:Library",
- "ex:contains": {
- "@id": "http://example.org/test#book",
- "@type": "ex:Book",
- "dc:contributor": "Writer",
- "dc:title": "My Book",
- "ex:contains": {
- "@id": "http://example.org/test#chapter",
- "@type": "ex:Chapter",
- "dc:description": "Fun",
- "dc:title": "Chapter One"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0002-frame.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0002-frame.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0002-frame.jsonld
deleted file mode 100644
index 16faf5b..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0002-frame.jsonld
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "@context": {
- "dc": "http://purl.org/dc/elements/1.1/",
- "ex": "http://example.org/vocab#"
- },
- "@type": "ex:Library",
- "ex:contains": {
- "@type": "ex:Book",
- "ex:contains": {
- "@type": "ex:Chapter"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0002-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0002-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0002-in.jsonld
deleted file mode 100644
index 4174975..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0002-in.jsonld
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "@context": {
- "dc": "http://purl.org/dc/elements/1.1/",
- "ex": "http://example.org/vocab#",
- "ex:contains": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": [
- {
- "@id": "http://example.org/test/#library",
- "@type": "ex:Library",
- "ex:contains": "http://example.org/test#book"
- },
- {
- "@id": "http://example.org/test#book",
- "@type": "ex:Book",
- "dc:contributor": "Writer",
- "dc:title": "My Book",
- "ex:contains": "http://example.org/test#chapter"
- },
- {
- "@id": "http://example.org/test#chapter",
- "@type": "ex:Chapter",
- "dc:description": "Fun",
- "dc:title": "Chapter One",
- "ex:act": "ex:ActOne"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0002-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0002-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0002-out.jsonld
deleted file mode 100644
index 241e10f..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0002-out.jsonld
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "@context": {
- "dc": "http://purl.org/dc/elements/1.1/",
- "ex": "http://example.org/vocab#"
- },
- "@id": "http://example.org/test/#library",
- "@type": "ex:Library",
- "ex:contains": {
- "@id": "http://example.org/test#book",
- "@type": "ex:Book",
- "dc:contributor": "Writer",
- "dc:title": "My Book",
- "ex:contains": {
- "@id": "http://example.org/test#chapter",
- "@type": "ex:Chapter",
- "dc:description": "Fun",
- "dc:title": "Chapter One",
- "ex:act": "ex:ActOne"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0003-frame.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0003-frame.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0003-frame.jsonld
deleted file mode 100644
index 9da49cf..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0003-frame.jsonld
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "@context": {
- "dc": "http://purl.org/dc/elements/1.1/",
- "ex": "http://example.org/vocab#"
- },
- "@type": "ex:DoesNotExist"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0003-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0003-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0003-in.jsonld
deleted file mode 100644
index d769f66..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0003-in.jsonld
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- "@context": {
- "dc": "http://purl.org/dc/elements/1.1/",
- "ex": "http://example.org/vocab#",
- "ex:contains": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": [
- {
- "@id": "http://example.org/test/#library",
- "@type": "ex:Library",
- "ex:contains": "http://example.org/test#book"
- },
- {
- "@id": "http://example.org/test#book",
- "@type": "ex:Book",
- "dc:contributor": "Writer",
- "dc:title": "My Book",
- "ex:contains": "http://example.org/test#chapter"
- },
- {
- "@id": "http://example.org/test#chapter",
- "@type": "ex:Chapter",
- "dc:description": "Fun",
- "dc:title": "Chapter One"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0003-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0003-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0003-out.jsonld
deleted file mode 100644
index ec747fa..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0003-out.jsonld
+++ /dev/null
@@ -1 +0,0 @@
-null
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0004-frame.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0004-frame.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0004-frame.jsonld
deleted file mode 100644
index 81b9319..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0004-frame.jsonld
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "@context": {
- "dc": "http://purl.org/dc/elements/1.1/",
- "ex": "http://example.org/vocab#",
- "ex:contains": {
- "@type": "@id"
- }
- },
- "@type": "ex:Library"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0004-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0004-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0004-in.jsonld
deleted file mode 100644
index 84a8f8c..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0004-in.jsonld
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "@context": {
- "dc": "http://purl.org/dc/elements/1.1/",
- "ex": "http://example.org/vocab#",
- "ex:contains": {
- "@type": "@id"
- }
- },
- "@id": [
- {
- "@id": "http://example.org/test/#library",
- "@type": "ex:Library",
- "ex:contains": "http://example.org/test#book"
- },
- {
- "@id": "http://example.org/test#book",
- "@type": "ex:Book",
- "dc:contributor": "Writer",
- "dc:title": "My Book",
- "ex:contains": "http://example.org/test#chapter"
- },
- {
- "@id": "http://example.org/test#chapter",
- "@type": "ex:Chapter",
- "dc:description": "Fun",
- "dc:title": "Chapter One"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0004-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0004-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0004-out.jsonld
deleted file mode 100644
index 5435695..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0004-out.jsonld
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "@context": {
- "dc": "http://purl.org/dc/elements/1.1/",
- "ex": "http://example.org/vocab#"
- },
- "@id": "http://example.org/test/#library",
- "@type": "ex:Library",
- "ex:contains": {
- "@id": "http://example.org/test#book",
- "@type": "ex:Book",
- "dc:contributor": "Writer",
- "dc:title": "My Book",
- "ex:contains": {
- "@id": "http://example.org/test#chapter",
- "@type": "ex:Chapter",
- "dc:description": "Fun",
- "dc:title": "Chapter One"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0005-frame.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0005-frame.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0005-frame.jsonld
deleted file mode 100644
index df6e66e..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0005-frame.jsonld
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "@context": {
- "dc": "http://purl.org/dc/elements/1.1/",
- "ex": "http://example.org/vocab#"
- },
- "@explicit": true,
- "@type": "ex:Library",
- "ex:contains": {
- "@explicit": true,
- "@type": "ex:Book",
- "dc:title": {},
- "ex:contains": {
- "@explicit": true,
- "@type": "ex:Chapter",
- "dc:title": {},
- "ex:null": {}
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0005-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0005-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0005-in.jsonld
deleted file mode 100644
index d769f66..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0005-in.jsonld
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- "@context": {
- "dc": "http://purl.org/dc/elements/1.1/",
- "ex": "http://example.org/vocab#",
- "ex:contains": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": [
- {
- "@id": "http://example.org/test/#library",
- "@type": "ex:Library",
- "ex:contains": "http://example.org/test#book"
- },
- {
- "@id": "http://example.org/test#book",
- "@type": "ex:Book",
- "dc:contributor": "Writer",
- "dc:title": "My Book",
- "ex:contains": "http://example.org/test#chapter"
- },
- {
- "@id": "http://example.org/test#chapter",
- "@type": "ex:Chapter",
- "dc:description": "Fun",
- "dc:title": "Chapter One"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0005-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0005-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0005-out.jsonld
deleted file mode 100644
index 4bcb6c2..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0005-out.jsonld
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "@context": {
- "dc": "http://purl.org/dc/elements/1.1/",
- "ex": "http://example.org/vocab#"
- },
- "@id": "http://example.org/test/#library",
- "@type": "ex:Library",
- "ex:contains": {
- "@id": "http://example.org/test#book",
- "@type": "ex:Book",
- "dc:title": "My Book",
- "ex:contains": {
- "@id": "http://example.org/test#chapter",
- "@type": "ex:Chapter",
- "dc:title": "Chapter One",
- "ex:null": null
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0006-frame.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0006-frame.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0006-frame.jsonld
deleted file mode 100644
index 16faf5b..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0006-frame.jsonld
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "@context": {
- "dc": "http://purl.org/dc/elements/1.1/",
- "ex": "http://example.org/vocab#"
- },
- "@type": "ex:Library",
- "ex:contains": {
- "@type": "ex:Book",
- "ex:contains": {
- "@type": "ex:Chapter"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0006-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0006-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0006-in.jsonld
deleted file mode 100644
index d769f66..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0006-in.jsonld
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- "@context": {
- "dc": "http://purl.org/dc/elements/1.1/",
- "ex": "http://example.org/vocab#",
- "ex:contains": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": [
- {
- "@id": "http://example.org/test/#library",
- "@type": "ex:Library",
- "ex:contains": "http://example.org/test#book"
- },
- {
- "@id": "http://example.org/test#book",
- "@type": "ex:Book",
- "dc:contributor": "Writer",
- "dc:title": "My Book",
- "ex:contains": "http://example.org/test#chapter"
- },
- {
- "@id": "http://example.org/test#chapter",
- "@type": "ex:Chapter",
- "dc:description": "Fun",
- "dc:title": "Chapter One"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0006-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0006-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0006-out.jsonld
deleted file mode 100644
index 5435695..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0006-out.jsonld
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "@context": {
- "dc": "http://purl.org/dc/elements/1.1/",
- "ex": "http://example.org/vocab#"
- },
- "@id": "http://example.org/test/#library",
- "@type": "ex:Library",
- "ex:contains": {
- "@id": "http://example.org/test#book",
- "@type": "ex:Book",
- "dc:contributor": "Writer",
- "dc:title": "My Book",
- "ex:contains": {
- "@id": "http://example.org/test#chapter",
- "@type": "ex:Chapter",
- "dc:description": "Fun",
- "dc:title": "Chapter One"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0007-frame.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0007-frame.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0007-frame.jsonld
deleted file mode 100644
index 16faf5b..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0007-frame.jsonld
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "@context": {
- "dc": "http://purl.org/dc/elements/1.1/",
- "ex": "http://example.org/vocab#"
- },
- "@type": "ex:Library",
- "ex:contains": {
- "@type": "ex:Book",
- "ex:contains": {
- "@type": "ex:Chapter"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0007-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0007-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0007-in.jsonld
deleted file mode 100644
index 94c462f..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0007-in.jsonld
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "@context": {
- "dc": "http://purl.org/dc/elements/1.1/",
- "ex": "http://example.org/vocab#",
- "ex:contains": {
- "@type": "@id"
- },
- "xsd": "http://www.w3.org/2001/XMLSchema#"
- },
- "@id": [
- {
- "@id": "http://example.org/test/#library",
- "@type": [
- "ex:Library",
- "ex:Building"
- ],
- "ex:contains": "http://example.org/test#book"
- },
- {
- "@id": "http://example.org/test#book",
- "@type": "ex:Book",
- "dc:contributor": "Writer",
- "dc:title": "My Book",
- "ex:contains": "http://example.org/test#chapter"
- },
- {
- "@id": "http://example.org/test#chapter",
- "@type": "ex:Chapter",
- "dc:description": "Fun",
- "dc:title": "Chapter One"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0007-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0007-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0007-out.jsonld
deleted file mode 100644
index 2c521de..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0007-out.jsonld
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "@context": {
- "dc": "http://purl.org/dc/elements/1.1/",
- "ex": "http://example.org/vocab#"
- },
- "@id": "http://example.org/test/#library",
- "@type": [
- "ex:Library",
- "ex:Building"
- ],
- "ex:contains": {
- "@id": "http://example.org/test#book",
- "@type": "ex:Book",
- "dc:contributor": "Writer",
- "dc:title": "My Book",
- "ex:contains": {
- "@id": "http://example.org/test#chapter",
- "@type": "ex:Chapter",
- "dc:description": "Fun",
- "dc:title": "Chapter One"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0008-frame.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0008-frame.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0008-frame.jsonld
deleted file mode 100644
index b28c75b..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0008-frame.jsonld
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#"
- },
- "@type": "ex:Example",
- "ex:embedded": [],
- "ex:literal": [],
- "ex:mixed": [
- {
- "@embed": false
- }
- ],
- "ex:single": []
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0008-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0008-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0008-in.jsonld
deleted file mode 100644
index db75633..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0008-in.jsonld
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#"
- },
- "@id": [
- {
- "@id": "http://example.org/test/#example",
- "@type": "ex:Example",
- "ex:embedded": {
- "@id": "http://example.org/test#subject1"
- },
- "ex:literal": [
- "str1",
- "str2",
- "str3"
- ],
- "ex:mixed": [
- {
- "@id": "http://example.org/test#iri1"
- },
- "literal1",
- {
- "@id": "http://example.org/test#iri2"
- },
- "literal2",
- {
- "@id": "http://example.org/test#subject2",
- "ex:prop": "property"
- }
- ],
- "ex:single": "single"
- },
- {
- "@id": "http://example.org/test#subject1",
- "ex:prop": "property"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0008-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0008-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0008-out.jsonld
deleted file mode 100644
index 5bb767f..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0008-out.jsonld
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#"
- },
- "@id": "http://example.org/test/#example",
- "@type": "ex:Example",
- "ex:embedded": [
- {
- "@id": "http://example.org/test#subject1",
- "ex:prop": "property"
- }
- ],
- "ex:literal": [
- "str1",
- "str2",
- "str3"
- ],
- "ex:mixed": [
- {
- "@id": "http://example.org/test#iri1"
- },
- "literal1",
- {
- "@id": "http://example.org/test#iri2"
- },
- "literal2",
- {
- "@id": "http://example.org/test#subject2"
- }
- ],
- "ex:single": [
- "single"
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0009-frame.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0009-frame.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0009-frame.jsonld
deleted file mode 100644
index cead004..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0009-frame.jsonld
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#"
- },
- "@type": "ex:Example1",
- "ex:p2": {
- "@default": "custom-default"
- },
- "ex:p3": {
- "@default": 3
- },
- "ex:p4": {
- "@omitDefault": true
- },
- "ex:p5": {},
- "ex:p6": {
- "@type": "ex:Example2",
- "ex:p3": {
- "@default": 4
- }
- },
- "ex:p7": [
- {
- "@type": "ex:Example3"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0009-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0009-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0009-in.jsonld
deleted file mode 100644
index 7cb3ac6..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0009-in.jsonld
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#"
- },
- "@id": [
- {
- "@id": "http://example.org/test/#example1",
- "@type": "ex:Example1",
- "ex:p1": "non-default",
- "ex:p6": {
- "@id": "http://example.org/test/#example2"
- }
- },
- {
- "@id": "http://example.org/test/#example2",
- "@type": "ex:Example2"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0009-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0009-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0009-out.jsonld
deleted file mode 100644
index 48afe98..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0009-out.jsonld
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "@context": {
- "ex": "http://example.org/vocab#"
- },
- "@id": "http://example.org/test/#example1",
- "@type": "ex:Example1",
- "ex:p1": "non-default",
- "ex:p2": "custom-default",
- "ex:p3": 3,
- "ex:p5": null,
- "ex:p6": {
- "@id": "http://example.org/test/#example2",
- "@type": "ex:Example2",
- "ex:p3": 4
- },
- "ex:p7": []
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0010-frame.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0010-frame.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0010-frame.jsonld
deleted file mode 100644
index a6cea2b..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0010-frame.jsonld
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "@context": {
- "dc": "http://purl.org/dc/terms/",
- "dc:creator": {
- "@type": "@id"
- },
- "foaf": "http://xmlns.com/foaf/0.1/",
- "ps": "http://purl.org/payswarm#"
- },
- "@id": "http://example.com/asset",
- "@type": "ps:Asset",
- "dc:creator": {}
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0010-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0010-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0010-in.jsonld
deleted file mode 100644
index ecc4cdb..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0010-in.jsonld
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "@context": {
- "dc0": "http://purl.org/dc/terms/",
- "dc:creator": {
- "@type": "@id"
- },
- "foaf": "http://xmlns.com/foaf/0.1/",
- "ps": "http://purl.org/payswarm#"
- },
- "@id": "http://example.com/asset",
- "@type": "ps:Asset",
- "dc:creator": {
- "foaf:name": "John Doe"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0010-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0010-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0010-out.jsonld
deleted file mode 100644
index e91362d..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0010-out.jsonld
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "@context": {
- "dc": "http://purl.org/dc/terms/",
- "dc:creator": {
- "@type": "@id"
- },
- "ps": "http://purl.org/payswarm#"
- },
- "@id": "http://example.com/asset",
- "@type": "ps:Asset",
- "dc:creator": null
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0011-frame.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0011-frame.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0011-frame.jsonld
deleted file mode 100644
index c219d40..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0011-frame.jsonld
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "@context": {
- "ex": "http://www.example.com/#"
- },
- "@type": "ex:Thing",
- "ex:embed": {
- "@embed": true
- },
- "ex:noembed": {
- "@embed": false
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0011-in.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0011-in.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0011-in.jsonld
deleted file mode 100644
index d5df9e3..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0011-in.jsonld
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "@context": {
- "ex": "http://www.example.com/#"
- },
- "@id": "ex:subject",
- "@type": "ex:Thing",
- "ex:embed": {
- "@id": "ex:embedded",
- "ex:title": "Embedded"
- },
- "ex:noembed": {
- "@id": "ex:notembedded",
- "ex:title": "Not Embedded"
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0011-out.jsonld
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0011-out.jsonld b/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0011-out.jsonld
deleted file mode 100644
index 641a51e..0000000
--- a/commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/frame-0011-out.jsonld
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "@context": {
- "ex": "http://www.example.com/#"
- },
- "@id": "ex:subject",
- "@type": "ex:Thing",
- "ex:embed": {
- "@id": "ex:embedded",
- "ex:title": "Embedded"
- },
- "ex:noembed": {
- "@id": "ex:notembedded"
- }
-}
\ No newline at end of file
[7/7] git commit: MARMOTTA-261 : Remove sesame-tools-rio-jsonld
Posted by an...@apache.org.
MARMOTTA-261 : Remove sesame-tools-rio-jsonld
The functionality is now provided in the jsonld-java-sesame module
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/467d7055
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/467d7055
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/467d7055
Branch: refs/heads/develop
Commit: 467d7055793082fb597b0067bd1e60b36a4f34e1
Parents: 230aea8
Author: Peter Ansell <p_...@yahoo.com>
Authored: Tue Jun 25 08:28:56 2013 +1000
Committer: Peter Ansell <p_...@yahoo.com>
Committed: Tue Jun 25 08:42:45 2013 +1000
----------------------------------------------------------------------
commons/pom.xml | 1 -
commons/sesame-tools-rio-jsonld/pom.xml | 164 ---
.../src/ext/java/de/dfki/km/json/JSONUtils.java | 208 ---
.../de/dfki/km/json/jsonld/JSONLDConsts.java | 17 -
.../de/dfki/km/json/jsonld/JSONLDProcessor.java | 1386 ------------------
.../dfki/km/json/jsonld/JSONLDSerializer.java | 241 ---
.../km/json/jsonld/JSONLDTripleCallback.java | 34 -
.../de/dfki/km/json/jsonld/JSONLDUtils.java | 855 -----------
.../jsonld/impl/SesameJSONLDSerializer.java | 49 -
.../json/jsonld/impl/SesameTripleCallback.java | 83 --
.../commons/sesame/rio/jsonld/JsonLdParser.java | 202 ---
.../sesame/rio/jsonld/JsonLdParserFactory.java | 46 -
.../commons/sesame/rio/jsonld/JsonLdWriter.java | 166 ---
.../sesame/rio/jsonld/JsonLdWriterFactory.java | 62 -
.../src/main/resources/META-INF/LICENSE | 205 ---
.../src/main/resources/META-INF/NOTICE | 9 -
.../services/org.openrdf.rio.RDFParserFactory | 1 -
.../services/org.openrdf.rio.RDFWriterFactory | 1 -
.../sesame/rio/jsonld/TestJSONLdParser.java | 120 --
.../src/test/resources/logback.xml | 27 -
.../rio/jsonld/compact-0001-context.jsonld | 13 -
.../sesame/rio/jsonld/compact-0001-in.jsonld | 27 -
.../sesame/rio/jsonld/compact-0001-out.jsonld | 38 -
.../rio/jsonld/compact-0002-context.jsonld | 6 -
.../sesame/rio/jsonld/compact-0002-in.jsonld | 4 -
.../sesame/rio/jsonld/compact-0002-out.jsonld | 8 -
.../rio/jsonld/compact-0003-context.jsonld | 9 -
.../sesame/rio/jsonld/compact-0003-in.jsonld | 7 -
.../sesame/rio/jsonld/compact-0003-out.jsonld | 12 -
.../rio/jsonld/compact-0004-context.jsonld | 9 -
.../sesame/rio/jsonld/compact-0004-in.jsonld | 7 -
.../sesame/rio/jsonld/compact-0004-out.jsonld | 11 -
.../rio/jsonld/compact-0005-context.jsonld | 12 -
.../sesame/rio/jsonld/compact-0005-in.jsonld | 13 -
.../sesame/rio/jsonld/compact-0005-out.jsonld | 18 -
.../rio/jsonld/compact-0006-context.jsonld | 5 -
.../sesame/rio/jsonld/compact-0006-in.jsonld | 19 -
.../sesame/rio/jsonld/compact-0006-out.jsonld | 10 -
.../rio/jsonld/compact-0007-context.jsonld | 15 -
.../sesame/rio/jsonld/compact-0007-in.jsonld | 19 -
.../sesame/rio/jsonld/compact-0007-out.jsonld | 20 -
.../rio/jsonld/compact-0008-context.jsonld | 5 -
.../sesame/rio/jsonld/compact-0008-in.jsonld | 7 -
.../sesame/rio/jsonld/compact-0008-out.jsonld | 10 -
.../rio/jsonld/compact-0009-context.jsonld | 9 -
.../sesame/rio/jsonld/compact-0009-in.jsonld | 9 -
.../sesame/rio/jsonld/compact-0009-out.jsonld | 17 -
.../rio/jsonld/compact-0010-context.jsonld | 14 -
.../sesame/rio/jsonld/compact-0010-in.jsonld | 13 -
.../sesame/rio/jsonld/compact-0010-out.jsonld | 18 -
.../sesame/rio/jsonld/compact-manifest.jsonld | 68 -
.../sesame/rio/jsonld/expand-0001-in.jsonld | 3 -
.../sesame/rio/jsonld/expand-0001-out.jsonld | 3 -
.../sesame/rio/jsonld/expand-0002-in.jsonld | 39 -
.../sesame/rio/jsonld/expand-0002-out.jsonld | 31 -
.../sesame/rio/jsonld/expand-0003-in.jsonld | 13 -
.../sesame/rio/jsonld/expand-0003-out.jsonld | 7 -
.../sesame/rio/jsonld/expand-0004-in.jsonld | 18 -
.../sesame/rio/jsonld/expand-0004-out.jsonld | 13 -
.../sesame/rio/jsonld/expand-0005-in.jsonld | 16 -
.../sesame/rio/jsonld/expand-0005-out.jsonld | 19 -
.../sesame/rio/jsonld/expand-0006-in.jsonld | 7 -
.../sesame/rio/jsonld/expand-0006-out.jsonld | 7 -
.../sesame/rio/jsonld/expand-0007-in.jsonld | 10 -
.../sesame/rio/jsonld/expand-0007-out.jsonld | 7 -
.../sesame/rio/jsonld/expand-0008-in.jsonld | 20 -
.../sesame/rio/jsonld/expand-0008-out.jsonld | 13 -
.../sesame/rio/jsonld/expand-0009-in.jsonld | 43 -
.../sesame/rio/jsonld/expand-0009-out.jsonld | 31 -
.../sesame/rio/jsonld/expand-0010-in.jsonld | 23 -
.../sesame/rio/jsonld/expand-0010-out.jsonld | 18 -
.../sesame/rio/jsonld/expand-manifest.jsonld | 58 -
.../sesame/rio/jsonld/frame-0001-frame.jsonld | 13 -
.../sesame/rio/jsonld/frame-0001-in.jsonld | 30 -
.../sesame/rio/jsonld/frame-0001-out.jsonld | 20 -
.../sesame/rio/jsonld/frame-0002-frame.jsonld | 13 -
.../sesame/rio/jsonld/frame-0002-in.jsonld | 31 -
.../sesame/rio/jsonld/frame-0002-out.jsonld | 21 -
.../sesame/rio/jsonld/frame-0003-frame.jsonld | 7 -
.../sesame/rio/jsonld/frame-0003-in.jsonld | 30 -
.../sesame/rio/jsonld/frame-0003-out.jsonld | 1 -
.../sesame/rio/jsonld/frame-0004-frame.jsonld | 10 -
.../sesame/rio/jsonld/frame-0004-in.jsonld | 29 -
.../sesame/rio/jsonld/frame-0004-out.jsonld | 20 -
.../sesame/rio/jsonld/frame-0005-frame.jsonld | 19 -
.../sesame/rio/jsonld/frame-0005-in.jsonld | 30 -
.../sesame/rio/jsonld/frame-0005-out.jsonld | 19 -
.../sesame/rio/jsonld/frame-0006-frame.jsonld | 13 -
.../sesame/rio/jsonld/frame-0006-in.jsonld | 30 -
.../sesame/rio/jsonld/frame-0006-out.jsonld | 20 -
.../sesame/rio/jsonld/frame-0007-frame.jsonld | 13 -
.../sesame/rio/jsonld/frame-0007-in.jsonld | 33 -
.../sesame/rio/jsonld/frame-0007-out.jsonld | 23 -
.../sesame/rio/jsonld/frame-0008-frame.jsonld | 14 -
.../sesame/rio/jsonld/frame-0008-in.jsonld | 38 -
.../sesame/rio/jsonld/frame-0008-out.jsonld | 34 -
.../sesame/rio/jsonld/frame-0009-frame.jsonld | 27 -
.../sesame/rio/jsonld/frame-0009-in.jsonld | 19 -
.../sesame/rio/jsonld/frame-0009-out.jsonld | 17 -
.../sesame/rio/jsonld/frame-0010-frame.jsonld | 13 -
.../sesame/rio/jsonld/frame-0010-in.jsonld | 15 -
.../sesame/rio/jsonld/frame-0010-out.jsonld | 12 -
.../sesame/rio/jsonld/frame-0011-frame.jsonld | 12 -
.../sesame/rio/jsonld/frame-0011-in.jsonld | 15 -
.../sesame/rio/jsonld/frame-0011-out.jsonld | 14 -
.../sesame/rio/jsonld/frame-0012-frame.jsonld | 11 -
.../sesame/rio/jsonld/frame-0012-in.jsonld | 20 -
.../sesame/rio/jsonld/frame-0012-out.jsonld | 24 -
.../sesame/rio/jsonld/frame-0013-frame.jsonld | 1 -
.../sesame/rio/jsonld/frame-0013-in.jsonld | 18 -
.../sesame/rio/jsonld/frame-0013-out.jsonld | 19 -
.../sesame/rio/jsonld/frame-0014-frame.jsonld | 7 -
.../sesame/rio/jsonld/frame-0014-in.jsonld | 11 -
.../sesame/rio/jsonld/frame-0014-out.jsonld | 17 -
.../sesame/rio/jsonld/frame-0015-frame.jsonld | 227 ---
.../sesame/rio/jsonld/frame-0015-in.jsonld | 70 -
.../sesame/rio/jsonld/frame-0015-out.jsonld | 44 -
.../sesame/rio/jsonld/frame-manifest.jsonld | 98 --
.../sesame/rio/jsonld/normalize-0001-in.jsonld | 3 -
.../sesame/rio/jsonld/normalize-0001-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0002-in.jsonld | 14 -
.../sesame/rio/jsonld/normalize-0002-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0003-in.jsonld | 6 -
.../sesame/rio/jsonld/normalize-0003-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0004-in.jsonld | 9 -
.../sesame/rio/jsonld/normalize-0004-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0005-in.jsonld | 10 -
.../sesame/rio/jsonld/normalize-0005-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0006-in.jsonld | 10 -
.../sesame/rio/jsonld/normalize-0006-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0007-in.jsonld | 12 -
.../sesame/rio/jsonld/normalize-0007-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0008-in.jsonld | 20 -
.../sesame/rio/jsonld/normalize-0008-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0009-in.jsonld | 39 -
.../sesame/rio/jsonld/normalize-0009-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0010-in.jsonld | 11 -
.../sesame/rio/jsonld/normalize-0010-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0011-in.jsonld | 11 -
.../sesame/rio/jsonld/normalize-0011-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0012-in.jsonld | 14 -
.../sesame/rio/jsonld/normalize-0012-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0013-in.jsonld | 18 -
.../sesame/rio/jsonld/normalize-0013-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0014-in.jsonld | 16 -
.../sesame/rio/jsonld/normalize-0014-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0015-in.jsonld | 13 -
.../sesame/rio/jsonld/normalize-0015-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0016-in.jsonld | 18 -
.../sesame/rio/jsonld/normalize-0016-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0017-in.jsonld | 20 -
.../sesame/rio/jsonld/normalize-0017-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0018-in.jsonld | 11 -
.../sesame/rio/jsonld/normalize-0018-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0019-in.jsonld | 19 -
.../sesame/rio/jsonld/normalize-0019-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0020-in.jsonld | 33 -
.../sesame/rio/jsonld/normalize-0020-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0021-in.jsonld | 19 -
.../sesame/rio/jsonld/normalize-0021-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0022-in.jsonld | 24 -
.../sesame/rio/jsonld/normalize-0022-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0023-in.jsonld | 23 -
.../sesame/rio/jsonld/normalize-0023-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0024-in.jsonld | 29 -
.../sesame/rio/jsonld/normalize-0024-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0025-in.jsonld | 29 -
.../sesame/rio/jsonld/normalize-0025-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0026-in.jsonld | 29 -
.../sesame/rio/jsonld/normalize-0026-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0027-in.jsonld | 29 -
.../sesame/rio/jsonld/normalize-0027-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0028-in.jsonld | 29 -
.../sesame/rio/jsonld/normalize-0028-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0029-in.jsonld | 29 -
.../sesame/rio/jsonld/normalize-0029-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0030-in.jsonld | 38 -
.../sesame/rio/jsonld/normalize-0030-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0031-in.jsonld | 7 -
.../sesame/rio/jsonld/normalize-0031-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0032-in.jsonld | 7 -
.../sesame/rio/jsonld/normalize-0032-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0033-in.jsonld | 19 -
.../sesame/rio/jsonld/normalize-0033-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0034-in.jsonld | 19 -
.../sesame/rio/jsonld/normalize-0034-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0035-in.jsonld | 27 -
.../sesame/rio/jsonld/normalize-0035-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0036-in.jsonld | 27 -
.../sesame/rio/jsonld/normalize-0036-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0037-in.jsonld | 27 -
.../sesame/rio/jsonld/normalize-0037-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0038-in.jsonld | 28 -
.../sesame/rio/jsonld/normalize-0038-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0039-in.jsonld | 22 -
.../sesame/rio/jsonld/normalize-0039-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0040-in.jsonld | 33 -
.../sesame/rio/jsonld/normalize-0040-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0041-in.jsonld | 33 -
.../sesame/rio/jsonld/normalize-0041-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0042-in.jsonld | 27 -
.../sesame/rio/jsonld/normalize-0042-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0043-in.jsonld | 10 -
.../sesame/rio/jsonld/normalize-0043-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0044-in.jsonld | 107 --
.../sesame/rio/jsonld/normalize-0044-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0045-in.jsonld | 107 --
.../sesame/rio/jsonld/normalize-0045-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0046-in.jsonld | 107 --
.../sesame/rio/jsonld/normalize-0046-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0047-in.jsonld | 49 -
.../sesame/rio/jsonld/normalize-0047-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0048-in.jsonld | 49 -
.../sesame/rio/jsonld/normalize-0048-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0049-in.jsonld | 11 -
.../sesame/rio/jsonld/normalize-0049-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0050-in.jsonld | 20 -
.../sesame/rio/jsonld/normalize-0050-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0051-in.jsonld | 14 -
.../sesame/rio/jsonld/normalize-0051-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-0052-in.jsonld | 20 -
.../sesame/rio/jsonld/normalize-0052-out.jsonld | 1 -
.../sesame/rio/jsonld/normalize-manifest.jsonld | 268 ----
.../commons/sesame/rio/jsonld/rdf-0001.jsonld | 4 -
.../commons/sesame/rio/jsonld/rdf-0001.sparql | 5 -
.../commons/sesame/rio/jsonld/rdf-0002.jsonld | 5 -
.../commons/sesame/rio/jsonld/rdf-0002.sparql | 5 -
.../commons/sesame/rio/jsonld/rdf-0003.jsonld | 4 -
.../commons/sesame/rio/jsonld/rdf-0003.sparql | 5 -
.../commons/sesame/rio/jsonld/rdf-0004.jsonld | 6 -
.../commons/sesame/rio/jsonld/rdf-0004.sparql | 5 -
.../commons/sesame/rio/jsonld/rdf-0005.jsonld | 6 -
.../commons/sesame/rio/jsonld/rdf-0005.sparql | 5 -
.../commons/sesame/rio/jsonld/rdf-0006.jsonld | 7 -
.../commons/sesame/rio/jsonld/rdf-0006.sparql | 6 -
.../commons/sesame/rio/jsonld/rdf-0007.jsonld | 4 -
.../commons/sesame/rio/jsonld/rdf-0007.sparql | 6 -
.../commons/sesame/rio/jsonld/rdf-0008.jsonld | 4 -
.../commons/sesame/rio/jsonld/rdf-0008.sparql | 3 -
.../commons/sesame/rio/jsonld/rdf-0009.jsonld | 4 -
.../commons/sesame/rio/jsonld/rdf-0009.sparql | 3 -
.../commons/sesame/rio/jsonld/rdf-0010.jsonld | 8 -
.../commons/sesame/rio/jsonld/rdf-0010.sparql | 6 -
.../commons/sesame/rio/jsonld/rdf-0011.jsonld | 9 -
.../commons/sesame/rio/jsonld/rdf-0011.sparql | 6 -
.../commons/sesame/rio/jsonld/rdf-0012.jsonld | 7 -
.../commons/sesame/rio/jsonld/rdf-0012.sparql | 5 -
.../commons/sesame/rio/jsonld/rdf-0013.jsonld | 7 -
.../commons/sesame/rio/jsonld/rdf-0013.sparql | 5 -
.../commons/sesame/rio/jsonld/rdf-0014.jsonld | 7 -
.../commons/sesame/rio/jsonld/rdf-0014.sparql | 5 -
.../commons/sesame/rio/jsonld/rdf-0015.jsonld | 7 -
.../commons/sesame/rio/jsonld/rdf-0015.sparql | 5 -
.../commons/sesame/rio/jsonld/rdf-0016.jsonld | 4 -
.../commons/sesame/rio/jsonld/rdf-0016.sparql | 5 -
.../commons/sesame/rio/jsonld/rdf-0017.jsonld | 4 -
.../commons/sesame/rio/jsonld/rdf-0017.sparql | 5 -
.../commons/sesame/rio/jsonld/rdf-0018.jsonld | 4 -
.../commons/sesame/rio/jsonld/rdf-0018.sparql | 5 -
.../commons/sesame/rio/jsonld/rdf-0019.jsonld | 8 -
.../commons/sesame/rio/jsonld/rdf-0019.sparql | 5 -
.../commons/sesame/rio/jsonld/rdf-0020.jsonld | 8 -
.../commons/sesame/rio/jsonld/rdf-0020.sparql | 6 -
.../commons/sesame/rio/jsonld/rdf-0021.jsonld | 4 -
.../commons/sesame/rio/jsonld/rdf-0021.sparql | 5 -
.../commons/sesame/rio/jsonld/rdf-0022.jsonld | 4 -
.../commons/sesame/rio/jsonld/rdf-0022.sparql | 5 -
.../commons/sesame/rio/jsonld/rdf-0023.jsonld | 4 -
.../commons/sesame/rio/jsonld/rdf-0023.sparql | 5 -
.../commons/sesame/rio/jsonld/rdf-0024.jsonld | 4 -
.../commons/sesame/rio/jsonld/rdf-0024.sparql | 5 -
.../commons/sesame/rio/jsonld/rdf-0025.jsonld | 7 -
.../commons/sesame/rio/jsonld/rdf-0025.sparql | 5 -
.../commons/sesame/rio/jsonld/rdf-0026.jsonld | 4 -
.../commons/sesame/rio/jsonld/rdf-0026.sparql | 5 -
.../sesame/rio/jsonld/rdf-manifest.jsonld | 166 ---
.../sesame/rio/jsonld/simplify-0001-in.jsonld | 44 -
.../sesame/rio/jsonld/simplify-0001-out.jsonld | 37 -
.../sesame/rio/jsonld/simplify-manifest.jsonld | 13 -
.../ldclient/ldclient-provider-rdf/pom.xml | 4 +-
parent/pom.xml | 11 +-
platform/marmotta-core/pom.xml | 4 +-
282 files changed, 7 insertions(+), 8172 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/pom.xml
----------------------------------------------------------------------
diff --git a/commons/pom.xml b/commons/pom.xml
index 05b28bf..4c8ef03 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -56,7 +56,6 @@
<module>sesame-filter</module>
<module>sesame-tools-rio-api</module>
<module>sesame-tools-rio-ical</module>
- <module>sesame-tools-rio-jsonld</module>
<module>sesame-tools-rio-rdfjson</module>
<module>sesame-tools-rio-rss</module>
<module>sesame-tools-rio-vcard</module>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/pom.xml b/commons/sesame-tools-rio-jsonld/pom.xml
deleted file mode 100644
index 028556c..0000000
--- a/commons/sesame-tools-rio-jsonld/pom.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
- <relativePath>../../parent</relativePath>
- </parent>
-
- <name>Sesame I/O: JSON/LD</name>
- <artifactId>sesame-tools-rio-jsonld</artifactId>
- <packaging>jar</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <id>add-ext</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>src/ext/java</source>
- </sources>
- </configuration>
- </execution>
- <execution>
- <id>add-ext-test</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <inherited>false</inherited>
- <configuration>
- <sources>
- <source>src/ext-test/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>src/ext/resources</directory>
- </resource>
- </resources>
- </build>
-
-
- <dependencies>
- <dependency>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>sesame-tools-rio-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.openrdf.sesame</groupId>
- <artifactId>sesame-model</artifactId>
- </dependency>
- <dependency>
- <groupId>org.openrdf.sesame</groupId>
- <artifactId>sesame-rio-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.openrdf.sesame</groupId>
- <artifactId>sesame-query</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.openrdf.sesame</groupId>
- <artifactId>sesame-queryparser-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.openrdf.sesame</groupId>
- <artifactId>sesame-queryparser-sparql</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.openrdf.sesame</groupId>
- <artifactId>sesame-queryalgebra-model</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.openrdf.sesame</groupId>
- <artifactId>sesame-queryalgebra-evaluation</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.openrdf.sesame</groupId>
- <artifactId>sesame-sail-memory</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.openrdf.sesame</groupId>
- <artifactId>sesame-repository-sail</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/ext/java/de/dfki/km/json/JSONUtils.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/ext/java/de/dfki/km/json/JSONUtils.java b/commons/sesame-tools-rio-jsonld/src/ext/java/de/dfki/km/json/JSONUtils.java
deleted file mode 100644
index 4be1f99..0000000
--- a/commons/sesame-tools-rio-jsonld/src/ext/java/de/dfki/km/json/JSONUtils.java
+++ /dev/null
@@ -1,208 +0,0 @@
-package de.dfki.km.json;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.List;
-import java.util.Map;
-
-import org.codehaus.jackson.JsonGenerationException;
-import org.codehaus.jackson.JsonGenerator;
-import org.codehaus.jackson.JsonLocation;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.ObjectWriter;
-
-/**
- * A bunch of functions to make loading JSON easy
- *
- * @author tristan
- *
- */
-public class JSONUtils {
- public static Object fromString(String jsonString) throws JsonParseException, JsonMappingException {
- ObjectMapper objectMapper = new ObjectMapper();
- Object rval = null;
- if (jsonString.trim().startsWith("[")) {
- try {
- rval = objectMapper.readValue(jsonString, List.class);
- } catch (IOException e) {
- // TODO: what?
- if (e instanceof JsonParseException) {
- throw (JsonParseException) e;
- } else if (e instanceof JsonMappingException) {
- throw (JsonMappingException) e;
- } else {
- // TODO: Auto-generated catch block
- e.printStackTrace();
- }
- }
- } else if (jsonString.trim().startsWith("{")) {
- try {
- rval = objectMapper.readValue(jsonString, Map.class);
- } catch (IOException e) {
- if (e instanceof JsonParseException) {
- throw (JsonParseException) e;
- } else if (e instanceof JsonMappingException) {
- throw (JsonMappingException) e;
- } else {
- // TODO: Auto-generated catch block
- e.printStackTrace();
- }
- }
- } else if (jsonString.trim().startsWith("\"")) {
- try {
- rval = objectMapper.readValue(jsonString, String.class);
- } catch (IOException e) {
- if (e instanceof JsonParseException) {
- throw (JsonParseException) e;
- } else if (e instanceof JsonMappingException) {
- throw (JsonMappingException) e;
- } else {
- // TODO: Auto-generated catch block
- e.printStackTrace();
- }
- }
- } else if (jsonString.trim().equals("true") || (jsonString.trim().equals("false"))) {
- try {
- rval = objectMapper.readValue(jsonString, Boolean.class);
- } catch (IOException e) {
- if (e instanceof JsonParseException) {
- throw (JsonParseException) e;
- } else if (e instanceof JsonMappingException) {
- throw (JsonMappingException) e;
- } else {
- // TODO: Auto-generated catch block
- e.printStackTrace();
- }
- }
- } else if (jsonString.trim().matches("[0-9.e+-]+")) {
- try {
- rval = objectMapper.readValue(jsonString, Number.class);
- } catch (IOException e) {
- if (e instanceof JsonParseException) {
- throw (JsonParseException) e;
- } else if (e instanceof JsonMappingException) {
- throw (JsonMappingException) e;
- } else {
- // TODO: Auto-generated catch block
- e.printStackTrace();
- }
- }
- } else if (jsonString.trim().equals("null")) {
- rval = null;
- } else {
- throw new JsonParseException("document doesn't start with a valid json element", new JsonLocation("\""
- + jsonString.substring(0, Math.min(jsonString.length(), 100)) + "...\"", 0, 1, 0));
- }
- return rval;
- }
-
- public static Object fromReader(Reader r) throws IOException {
- StringBuffer sb = new StringBuffer();
- int b;
- while ((b = r.read()) != -1) {
- sb.append((char) b);
- }
- return fromString(sb.toString());
- }
-
- public static void write(Writer w, Object jsonObject) throws JsonGenerationException, JsonMappingException, IOException {
- ObjectMapper objectMapper = new ObjectMapper();
- objectMapper.getJsonFactory().disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
- objectMapper.writeValue(w, jsonObject);
- }
-
- public static void writePrettyPrint(Writer w, Object jsonObject) throws JsonGenerationException, JsonMappingException, IOException {
- ObjectMapper objectMapper = new ObjectMapper();
- objectMapper.getJsonFactory().disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
- ObjectWriter objectWriter = objectMapper.writerWithDefaultPrettyPrinter();
-
- objectWriter.writeValue(w, jsonObject);
- }
-
- public static Object fromInputStream(InputStream content) throws IOException {
- return fromInputStream(content, "UTF-8"); // no readers from
- // inputstreams w.o.
- // encoding!!
- }
-
- public static Object fromInputStream(InputStream content, String enc) throws IOException {
- return fromReader(new BufferedReader(new InputStreamReader(content, enc)));
- }
-
- public static String toPrettyString(Object obj) {
- StringWriter sw = new StringWriter();
- try {
- writePrettyPrint(sw, obj);
- } catch (Exception e) {
- // TODO Is this really possible with stringwriter?
- // I think it's only there because of the interface
- // however, if so... well, we have to do something!
- // it seems weird for toString to throw an IOException
- }
- return sw.toString();
- }
-
- public static String toString(Object obj) { // throws
- // JsonGenerationException,
- // JsonMappingException {
- StringWriter sw = new StringWriter();
- try {
- write(sw, obj);
- } catch (Exception e) {
- // TODO Is this really possible with stringwriter?
- // I think it's only there because of the interface
- // however, if so... well, we have to do something!
- // it seems weird for toString to throw an IOException
- }
- return sw.toString();
- }
-
- public static boolean equals(Object v1, Object v2) {
- boolean rval = true;
- // TODO Auto-generated method stub
- if (v1 instanceof List && v2 instanceof List) {
- if (((List) v1).size() != ((List) v2).size()) {
- rval = false;
- } else {
- // TODO: should the order of things in the list matter?
- for (int i = 0; i < ((List<Object>) v1).size() && rval == true; i++) {
- rval = equals(((List<Object>) v1).get(i), ((List<Object>) v2).get(i));
- }
- }
- } else if (v1 instanceof Number && v2 instanceof Number) {
- // TODO: this is VERY sketchy
- double n1 = ((Number) v1).doubleValue();
- double n2 = ((Number) v2).doubleValue();
-
- rval = n1 == n2;
- } else if (v1 instanceof String && v2 instanceof String) {
- rval = ((String) v1).equals((String) v2);
- } else if (v1 instanceof Map && v2 instanceof Map) {
- if (((Map) v1).size() != ((Map) v2).size()) {
- rval = false;
- } else {
- for (Object k1 : ((Map) v1).keySet()) {
- rval = ((Map) v2).containsKey(k1) ? equals(((Map) v1).get(k1), ((Map) v2).get(k1)) : false;
- if (rval != true) {
- break;
- }
- }
- }
- } else if (v1 instanceof Boolean && v2 instanceof Boolean) {
- rval = v1 == v2;
- } else if (v1 != null && v2 != null) {
- rval = v1.equals(v2);
- } else {
- rval = v1 == v2;
- }
-
- return rval;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/467d7055/commons/sesame-tools-rio-jsonld/src/ext/java/de/dfki/km/json/jsonld/JSONLDConsts.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/src/ext/java/de/dfki/km/json/jsonld/JSONLDConsts.java b/commons/sesame-tools-rio-jsonld/src/ext/java/de/dfki/km/json/jsonld/JSONLDConsts.java
deleted file mode 100644
index a280194..0000000
--- a/commons/sesame-tools-rio-jsonld/src/ext/java/de/dfki/km/json/jsonld/JSONLDConsts.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package de.dfki.km.json.jsonld;
-
-public class JSONLDConsts {
-
- public static final String RDF_SYNTAX_NS = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
- public static final String RDF_SCHEMA_NS = "http://www.w3.org/2000/01/rdf-schema#";
- public static final String XSD_NS = "http://www.w3.org/2001/XMLSchema#";
-
- public static final String XSD_ANYTYPE = XSD_NS + "anyType";
- public static final String XSD_BOOLEAN = XSD_NS + "boolean";
- public static final String XSD_DOUBLE = XSD_NS + "double";
- public static final String XSD_INTEGER = XSD_NS + "integer";
- public static final String XSD_ANYURI = XSD_NS + "anyURI";
- public static final String XSD_STRING = XSD_NS + "string";
-
- public static final String RDF_TYPE = RDF_SYNTAX_NS + "type";
-}