You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commonsrdf.apache.org by st...@apache.org on 2016/10/07 14:22:37 UTC
[50/50] incubator-commonsrdf git commit: Merge branch 'master' into
jena
Merge branch 'master' into jena
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/4528e695
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/4528e695
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/4528e695
Branch: refs/heads/jena
Commit: 4528e695f5ee1c56e3527dec4a25e8f4685cd702
Parents: 7dd08a2 0beee9d
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Oct 7 15:21:23 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Oct 7 15:21:23 2016 +0100
----------------------------------------------------------------------
jsonld-java/pom.xml | 67 ++++
.../commons/rdf/jsonldjava/JsonLdBlankNode.java | 62 ++++
.../commons/rdf/jsonldjava/JsonLdDataset.java | 115 +++++++
.../commons/rdf/jsonldjava/JsonLdGraph.java | 118 +++++++
.../commons/rdf/jsonldjava/JsonLdGraphLike.java | 220 +++++++++++++
.../commons/rdf/jsonldjava/JsonLdIRI.java | 64 ++++
.../commons/rdf/jsonldjava/JsonLdLiteral.java | 99 ++++++
.../commons/rdf/jsonldjava/JsonLdQuad.java | 66 ++++
.../commons/rdf/jsonldjava/JsonLdQuadLike.java | 75 +++++
.../rdf/jsonldjava/JsonLdRDFTermFactory.java | 306 +++++++++++++++++++
.../commons/rdf/jsonldjava/JsonLdTerm.java | 44 +++
.../commons/rdf/jsonldjava/JsonLdTriple.java | 61 ++++
.../rdf/jsonldjava/JsonLdUnionGraph.java | 118 +++++++
.../jsonldjava/experimental/JsonLdParser.java | 160 ++++++++++
.../jsonldjava/experimental/package-info.java | 34 +++
.../commons/rdf/jsonldjava/package-info.java | 27 ++
.../org.apache.commons.rdf.api.RDFTermFactory | 1 +
jsonld-java/src/main/resources/test.jsonld | 26 ++
.../rdf/jsonldjava/JsonLdBlankNodeTest.java | 24 ++
.../commons/rdf/jsonldjava/JsonLdGraphTest.java | 31 ++
.../rdf/jsonldjava/JsonLdParserBuilderTest.java | 127 ++++++++
.../jsonldjava/JsonLdRDFTermFactoryTest.java | 54 ++++
pom.xml | 14 +
23 files changed, 1913 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/4528e695/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 913a659,235dfa9..2b837c6
--- a/pom.xml
+++ b/pom.xml
@@@ -218,7 -215,7 +218,8 @@@
<modules>
<module>api</module>
<module>simple</module>
+ <module>jena</module>
+ <module>jsonld-java</module>
</modules>
<dependencyManagement>