marmotta-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wik...@apache.org
Subject [036/100] [abbrv] [partial] Reverting the erroneous merge by Sebastian according to the instructions in INFRA-6876
Date Fri, 13 Jun 2014 08:57:56 GMT
http://git-wip-us.apache.org/repos/asf/marmotta/blob/582abb5b/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/marmotta/blob/582abb5b/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/marmotta/blob/582abb5b/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/marmotta/blob/582abb5b/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/marmotta/blob/582abb5b/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/marmotta/blob/582abb5b/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/marmotta/blob/582abb5b/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/marmotta/blob/582abb5b/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/marmotta/blob/582abb5b/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/marmotta/blob/582abb5b/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/marmotta/blob/582abb5b/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/marmotta/blob/582abb5b/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/marmotta/blob/582abb5b/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/marmotta/blob/582abb5b/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/marmotta/blob/582abb5b/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/marmotta/blob/582abb5b/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/marmotta/blob/582abb5b/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/marmotta/blob/582abb5b/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/marmotta/blob/582abb5b/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/marmotta/blob/582abb5b/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/marmotta/blob/582abb5b/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/marmotta/blob/582abb5b/commons/sesame-tools-rio-rdfjson/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-rdfjson/pom.xml b/commons/sesame-tools-rio-rdfjson/pom.xml
deleted file mode 100644
index da00181..0000000
--- a/commons/sesame-tools-rio-rdfjson/pom.xml
+++ /dev/null
@@ -1,113 +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: RDF/JSON</name>
-    <artifactId>sesame-tools-rio-rdfjson</artifactId>
-    <packaging>jar</packaging>
-
-    <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>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-rio-rdfxml</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>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/marmotta/blob/582abb5b/commons/sesame-tools-rio-rdfjson/src/main/java/org/apache/marmotta/commons/sesame/rio/rdfjson/RDFJsonParser.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-rdfjson/src/main/java/org/apache/marmotta/commons/sesame/rio/rdfjson/RDFJsonParser.java b/commons/sesame-tools-rio-rdfjson/src/main/java/org/apache/marmotta/commons/sesame/rio/rdfjson/RDFJsonParser.java
deleted file mode 100644
index f21dcae..0000000
--- a/commons/sesame-tools-rio-rdfjson/src/main/java/org/apache/marmotta/commons/sesame/rio/rdfjson/RDFJsonParser.java
+++ /dev/null
@@ -1,160 +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.rdfjson;
-
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Value;
-import org.openrdf.model.ValueFactory;
-import org.openrdf.model.impl.BNodeImpl;
-import org.openrdf.model.impl.URIImpl;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.rio.RDFParseException;
-import org.openrdf.rio.helpers.RDFParserBase;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Add file description here!
- * <p/>
- * User: sschaffe
- */
-public class RDFJsonParser extends RDFParserBase {
-
-
-    private static final String HTTP = "http://";
-    private static final String VALUE = "value";
-    private static final String TYPE = "type";
-    private static final String BNODE = "bnode";
-    private static final String URI = "uri";
-    private static final String LANG = "lang";
-    private static final String DATATYPE = "datatype";
-
-    /**
-     * Creates a new RDFParserBase that will use a {@link org.openrdf.model.impl.ValueFactoryImpl} to
-     * create RDF model objects.
-     */
-    public RDFJsonParser() {
-        super();
-    }
-
-    /**
-     * Creates a new TurtleParser that will use the supplied ValueFactory to
-     * create RDF model objects.
-     *
-     * @param valueFactory A ValueFactory.
-     */
-    public RDFJsonParser(ValueFactory valueFactory) {
-        super(valueFactory);
-    }
-
-    /**
-     * Gets the RDF format that this parser can parse.
-     */
-    @Override
-    public RDFFormat getRDFFormat() {
-        return RDFFormat.RDFJSON;
-    }
-
-    /**
-     * 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 {
-        ObjectMapper mapper = new ObjectMapper();
-        Map<String,Map<String,Set<Map<String,String>>>> subjects = mapper.readValue(in, new TypeReference<Map<String,Map<String,Set<Map<String,String>>>>>(){});
-        addToRepository(subjects);
-    }
-
-    /**
-     * 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 {
-        ObjectMapper mapper = new ObjectMapper();
-        Map<String,Map<String,Set<Map<String,String>>>> subjects = mapper.readValue(reader, new TypeReference<Map<String,Map<String,Set<Map<String,String>>>>>(){});
-        addToRepository(subjects);
-    }
-
-
-
-    private void addToRepository(Map<String,Map<String,Set<Map<String,String>>>> subjects) throws RDFParseException, RDFHandlerException {
-        for(String subjectKey : subjects.keySet() ) {
-            //create subject Resource
-            Resource subject;
-            if(subjectKey.startsWith(HTTP)) {
-                subject = new URIImpl(subjectKey);
-            } else {
-                subject = new BNodeImpl(subjectKey);
-            }
-
-            for(Map.Entry<String, Set<Map<String, String>>> entry : subjects.get(subjectKey).entrySet()) {
-                //create property URI
-                URIImpl property = new URIImpl(entry.getKey());
-
-                for(Map<String,String> o : entry.getValue()) {
-                    //create object resources
-                    Value object;
-
-                    if( o.get(TYPE).equals(URI) ) {
-                        object = createURI(o.get(VALUE));
-                    } else if( o.get(TYPE).equals(BNODE) ) {
-                        object = createBNode(o.get(VALUE));
-                    } else {
-                        if( o.get(LANG) != null ) {
-                            object = createLiteral(o.get(VALUE),o.get(LANG),null);
-                        } else if( o.get(DATATYPE) != null) {
-                            object = createLiteral(o.get(VALUE),null,new URIImpl(o.get(DATATYPE)));
-                        } else {
-                            object = createLiteral(o.get(VALUE),null,null);
-                        }
-                    }
-                    //add triple
-                    rdfHandler.handleStatement(createStatement(subject, property, object));
-                }
-            }
-        }
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/marmotta/blob/582abb5b/commons/sesame-tools-rio-rdfjson/src/main/java/org/apache/marmotta/commons/sesame/rio/rdfjson/RDFJsonParserFactory.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-rdfjson/src/main/java/org/apache/marmotta/commons/sesame/rio/rdfjson/RDFJsonParserFactory.java b/commons/sesame-tools-rio-rdfjson/src/main/java/org/apache/marmotta/commons/sesame/rio/rdfjson/RDFJsonParserFactory.java
deleted file mode 100644
index b61200b..0000000
--- a/commons/sesame-tools-rio-rdfjson/src/main/java/org/apache/marmotta/commons/sesame/rio/rdfjson/RDFJsonParserFactory.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.rdfjson;
-
-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 RDFJsonParserFactory implements RDFParserFactory {
-
-    /**
-     * Returns the RDF format for this factory.
-     */
-    @Override
-    public RDFFormat getRDFFormat() {
-        return RDFFormat.RDFJSON;
-    }
-
-    /**
-     * Returns a RDFParser instance.
-     */
-    @Override
-    public RDFParser getParser() {
-        return new RDFJsonParser();
-    }
-}

