Merge branch 'master' into rdf4j
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/49feb7c0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/49feb7c0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/49feb7c0 Branch: refs/heads/rdf4j Commit: 49feb7c0243df7ffbeb06459a713d9938e92adfc Parents: bbdba83 0beee9d Author: Stian Soiland-Reyes <[email protected]> Authored: Tue Oct 4 02:30:08 2016 +0100 Committer: Stian Soiland-Reyes <[email protected]> Committed: Tue Oct 4 02:30:08 2016 +0100 ---------------------------------------------------------------------- README.md | 33 +- 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 + 24 files changed, 1932 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/49feb7c0/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index fc35c76,235dfa9..c0ee4b4 --- a/pom.xml +++ b/pom.xml @@@ -215,7 -215,7 +215,8 @@@ <modules> <module>api</module> <module>simple</module> + <module>rdf4j</module> + <module>jsonld-java</module> </modules> <dependencyManagement>
