commonsrdf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject [4/6] incubator-commonsrdf git commit: Merge branch 'jena' into rdf4j-jena-compat
Date Mon, 05 Sep 2016 15:36:10 GMT
Merge branch 'jena' into rdf4j-jena-compat

Conflicts:
	pom.xml


Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/d1fe31b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/d1fe31b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/d1fe31b2

Branch: refs/heads/rdf4j-jena-compat
Commit: d1fe31b2e5975c5e64ee9b70f5d750669b87ac65
Parents: 1ceb200 c6d654b
Author: Stian Soiland-Reyes <stain@apache.org>
Authored: Mon Jul 25 18:09:02 2016 +0100
Committer: Stian Soiland-Reyes <stain@apache.org>
Committed: Mon Jul 25 18:09:02 2016 +0100

----------------------------------------------------------------------
 jena/.settings/org.eclipse.core.resources.prefs |   6 +
 jena/.settings/org.eclipse.jdt.core.prefs       |   5 +
 jena/.settings/org.eclipse.m2e.core.prefs       |   4 +
 jena/pom.xml                                    |  86 +++
 .../commons/rdf/jena/ConversionException.java   |  47 ++
 .../org/apache/commons/rdf/jena/JenaAny.java    |  39 +
 .../apache/commons/rdf/jena/JenaBlankNode.java  |  31 +
 .../apache/commons/rdf/jena/JenaDataset.java    |  30 +
 .../org/apache/commons/rdf/jena/JenaGraph.java  |  26 +
 .../org/apache/commons/rdf/jena/JenaIRI.java    |  31 +
 .../apache/commons/rdf/jena/JenaLiteral.java    |  31 +
 .../org/apache/commons/rdf/jena/JenaQuad.java   |  28 +
 .../apache/commons/rdf/jena/JenaQuadLike.java   |  35 +
 .../commons/rdf/jena/JenaRDFParserBuilder.java  | 103 +++
 .../apache/commons/rdf/jena/JenaRDFTerm.java    |  27 +
 .../commons/rdf/jena/JenaRDFTermFactory.java    | 724 +++++++++++++++++++
 .../org/apache/commons/rdf/jena/JenaTriple.java |  27 +
 .../apache/commons/rdf/jena/JenaTripleLike.java |  34 +
 .../apache/commons/rdf/jena/JenaVariable.java   |  39 +
 .../commons/rdf/jena/impl/AbstractRDFTerm.java  |  47 ++
 .../apache/commons/rdf/jena/impl/AnyImpl.java   |  54 ++
 .../commons/rdf/jena/impl/BlankNodeImpl.java    |  61 ++
 .../commons/rdf/jena/impl/DatasetImpl.java      | 187 +++++
 .../rdf/jena/impl/GeneralizedQuadImpl.java      | 136 ++++
 .../apache/commons/rdf/jena/impl/GraphImpl.java | 131 ++++
 .../apache/commons/rdf/jena/impl/IRIImpl.java   |  61 ++
 .../commons/rdf/jena/impl/JenaFactory.java      | 178 +++++
 .../commons/rdf/jena/impl/LiteralImpl.java      |  73 ++
 .../apache/commons/rdf/jena/impl/QuadImpl.java  |  66 ++
 .../commons/rdf/jena/impl/TripleImpl.java       |  67 ++
 .../commons/rdf/jena/impl/VariableImpl.java     |  64 ++
 .../org.apache.commons.rdf.api.RDFTermFactory   |   1 +
 .../commons/rdf/jena/TestBlankNodeJena.java     |  42 ++
 .../apache/commons/rdf/jena/TestGraphJena.java  |  32 +
 .../jena/TestJenaGraphToCommonsRDFGraph.java    |  74 ++
 .../commons/rdf/jena/TestRDFParserBuilder.java  |  62 ++
 .../rdf/jena/TestRDFTermFactoryJena.java        |  32 +
 jena/src/test/resources/D.ttl                   |  20 +
 jena/src/test/resources/log4j.properties        |  18 +
 pom.xml                                         |   4 +
 .../rdf/simple/AbstractRDFParserBuilder.java    | 111 ++-
 .../commons/rdf/simple/RDFParseException.java   |  50 ++
 .../rdf/simple/DummyRDFParserBuilder.java       |   2 +-
 43 files changed, 2865 insertions(+), 61 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/d1fe31b2/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 1968436,6dcdb54..539204d
--- a/pom.xml
+++ b/pom.xml
@@@ -217,7 -220,7 +220,8 @@@
      <modules>
          <module>api</module>
          <module>simple</module>
 +        <module>rdf4j</module>
+         <module>jena</module>
      </modules>
  
      <dependencyManagement>


Mime
View raw message