http://git-wip-us.apache.org/repos/asf/marmotta/blob/582abb5b/commons/sesame-tools-rio-rdfjson/src/main/java/org/apache/marmotta/commons/sesame/rio/rdfjson/RDFJsonWriter.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-rdfjson/src/main/java/org/apache/marmotta/commons/sesame/rio/rdfjson/RDFJsonWriter.java b/commons/sesame-tools-rio-rdfjson/src/main/java/org/apache/marmotta/commons/sesame/rio/rdfjson/RDFJsonWriter.java
deleted file mode 100644
index 0395f21..0000000
--- a/commons/sesame-tools-rio-rdfjson/src/main/java/org/apache/marmotta/commons/sesame/rio/rdfjson/RDFJsonWriter.java
+++ /dev/null
@@ -1,193 +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.rdfjson;
-
-import org.codehaus.jackson.map.ObjectMapper;
-import org.openrdf.model.BNode;
-import org.openrdf.model.Literal;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-import org.openrdf.rio.RDFFormat;
-import org.openrdf.rio.RDFHandlerException;
-import org.openrdf.rio.RDFWriter;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.HashMap;
-import java.util.HashSet;
-
-/**
- * Add file description here!
- * <p/>
- * User: sschaffe
- */
-public class RDFJsonWriter implements RDFWriter {
-
-    private static final String VALUE = "value";
-    private static final String TYPE = "type";
-    private static final String BNODE = "bnode";
-    private static final String URI = "uri";
-    private static final String LITERAL = "literal";
-    private static final String LANG = "lang";
-    private static final String DATATYPE = "datatype";
-
-
-    private Writer writer;
-
-    private HashMap<String,HashMap<String,HashSet<HashMap<String,String>>>> subjects;
-
-
-    public RDFJsonWriter(OutputStream out) {
-        writer = new OutputStreamWriter(out);
-    }
-
-
-    public RDFJsonWriter(Writer writer) {
-        this.writer = writer;
-    }
-
-    /**
-     * Gets the RDF format that this RDFWriter uses.
-     */
-    @Override
-    public RDFFormat getRDFFormat() {
-        return RDFFormat.RDFJSON;
-    }
-
-    /**
-     * 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 {
-        subjects = new HashMap<String,HashMap<String,HashSet<HashMap<String,String>>>>();
-    }
-
-    /**
-     * 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 {
-        ObjectMapper mapper = new ObjectMapper();
-        try {
-            mapper.writeValue(writer,subjects);
-        } catch (IOException e) {
-            throw new RDFHandlerException("error while serializing JSON objects",e);
-        }
-    }
-
-    /**
-     * 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 {
-    }
-
-    /**
-     * 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 {
-            // get subject key
-            String subjectKey;
-            if( st.getSubject() instanceof URI) {
-                subjectKey = ((URI)st.getSubject()).stringValue();
-            } else {
-                subjectKey = ((BNode)st.getSubject()).getID();
-            }
-
-            //add or get predicate map
-            HashMap<String,HashSet<HashMap<String,String>>> predicates;
-            if( subjects.containsKey(subjectKey)) {
-                predicates = subjects.get(subjectKey);
-            } else {
-                predicates = new HashMap<String,HashSet<HashMap<String,String>>>();
-                subjects.put(subjectKey,predicates);
-            }
-
-            //get predicate key
-            String predicateKey = st.getPredicate().stringValue();
-
-            //add or get object set
-            HashSet<HashMap<String,String>> objects;
-            if( predicates.containsKey(predicateKey) ) {
-                objects = predicates.get(predicateKey);
-            } else {
-                 objects = new HashSet<HashMap<String,String>>();
-                predicates.put(predicateKey,objects);
-            }
-
-            //add objects
-            HashMap<String,String> object = new HashMap<String,String>();
-            Value objectNode = st.getObject();
-            if( objectNode instanceof Literal) {
-                object.put(TYPE,LITERAL);
-                object.put(VALUE,((Literal)objectNode).stringValue());
-                if(((Literal) objectNode).getLanguage() != null )
-                    object.put(LANG,((Literal) objectNode).getLanguage());
-                if(((Literal) objectNode).getDatatype() != null)
-                    object.put(DATATYPE,((Literal) objectNode).getDatatype().stringValue());
-            } else {
-                if( objectNode instanceof URI ) {
-                    object.put(TYPE,URI);
-                    object.put(VALUE,((URI)objectNode).stringValue());
-                } else {
-                    object.put(TYPE,BNODE);
-                    object.put(VALUE,((BNode)objectNode).getID());
-                }
-            }
-            objects.add(object);
-    }
-
-    /**
-     * 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 {
-    }
-
-
-
-}

http://git-wip-us.apache.org/repos/asf/marmotta/blob/582abb5b/commons/sesame-tools-rio-rdfjson/src/main/java/org/apache/marmotta/commons/sesame/rio/rdfjson/RDFJsonWriterFactory.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-rdfjson/src/main/java/org/apache/marmotta/commons/sesame/rio/rdfjson/RDFJsonWriterFactory.java b/commons/sesame-tools-rio-rdfjson/src/main/java/org/apache/marmotta/commons/sesame/rio/rdfjson/RDFJsonWriterFactory.java
deleted file mode 100644
index 22dd3b2..0000000
--- a/commons/sesame-tools-rio-rdfjson/src/main/java/org/apache/marmotta/commons/sesame/rio/rdfjson/RDFJsonWriterFactory.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.rdfjson;
-
-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 RDFJsonWriterFactory implements RDFWriterFactory {
-
-    /**
-     * Returns the RDF format for this factory.
-     */
-    @Override
-    public RDFFormat getRDFFormat() {
-        return RDFFormat.RDFJSON;
-    }
-
-    /**
-     * 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 RDFJsonWriter(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 RDFJsonWriter(writer);
-    }
-}

http://git-wip-us.apache.org/repos/asf/marmotta/blob/582abb5b/commons/sesame-tools-rio-rdfjson/src/main/resources/META-INF/services/org.openrdf.rio.RDFParserFactory
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-rdfjson/src/main/resources/META-INF/services/org.openrdf.rio.RDFParserFactory b/commons/sesame-tools-rio-rdfjson/src/main/resources/META-INF/services/org.openrdf.rio.RDFParserFactory
deleted file mode 100644
index 0cf0d1a..0000000
--- a/commons/sesame-tools-rio-rdfjson/src/main/resources/META-INF/services/org.openrdf.rio.RDFParserFactory
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.marmotta.commons.sesame.rio.rdfjson.RDFJsonParserFactory
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/marmotta/blob/582abb5b/commons/sesame-tools-rio-rdfjson/src/main/resources/META-INF/services/org.openrdf.rio.RDFWriterFactory
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-rdfjson/src/main/resources/META-INF/services/org.openrdf.rio.RDFWriterFactory b/commons/sesame-tools-rio-rdfjson/src/main/resources/META-INF/services/org.openrdf.rio.RDFWriterFactory
deleted file mode 100644
index b224d1c..0000000
--- a/commons/sesame-tools-rio-rdfjson/src/main/resources/META-INF/services/org.openrdf.rio.RDFWriterFactory
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.marmotta.commons.sesame.rio.rdfjson.RDFJsonWriterFactory
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/marmotta/blob/582abb5b/commons/sesame-tools-rio-rdfjson/src/test/java/org/apache/marmotta/commons/sesame/rio/rdfjson/TestRDFJsonParser.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-rdfjson/src/test/java/org/apache/marmotta/commons/sesame/rio/rdfjson/TestRDFJsonParser.java b/commons/sesame-tools-rio-rdfjson/src/test/java/org/apache/marmotta/commons/sesame/rio/rdfjson/TestRDFJsonParser.java
deleted file mode 100644
index f6ac7d5..0000000
--- a/commons/sesame-tools-rio-rdfjson/src/test/java/org/apache/marmotta/commons/sesame/rio/rdfjson/TestRDFJsonParser.java
+++ /dev/null
@@ -1,135 +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.rdfjson;
-/*
- * 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.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.openrdf.model.BNode;
-import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
-import org.openrdf.model.Value;
-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.Collection;
-
-import static java.util.Arrays.asList;
-import static org.hamcrest.CoreMatchers.everyItem;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.*;
-import static org.junit.Assume.assumeThat;
-
-/**
- * Add file description here!
- * <p/>
- * Author: Sebastian Schaffert
- */
-@RunWith(Parameterized.class)
-public class TestRDFJsonParser {
-
-    private static Logger log = LoggerFactory.getLogger(TestRDFJsonParser.class);
-
-    private String fileName;
-
-    public TestRDFJsonParser(String fileName) {
-        this.fileName = fileName;
-    }
-
-    // return the list of rdf-NNNN.jsonld files
-    @Parameterized.Parameters(name = "{0}")
-    public static Collection<Object[]> data() {
-        ArrayList<Object[]> list = new ArrayList<Object[]>();
-        for(int i=1; i<=1; i++) {
-            list.add(new Object[] {"test-"+String.format("%03d",i)});
-        }
-        return list;
-    }
-
-    @Test
-    public void runTest() throws Exception {
-        log.info("running test {} ...", fileName);
-
-        InputStream rdfJSON = this.getClass().getResourceAsStream(fileName+".json");
-        InputStream rdfXML = this.getClass().getResourceAsStream(fileName+".rdf");
-        assumeThat("Could not load testfiles", asList(rdfJSON, rdfXML), everyItem(notNullValue(InputStream.class)));
-
-        Repository repositoryJSON = new SailRepository(new MemoryStore());
-        repositoryJSON.initialize();
-
-        RepositoryConnection connectionJSON = repositoryJSON.getConnection();
-        try {
-            connectionJSON.add(rdfJSON, "http://localhost/rdfjson/", RDFFormat.RDFJSON);
-            connectionJSON.commit();
-        } catch(Exception ex) {
-            fail("parsing "+fileName+" failed!");
-        }
-        assertTrue(connectionJSON.size() > 0);
-
-
-        Repository repositoryRDF = new SailRepository(new MemoryStore());
-        repositoryRDF.initialize();
-
-        RepositoryConnection connectionRDF = repositoryRDF.getConnection();
-        connectionRDF.add(rdfXML, "http://localhost/rdfjson/", RDFFormat.RDFXML);
-        connectionRDF.commit();
-
-        assertEquals(connectionJSON.size(), connectionRDF.size());
-
-        // check each triple in the RDF/XML whether it exists in the RDF/JSON
-        for(Statement statement : connectionRDF.getStatements(null,null,null,false).asList()) {
-            Resource subject = statement.getSubject() instanceof URI ? statement.getSubject() : null;
-            URI predicate = statement.getPredicate();
-            Value object = statement.getObject() instanceof BNode ? null : statement.getObject();
-            assertTrue("statement "+statement+" not contained in result",connectionJSON.hasStatement(subject,predicate,object,false));
-        }
-
-        connectionJSON.close();
-        connectionRDF.close();
-
-        repositoryJSON.shutDown();
-        repositoryRDF.shutDown();
-
-    }
-
-
-
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/marmotta/blob/582abb5b/commons/sesame-tools-rio-rdfjson/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-rdfjson/src/test/resources/logback.xml b/commons/sesame-tools-rio-rdfjson/src/test/resources/logback.xml
deleted file mode 100644
index 1bfecff..0000000
--- a/commons/sesame-tools-rio-rdfjson/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/marmotta/blob/582abb5b/commons/sesame-tools-rio-rdfjson/src/test/resources/org/apache/marmotta/commons/sesame/rio/rdfjson/test-001.json
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-rdfjson/src/test/resources/org/apache/marmotta/commons/sesame/rio/rdfjson/test-001.json b/commons/sesame-tools-rio-rdfjson/src/test/resources/org/apache/marmotta/commons/sesame/rio/rdfjson/test-001.json
deleted file mode 100644
index 02e2ee4..0000000
--- a/commons/sesame-tools-rio-rdfjson/src/test/resources/org/apache/marmotta/commons/sesame/rio/rdfjson/test-001.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "http://example.org/about" : {
-        "http://purl.org/dc/elements/1.1/creator" : [ { "value" : "Anna Wilder", "type" : "literal" } ],
-        "http://purl.org/dc/elements/1.1/title"   : [ { "value" : "Anna's Homepage", "type" : "literal", "lang" : "en" } ] ,
-        "http://xmlns.com/foaf/0.1/maker"         : [ { "value" : "_:person", "type" : "bnode" } ]
-    } ,
-
-    "_:person" : {
-        "http://xmlns.com/foaf/0.1/homepage"      : [ { "value" : "http://example.org/about", "type" : "uri" } ] ,
-        "http://xmlns.com/foaf/0.1/made"          : [ { "value" : "http://example.org/about", "type" : "uri" } ] ,
-        "http://xmlns.com/foaf/0.1/name"          : [ { "value" : "Anna Wilder", "type" : "literal" } ] ,
-        "http://xmlns.com/foaf/0.1/firstName"     : [ { "value" : "Anna", "type" : "literal" } ] ,
-        "http://xmlns.com/foaf/0.1/surname"       : [ { "value" : "Wilder", "type" : "literal" } ] ,
-        "http://xmlns.com/foaf/0.1/depiction"     : [ { "value" : "http://example.org/pic.jpg", "type" : "uri" } ] ,
-        "http://xmlns.com/foaf/0.1/nick"          : [
-            { "type" : "literal", "value" : "wildling"} ,
-            { "type" : "literal", "value" : "wilda" }
-        ] ,
-        "http://xmlns.com/foaf/0.1/mbox_sha1sum"  : [ {  "value" : "69e31bbcf58d432950127593e292a55975bc66fd", "type" : "literal" } ]
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/marmotta/blob/582abb5b/commons/sesame-tools-rio-rdfjson/src/test/resources/org/apache/marmotta/commons/sesame/rio/rdfjson/test-001.rdf
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-rdfjson/src/test/resources/org/apache/marmotta/commons/sesame/rio/rdfjson/test-001.rdf b/commons/sesame-tools-rio-rdfjson/src/test/resources/org/apache/marmotta/commons/sesame/rio/rdfjson/test-001.rdf
deleted file mode 100644
index 4befdab..0000000
--- a/commons/sesame-tools-rio-rdfjson/src/test/resources/org/apache/marmotta/commons/sesame/rio/rdfjson/test-001.rdf
+++ /dev/null
@@ -1,37 +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.
-  -->
-
-<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:foaf="http://xmlns.com/foaf/0.1/"
-         xmlns:dc="http://purl.org/dc/elements/1.1/">
-    <rdf:Description rdf:about="http://example.org/about">
-        <dc:creator>Anna Wilder</dc:creator>
-        <dc:title xml:lang="en">Anna's Homepage</dc:title>
-        <foaf:maker rdf:nodeID="person" />
-    </rdf:Description>
-    <rdf:Description rdf:nodeID="person">
-        <foaf:homepage rdf:resource="http://example.org/about" />
-        <foaf:made rdf:resource="http://example.org/about" />
-        <foaf:name>Anna Wilder</foaf:name>
-        <foaf:firstName>Anna</foaf:firstName>
-        <foaf:surname>Wilder</foaf:surname>
-        <foaf:depiction rdf:resource="http://example.org/pic.jpg" />
-        <foaf:nick>wildling</foaf:nick>
-        <foaf:nick>wilda</foaf:nick>
-        <foaf:mbox_sha1sum>69e31bbcf58d432950127593e292a55975bc66fd</foaf:mbox_sha1sum>
-    </rdf:Description>
-</rdf:RDF>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/marmotta/blob/582abb5b/commons/sesame-tools-rio-rss/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-rss/pom.xml b/commons/sesame-tools-rio-rss/pom.xml
index 5dd8f40..0f4a8d8 100644
--- a/commons/sesame-tools-rio-rss/pom.xml
+++ b/commons/sesame-tools-rio-rss/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.1.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating</version>
         <relativePath>../../parent</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/marmotta/blob/582abb5b/commons/sesame-tools-rio-rss/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-rss/src/main/resources/META-INF/NOTICE b/commons/sesame-tools-rio-rss/src/main/resources/META-INF/NOTICE
index e3cb85c..9893868 100644
--- a/commons/sesame-tools-rio-rss/src/main/resources/META-INF/NOTICE
+++ b/commons/sesame-tools-rio-rss/src/main/resources/META-INF/NOTICE
@@ -1,9 +1,11 @@
 Apache Marmotta RSS
-Copyright [2012-2013] The Apache Software Foundation
+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:
+Portions of this software were originally based on the following:
 
-  rometools licensed under the Apache License 2.0
+    Copyright 2008-2012 Salzburg Research Forschungsgesellschaft mbH
+
+These have been licensed to the Apache Software Foundation under a software grant.

http://git-wip-us.apache.org/repos/asf/marmotta/blob/582abb5b/commons/sesame-tools-rio-vcard/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-vcard/pom.xml b/commons/sesame-tools-rio-vcard/pom.xml
index 6d88340..25de2c0 100644
--- a/commons/sesame-tools-rio-vcard/pom.xml
+++ b/commons/sesame-tools-rio-vcard/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.1.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating</version>
         <relativePath>../../parent</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/marmotta/blob/582abb5b/extras/pom.xml
----------------------------------------------------------------------
diff --git a/extras/pom.xml b/extras/pom.xml
index 4d9cf28..0be1aef 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.1.0-incubating-SNAPSHOT</version>
+        <version>3.1.0-incubating</version>
         <relativePath>../parent</relativePath>
     </parent>
 
@@ -47,7 +47,20 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <!-- this is a reactor, no checking -->
+                <groupId>org.apache.rat</groupId>
+                <artifactId>apache-rat-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
+    <modules>
+        <module>webjars</module>
+    </modules>
 </project>

http://git-wip-us.apache.org/repos/asf/marmotta/blob/582abb5b/extras/webjars/codemirror/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/codemirror/pom.xml b/extras/webjars/codemirror/pom.xml
new file mode 100644
index 0000000..1605757
--- /dev/null
+++ b/extras/webjars/codemirror/pom.xml
@@ -0,0 +1,97 @@
+<?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</version>
+        <relativePath>../../../parent/</relativePath>
+    </parent>
+
+    <properties>
+        <webjar.version>3.16</webjar.version>
+        <webjar.path>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${webjar.version}</webjar.path>
+    </properties>
+
+    <groupId>org.apache.marmotta.webjars</groupId>
+    <artifactId>codemirror</artifactId>
+    <packaging>jar</packaging>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>yuicompressor-maven-plugin</artifactId>
+                <version>1.0.0</version>
+                <executions>
+                    <execution>
+                        <id>assemble-javascript</id>
+                        <goals>
+                            <goal>aggregate</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirectory>${project.basedir}/src/main/resources</sourceDirectory>
+                            <output>${webjar.path}/codemirror.js</output>
+                            <includes>
+                                <include>codemirror.js</include>
+                                <include>matchbrackets.js</include>
+                                <include>sparql.js</include>
+                                <include>ldpath.js</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>assemble-css</id>
+                        <goals>
+                            <goal>aggregate-css</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirectory>${project.basedir}/src/main/resources</sourceDirectory>
+                            <output>${webjar.path}/codemirror.css</output>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <!-- these are "extras", so they come from 3rd parties, no RAT check! -->
+                <groupId>org.apache.rat</groupId>
+                <artifactId>apache-rat-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>src/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <excludes>
+                    <exclude>**/*.js</exclude>
+                    <exclude>**/*.css</exclude>
+                </excludes>
+                <filtering>false</filtering>
+                <targetPath>${webjar.path}</targetPath>
+            </resource>
+        </resources>
+    </build>
+
+</project>

http://git-wip-us.apache.org/repos/asf/marmotta/blob/582abb5b/extras/webjars/codemirror/src/main/resources/codemirror.css
----------------------------------------------------------------------
diff --git a/extras/webjars/codemirror/src/main/resources/codemirror.css b/extras/webjars/codemirror/src/main/resources/codemirror.css
new file mode 100644
index 0000000..c95db64
--- /dev/null
+++ b/extras/webjars/codemirror/src/main/resources/codemirror.css
@@ -0,0 +1,259 @@
+/* BASICS */
+
+.CodeMirror {
+  /* Set height, width, borders, and global font properties here */
+  font-family: monospace;
+  height: 300px;
+}
+.CodeMirror-scroll {
+  /* Set scrolling behaviour here */
+  overflow: auto;
+}
+
+/* PADDING */
+
+.CodeMirror-lines {
+  padding: 4px 0; /* Vertical padding around content */
+}
+.CodeMirror pre {
+  padding: 0 4px; /* Horizontal padding of content */
+}
+
+.CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
+  background-color: white; /* The little square between H and V scrollbars */
+}
+
+/* GUTTER */
+
+.CodeMirror-gutters {
+  border-right: 1px solid #ddd;
+  background-color: #f7f7f7;
+  white-space: nowrap;
+}
+.CodeMirror-linenumbers {}
+.CodeMirror-linenumber {
+  padding: 0 3px 0 5px;
+  min-width: 20px;
+  text-align: right;
+  color: #999;
+}
+
+/* CURSOR */
+
+.CodeMirror div.CodeMirror-cursor {
+  border-left: 1px solid black;
+  z-index: 3;
+}
+/* Shown when moving in bi-directional text */
+.CodeMirror div.CodeMirror-secondarycursor {
+  border-left: 1px solid silver;
+}
+.CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursor {
+  width: auto;
+  border: 0;
+  background: #7e7;
+  z-index: 1;
+}
+/* Can style cursor different in overwrite (non-insert) mode */
+.CodeMirror div.CodeMirror-cursor.CodeMirror-overwrite {}
+
+.cm-tab { display: inline-block; }
+
+/* DEFAULT THEME */
+
+.cm-s-default .cm-keyword {color: #708;}
+.cm-s-default .cm-atom {color: #219;}
+.cm-s-default .cm-number {color: #164;}
+.cm-s-default .cm-def {color: #00f;}
+.cm-s-default .cm-variable {color: black;}
+.cm-s-default .cm-variable-2 {color: #05a;}
+.cm-s-default .cm-variable-3 {color: #085;}
+.cm-s-default .cm-property {color: black;}
+.cm-s-default .cm-operator {color: black;}
+.cm-s-default .cm-comment {color: #a50;}
+.cm-s-default .cm-string {color: #a11;}
+.cm-s-default .cm-string-2 {color: #f50;}
+.cm-s-default .cm-meta {color: #555;}
+.cm-s-default .cm-error {color: #f00;}
+.cm-s-default .cm-qualifier {color: #555;}
+.cm-s-default .cm-builtin {color: #30a;}
+.cm-s-default .cm-bracket {color: #997;}
+.cm-s-default .cm-tag {color: #170;}
+.cm-s-default .cm-attribute {color: #00c;}
+.cm-s-default .cm-header {color: blue;}
+.cm-s-default .cm-quote {color: #090;}
+.cm-s-default .cm-hr {color: #999;}
+.cm-s-default .cm-link {color: #00c;}
+
+.cm-negative {color: #d44;}
+.cm-positive {color: #292;}
+.cm-header, .cm-strong {font-weight: bold;}
+.cm-em {font-style: italic;}
+.cm-link {text-decoration: underline;}
+
+.cm-invalidchar {color: #f00;}
+
+div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
+div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
+.CodeMirror-activeline-background {background: #e8f2ff;}
+
+/* STOP */
+
+/* The rest of this file contains styles related to the mechanics of
+   the editor. You probably shouldn't touch them. */
+
+.CodeMirror {
+  line-height: 1;
+  position: relative;
+  overflow: hidden;
+  background: white;
+  color: black;
+}
+
+.CodeMirror-scroll {
+  /* 30px is the magic margin used to hide the element's real scrollbars */
+  /* See overflow: hidden in .CodeMirror */
+  margin-bottom: -30px; margin-right: -30px;
+  padding-bottom: 30px; padding-right: 30px;
+  height: 100%;
+  outline: none; /* Prevent dragging from highlighting the element */
+  position: relative;
+}
+.CodeMirror-sizer {
+  position: relative;
+}
+
+/* The fake, visible scrollbars. Used to force redraw during scrolling
+   before actuall scrolling happens, thus preventing shaking and
+   flickering artifacts. */
+.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
+  position: absolute;
+  z-index: 6;
+  display: none;
+}
+.CodeMirror-vscrollbar {
+  right: 0; top: 0;
+  overflow-x: hidden;
+  overflow-y: scroll;
+}
+.CodeMirror-hscrollbar {
+  bottom: 0; left: 0;
+  overflow-y: hidden;
+  overflow-x: scroll;
+}
+.CodeMirror-scrollbar-filler {
+  right: 0; bottom: 0;
+}
+.CodeMirror-gutter-filler {
+  left: 0; bottom: 0;
+}
+
+.CodeMirror-gutters {
+  position: absolute; left: 0; top: 0;
+  padding-bottom: 30px;
+  z-index: 3;
+}
+.CodeMirror-gutter {
+  white-space: normal;
+  height: 100%;
+  padding-bottom: 30px;
+  margin-bottom: -32px;
+  display: inline-block;
+  /* Hack to make IE7 behave */
+  *zoom:1;
+  *display:inline;
+}
+.CodeMirror-gutter-elt {
+  position: absolute;
+  cursor: default;
+  z-index: 4;
+}
+
+.CodeMirror-lines {
+  cursor: text;
+}
+.CodeMirror pre {
+  /* Reset some styles that the rest of the page might have set */
+  -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0;
+  border-width: 0;
+  background: transparent;
+  font-family: inherit;
+  font-size: inherit;
+  margin: 0;
+  white-space: pre;
+  word-wrap: normal;
+  line-height: inherit;
+  color: inherit;
+  z-index: 2;
+  position: relative;
+  overflow: visible;
+}
+.CodeMirror-wrap pre {
+  word-wrap: break-word;
+  white-space: pre-wrap;
+  word-break: normal;
+}
+.CodeMirror-code pre {
+  border-right: 30px solid transparent;
+  width: -webkit-fit-content;
+  width: -moz-fit-content;
+  width: fit-content;
+}
+.CodeMirror-wrap .CodeMirror-code pre {
+  border-right: none;
+  width: auto;
+}
+.CodeMirror-linebackground {
+  position: absolute;
+  left: 0; right: 0; top: 0; bottom: 0;
+  z-index: 0;
+}
+
+.CodeMirror-linewidget {
+  position: relative;
+  z-index: 2;
+  overflow: auto;
+}
+
+.CodeMirror-widget {
+}
+
+.CodeMirror-wrap .CodeMirror-scroll {
+  overflow-x: hidden;
+}
+
+.CodeMirror-measure {
+  position: absolute;
+  width: 100%; height: 0px;
+  overflow: hidden;
+  visibility: hidden;
+}
+.CodeMirror-measure pre { position: static; }
+
+.CodeMirror div.CodeMirror-cursor {
+  position: absolute;
+  visibility: hidden;
+  border-right: none;
+  width: 0;
+}
+.CodeMirror-focused div.CodeMirror-cursor {
+  visibility: visible;
+}
+
+.CodeMirror-selected { background: #d9d9d9; }
+.CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }
+
+.cm-searching {
+  background: #ffa;
+  background: rgba(255, 255, 0, .4);
+}
+
+/* IE7 hack to prevent it from returning funny offsetTops on the spans */
+.CodeMirror span { *vertical-align: text-bottom; }
+
+@media print {
+  /* Hide the cursor when printing */
+  .CodeMirror div.CodeMirror-cursor {
+    visibility: hidden;
+  }
+}


Mime
View raw message