marmotta-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ans...@apache.org
Subject [7/7] git commit: MARMOTTA-261 : Remove sesame-tools-rio-jsonld
Date Mon, 24 Jun 2013 22:43:17 GMT
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_ansell@yahoo.com>
Authored: Tue Jun 25 08:28:56 2013 +1000
Committer: Peter Ansell <p_ansell@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";
-}


Mime
View raw message