[2/2] incubator-commonsrdf git commit: ASF license headers

[stain]

ASF license headers


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

Branch: refs/heads/master
Commit: 4f243b351d1fd0b3468d2e1b646463e1d6be5ba0
Parents: c0a9b80
Author: Stian Soiland-Reyes 
Authored: Wed Oct 26 16:46:29 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Oct 26 16:46:29 2016 +0100

--
 .../commons/rdf/jsonldjava/JsonLdTripleLike.java   | 17 +
 .../rdf/jsonldjava/JsonLdBlankNodeTest.java| 17 +
 .../apache/commons/rdf/rdf4j/ClosableIterable.java | 17 +
 3 files changed, 51 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/4f243b35/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTripleLike.java
--
diff --git 
a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTripleLike.java
 
b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTripleLike.java
index ff06038..8004a02 100644
--- 
a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTripleLike.java
+++ 
b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTripleLike.java
@@ -1,3 +1,20 @@
+/**
+ * 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.commons.rdf.jsonldjava;
 
 import org.apache.commons.rdf.api.TripleLike;

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/4f243b35/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.java
--
diff --git 
a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.java
 
b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.java
index 0bf8fb6..1af375a 100644
--- 
a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.java
+++ 
b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.java
@@ -1,3 +1,20 @@
+/**
+ * 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.commons.rdf.jsonldjava;
 
 import java.util.UUID;

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/4f243b35/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/ClosableIterable.java
--
diff --git 
a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/ClosableIterable.java 
b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/ClosableIterable.java
index ab4290b..e8c6ad5 100644
--- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/ClosableIterable.java
+++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/ClosableIterable.java
@@ -1,3 +1,20 @@
+/**
+ * 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
+ * 

incubator-commonsrdf git commit: no more jacoco report

[stain]

Repository: incubator-commonsrdf
Updated Branches:
  refs/heads/master 9c4b05875 -> 9b1b958a4


no more jacoco report


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

Branch: refs/heads/master
Commit: 9b1b958a4b74c4884f3cfb9a925590be0c0a4ff5
Parents: 9c4b058
Author: Stian Soiland-Reyes 
Authored: Wed Oct 26 14:18:41 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Oct 26 14:18:41 2016 +0100

--
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/9b1b958a/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 00967a8..638fdb4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,5 +26,5 @@ notifications:
 - commits@commonsrdf.incubator.apache.org
 
 after_success:
-  - mvn clean test jacoco:report coveralls:report
+  - mvn clean test coveralls:report
  

incubator-commonsrdf git commit: Travis: Use dist trusty to force newer OracleJDK8 patch version

[stain]

Repository: incubator-commonsrdf
Updated Branches:
  refs/heads/master 7410f79ba -> 9c4b05875


Travis: Use dist trusty to force newer OracleJDK8 patch version


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

Branch: refs/heads/master
Commit: 9c4b058752017caa34d3d83fa91c32bafbeefbe6
Parents: 7410f79
Author: Stian Soiland-Reyes 
Authored: Wed Oct 26 14:10:17 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Oct 26 14:10:17 2016 +0100

--
 .travis.yml | 21 -
 1 file changed, 12 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/9c4b0587/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index a115f8e..00967a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,18 @@
-# Use docker-based build environment
-sudo: false
+# Attempt to get a newer oraclejdk8..
+# See https://docs.travis-ci.com/user/ci-environment/
+sudo: required
+dist: trusty
 
 language: java
 
-# Workaround for travis-ci/travis-ci#4042
-addons:
-  apt:
-packages:
-  - oracle-java8-installer
-#jdk:
-#  - oraclejdk8
+# If newer Oracle JDK is needed, uncomment:
+#addons:
+#  apt:
+#packages:
+#  - oracle-java8-installer
+# .. and comment out:
+jdk:
+  - oraclejdk8
 
 
 cache:

[3/3] incubator-commonsrdf git commit: Revert "Is travis happy with dist: trusty?"

[stain]

Revert "Is travis happy with dist: trusty?"

This reverts commit 90b681b2ea449f7a4ca83ea58f971c91792cf975.


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

Branch: refs/heads/master
Commit: 7410f79ba7ff1580efd731f58bddd498599faa9d
Parents: c06abc8
Author: Stian Soiland-Reyes 
Authored: Wed Oct 26 14:06:52 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Oct 26 14:06:52 2016 +0100

--
 .travis.yml | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/7410f79b/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 9262dcf..a115f8e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,5 @@
-# Attempt to get a newer oraclejdk8..
-# See https://docs.travis-ci.com/user/ci-environment/
-sudo: required
-dist: trusty
+# Use docker-based build environment
+sudo: false
 
 language: java
 

[2/3] incubator-commonsrdf git commit: Travis Travis..

[stain]

Travis Travis..


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

Branch: refs/heads/master
Commit: c06abc8c4d52e435a5e1a6fd9b5c54268543f800
Parents: 90b681b
Author: Stian Soiland-Reyes 
Authored: Wed Oct 26 14:01:07 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Oct 26 14:04:06 2016 +0100

--
 .travis.yml | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/c06abc8c/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 283b9c3..9262dcf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,15 @@ sudo: required
 dist: trusty
 
 language: java
-jdk:
-  - oraclejdk8
+
+# Workaround for travis-ci/travis-ci#4042
+addons:
+  apt:
+packages:
+  - oracle-java8-installer
+#jdk:
+#  - oraclejdk8
+
 
 cache:
   directories:

[2/2] incubator-commonsrdf git commit: Travis Travis..

[stain]

Travis Travis..


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

Branch: refs/heads/COMMONSRDF-46
Commit: 96ca8ac2ef28fec96360079b877c9e6a6d124b95
Parents: 13e692c
Author: Stian Soiland-Reyes 
Authored: Wed Oct 26 14:01:07 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Oct 26 14:01:07 2016 +0100

--
 .travis.yml | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/96ca8ac2/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 283b9c3..9262dcf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,15 @@ sudo: required
 dist: trusty
 
 language: java
-jdk:
-  - oraclejdk8
+
+# Workaround for travis-ci/travis-ci#4042
+addons:
+  apt:
+packages:
+  - oracle-java8-installer
+#jdk:
+#  - oraclejdk8
+
 
 cache:
   directories:

[1/2] incubator-commonsrdf git commit: Is travis happy with dist: trusty?

[stain]

Repository: incubator-commonsrdf
Updated Branches:
  refs/heads/COMMONSRDF-46 400d1e72c -> 96ca8ac2e


Is travis happy with dist: trusty?


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

Branch: refs/heads/COMMONSRDF-46
Commit: 13e692cd0e892ab04f827da1c5c4f682ab0235e8
Parents: 400d1e7
Author: Stian Soiland-Reyes 
Authored: Wed Oct 26 13:48:11 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Oct 26 13:48:11 2016 +0100

--
 .travis.yml | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/13e692cd/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index f356e54..283b9c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
-# Use docker-based build environment
-sudo: false
+# Attempt to get a newer oraclejdk8..
+# See https://docs.travis-ci.com/user/ci-environment/
+sudo: required
+dist: trusty
 
 language: java
 jdk:

[3/3] incubator-commonsrdf git commit: COMMONSRDF-46 Javadoc fixed references

[stain]

COMMONSRDF-46 Javadoc fixed references


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

Branch: refs/heads/COMMONSRDF-46
Commit: 400d1e72c27024ca7ec9eb17cf04ff346e5e2ee9
Parents: 46e159d
Author: Stian Soiland-Reyes 
Authored: Wed Oct 26 13:40:44 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Oct 26 13:40:44 2016 +0100

--
 .../org/apache/commons/rdf/jena/JenaRDF.java|  2 +-
 .../rdf/rdf4j/impl/InternalRDF4JFactory.java|  3 +-
 .../apache/commons/rdf/rdf4j/package-info.java  | 36 
 3 files changed, 24 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/400d1e72/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDF.java
--
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDF.java 
b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDF.java
index 22db284..a550b06 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDF.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDF.java
@@ -67,7 +67,7 @@ import org.apache.jena.sparql.graph.GraphFactory;
  * {@link BlankNode#uniqueReference()}), each instance of JenaRDF uses an
  * internal random state. If for some reason consistent/reproducible BlankNode
  * identity is desired, it is possible to retrieve the state as a UUID using
- * {@link #salt} for subsequent use with {@link JenaFactory#JenaFactory(UUID)} 
-
+ * {@link #salt()} for subsequent use with {@link JenaRDF#JenaRDF(UUID)} -
  * note that such consistency is only guaranteed within the same minor version
  * of Commons RDF.
  * 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/400d1e72/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/InternalRDF4JFactory.java
--
diff --git 
a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/InternalRDF4JFactory.java
 
b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/InternalRDF4JFactory.java
index ca97472..b6d6b29 100644
--- 
a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/InternalRDF4JFactory.java
+++ 
b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/InternalRDF4JFactory.java
@@ -28,6 +28,7 @@ import org.apache.commons.rdf.rdf4j.RDF4JLiteral;
 import org.apache.commons.rdf.rdf4j.RDF4JQuad;
 import org.apache.commons.rdf.rdf4j.RDF4JTerm;
 import org.apache.commons.rdf.rdf4j.RDF4J;
+import org.apache.commons.rdf.rdf4j.RDF4J.Option;
 import org.apache.commons.rdf.rdf4j.RDF4JTriple;
 import org.eclipse.rdf4j.model.BNode;
 import org.eclipse.rdf4j.model.IRI;
@@ -45,7 +46,7 @@ import org.eclipse.rdf4j.repository.Repository;
  * {@link RDF4J} methods like
  * {@link RDF4J#createBlankNode()},
  * {@link RDF4J#asRDFTerm(org.eclipse.rdf4j.model.Value)} and
- * {@link RDF4J#asGraph(Repository, 
org.apache.commons.rdf.rdf4j.RDF4JFactory.Option...)}
+ * {@link RDF4J#asGraph(Repository, Option...)}
  * 
  * This class exists as a public bridge between the packages
  * {@link org.apache.commons.rdf.rdf4j} and

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/400d1e72/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/package-info.java
--
diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/package-info.java 
b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/package-info.java
index dbccdb3..f4bfb7a 100644
--- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/package-info.java
+++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/package-info.java
@@ -18,36 +18,42 @@
 /**
  * Commons RDF integration with http://rdf4j.org/;>RDF4J.
  * 
- * Use the {@link org.apache.commons.rdf.rdf4j.RDF4J} to convert
+ * Use the {@link RDF4J} to convert
  * between Commons RDF and RDF4J types, for instance
- * {@link 
org.apache.commons.rdf.rdf4j.RDF4J#asQuad(org.eclipse.rdf4j.model.Statement)}
+ * {@link RDF4J#asQuad(org.eclipse.rdf4j.model.Statement)}
  * converts a RDF4J {@link org.eclipse.rdf4j.model.Statement} to a
  * {@link org.apache.commons.rdf.api.Quad}. Converted RDF terms implement the
- * {@link org.apache.commons.rdf.rdf4j.RDF4JTerm} interface, and converted
- * statements the {@link org.apache.commons.rdf.rdf4j.RDF4JTripleLike}
+ * {@link RDF4JTerm} interface, and converted
+ * statements the {@link RDF4JTripleLike}
  * interface, which provide convenience access to the underlying RDF4J
  * implementations.
  * 
  * RDF4J {@link 

[2/3] incubator-commonsrdf git commit: Merge branch 'master' into COMMONSRDF-46

[stain]

Merge branch 'master' into COMMONSRDF-46


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

Branch: refs/heads/COMMONSRDF-46
Commit: 46e159db15c8290820e0abebe6bf61ed9c250c3d
Parents: d6306ad 9f73a14
Author: Stian Soiland-Reyes 
Authored: Wed Oct 26 12:58:47 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Oct 26 12:58:47 2016 +0100

--
 .../main/java/org/apache/commons/rdf/rdf4j/RDF4JDataset.java  | 3 ++-
 .../main/java/org/apache/commons/rdf/rdf4j/RDF4JGraph.java| 7 ---
 2 files changed, 6 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/46e159db/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JDataset.java
--
diff --cc rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JDataset.java
index fb54a09,e5edde7..7b5cbaa
--- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JDataset.java
+++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JDataset.java
@@@ -25,13 -25,14 +25,14 @@@ import org.apache.commons.rdf.api.Datas
  import org.apache.commons.rdf.api.IRI;
  import org.apache.commons.rdf.api.Quad;
  import org.apache.commons.rdf.api.RDFTerm;
 -import org.apache.commons.rdf.rdf4j.RDF4JFactory.Option;
++import org.apache.commons.rdf.rdf4j.RDF4J.Option;
  
  
  /**
   * Marker interface for RDF4J implementations of Dataset.
   * 
 - * @see RDF4JFactory#createDataset()
 - * @see RDF4JFactory#asDataset(org.eclipse.rdf4j.repository.Repository, 
Option...)
 + * @see RDF4J#createDataset()
-  * @see RDF4J#asDataset(org.eclipse.rdf4j.repository.Repository, 
org.apache.commons.rdf.rdf4j.RDF4JFactory.Option...)
++ * @see RDF4J#asDataset(org.eclipse.rdf4j.repository.Repository, Option...)
   */
  public interface RDF4JDataset extends Dataset, RDF4JGraphLike {


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/46e159db/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JGraph.java
--
diff --cc rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JGraph.java
index d1ab485,4968b99..65cdf67
--- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JGraph.java
+++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JGraph.java
@@@ -28,15 -28,16 +28,16 @@@ import org.apache.commons.rdf.api.RDFTe
  import org.apache.commons.rdf.api.Triple;
  import org.eclipse.rdf4j.model.Model;
  import org.eclipse.rdf4j.repository.Repository;
 -import org.apache.commons.rdf.rdf4j.RDF4JFactory.Option;
++import org.apache.commons.rdf.rdf4j.RDF4J.Option;
  
  
  /**
   * Marker interface for RDF4J implementations of Graph.
   * 
 - * @see RDF4JFactory#createGraph()
 - * @see RDF4JFactory#asGraph(Model)
 - * @see RDF4JFactory#asGraph(Repository, Option...)
 - * @see RDF4JFactory#asGraphUnion(Repository, Option...)
 + * @see RDF4J#createGraph()
 + * @see RDF4J#asGraph(Model)
-  * @see RDF4J#asGraph(Repository, 
org.apache.commons.rdf.rdf4j.RDF4JFactory.Option...)
-  * @see RDF4J#asGraphUnion(Repository, 
org.apache.commons.rdf.rdf4j.RDF4JFactory.Option...)
++ * @see RDF4J#asGraph(Repository, Option...)
++ * @see RDF4J#asGraphUnion(Repository, Option...)
   * @see RDF4JDataset#getGraph()
   * @see RDF4JDataset#getGraph(BlankNodeOrIRI)
   */
@@@ -64,7 -65,7 +65,7 @@@ public interface RDF4JGraph extends Gra
 * Note that the context mask itself cannot be null.
 * 
 * The returned set is an immutable copy; to specify a different mask, 
use
-* {@link RDF4J#asGraph(Repository, Set, 
org.apache.commons.rdf.rdf4j.RDF4JFactory.Option...)}
 -   * {@link RDF4JFactory#asGraph(Repository, Set, Option...)}
++   * {@link RDF4J#asGraph(Repository, Set, Option...)}
 *
 * @return The context mask as a set of {@link BlankNodeOrIRI} graph 
names, which
 * may contain the value null.

[1/3] incubator-commonsrdf git commit: import RDF4JFactory.Option for javadoc

[stain]

Repository: incubator-commonsrdf
Updated Branches:
  refs/heads/COMMONSRDF-46 d6306ad47 -> 400d1e72c


import RDF4JFactory.Option for javadoc


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

Branch: refs/heads/COMMONSRDF-46
Commit: 9f73a1455f33ba2aa2aaece6754a8c53bcbd6855
Parents: 2a5dbf9
Author: Stian Soiland-Reyes 
Authored: Wed Oct 26 12:54:51 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Oct 26 12:54:51 2016 +0100

--
 .../main/java/org/apache/commons/rdf/rdf4j/RDF4JDataset.java  | 3 ++-
 .../main/java/org/apache/commons/rdf/rdf4j/RDF4JGraph.java| 7 ---
 2 files changed, 6 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/9f73a145/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JDataset.java
--
diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JDataset.java 
b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JDataset.java
index 87803fa..e5edde7 100644
--- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JDataset.java
+++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JDataset.java
@@ -25,13 +25,14 @@ import org.apache.commons.rdf.api.Dataset;
 import org.apache.commons.rdf.api.IRI;
 import org.apache.commons.rdf.api.Quad;
 import org.apache.commons.rdf.api.RDFTerm;
+import org.apache.commons.rdf.rdf4j.RDF4JFactory.Option;
 
 
 /**
  * Marker interface for RDF4J implementations of Dataset.
  * 
  * @see RDF4JFactory#createDataset()
- * @see RDF4JFactory#asDataset(org.eclipse.rdf4j.repository.Repository, 
org.apache.commons.rdf.rdf4j.RDF4JFactory.Option...)
+ * @see RDF4JFactory#asDataset(org.eclipse.rdf4j.repository.Repository, 
Option...)
  */
 public interface RDF4JDataset extends Dataset, RDF4JGraphLike {


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/9f73a145/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JGraph.java
--
diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JGraph.java 
b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JGraph.java
index 70edd3f..4968b99 100644
--- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JGraph.java
+++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JGraph.java
@@ -28,6 +28,7 @@ import org.apache.commons.rdf.api.RDFTerm;
 import org.apache.commons.rdf.api.Triple;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.repository.Repository;
+import org.apache.commons.rdf.rdf4j.RDF4JFactory.Option;
 
 
 /**
@@ -35,8 +36,8 @@ import org.eclipse.rdf4j.repository.Repository;
  * 
  * @see RDF4JFactory#createGraph()
  * @see RDF4JFactory#asGraph(Model)
- * @see RDF4JFactory#asGraph(Repository, 
org.apache.commons.rdf.rdf4j.RDF4JFactory.Option...)
- * @see RDF4JFactory#asGraphUnion(Repository, 
org.apache.commons.rdf.rdf4j.RDF4JFactory.Option...)
+ * @see RDF4JFactory#asGraph(Repository, Option...)
+ * @see RDF4JFactory#asGraphUnion(Repository, Option...)
  * @see RDF4JDataset#getGraph()
  * @see RDF4JDataset#getGraph(BlankNodeOrIRI)
  */
@@ -64,7 +65,7 @@ public interface RDF4JGraph extends Graph, 
RDF4JGraphLike {
 * Note that the context mask itself cannot be null.
 * 
 * The returned set is an immutable copy; to specify a different mask, 
use
-* {@link RDF4JFactory#asGraph(Repository, Set, 
org.apache.commons.rdf.rdf4j.RDF4JFactory.Option...)}
+* {@link RDF4JFactory#asGraph(Repository, Set, Option...)}
 *
 * @return The context mask as a set of {@link BlankNodeOrIRI} graph 
names, which
 * may contain the value null.

incubator-commonsrdf git commit: import RDF4JFactory.Option for javadoc

[stain]

Repository: incubator-commonsrdf
Updated Branches:
  refs/heads/master 2a5dbf9ff -> 9f73a1455


import RDF4JFactory.Option for javadoc


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

Branch: refs/heads/master
Commit: 9f73a1455f33ba2aa2aaece6754a8c53bcbd6855
Parents: 2a5dbf9
Author: Stian Soiland-Reyes 
Authored: Wed Oct 26 12:54:51 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Oct 26 12:54:51 2016 +0100

--
 .../main/java/org/apache/commons/rdf/rdf4j/RDF4JDataset.java  | 3 ++-
 .../main/java/org/apache/commons/rdf/rdf4j/RDF4JGraph.java| 7 ---
 2 files changed, 6 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/9f73a145/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JDataset.java
--
diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JDataset.java 
b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JDataset.java
index 87803fa..e5edde7 100644
--- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JDataset.java
+++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JDataset.java
@@ -25,13 +25,14 @@ import org.apache.commons.rdf.api.Dataset;
 import org.apache.commons.rdf.api.IRI;
 import org.apache.commons.rdf.api.Quad;
 import org.apache.commons.rdf.api.RDFTerm;
+import org.apache.commons.rdf.rdf4j.RDF4JFactory.Option;
 
 
 /**
  * Marker interface for RDF4J implementations of Dataset.
  * 
  * @see RDF4JFactory#createDataset()
- * @see RDF4JFactory#asDataset(org.eclipse.rdf4j.repository.Repository, 
org.apache.commons.rdf.rdf4j.RDF4JFactory.Option...)
+ * @see RDF4JFactory#asDataset(org.eclipse.rdf4j.repository.Repository, 
Option...)
  */
 public interface RDF4JDataset extends Dataset, RDF4JGraphLike {


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/9f73a145/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JGraph.java
--
diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JGraph.java 
b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JGraph.java
index 70edd3f..4968b99 100644
--- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JGraph.java
+++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JGraph.java
@@ -28,6 +28,7 @@ import org.apache.commons.rdf.api.RDFTerm;
 import org.apache.commons.rdf.api.Triple;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.repository.Repository;
+import org.apache.commons.rdf.rdf4j.RDF4JFactory.Option;
 
 
 /**
@@ -35,8 +36,8 @@ import org.eclipse.rdf4j.repository.Repository;
  * 
  * @see RDF4JFactory#createGraph()
  * @see RDF4JFactory#asGraph(Model)
- * @see RDF4JFactory#asGraph(Repository, 
org.apache.commons.rdf.rdf4j.RDF4JFactory.Option...)
- * @see RDF4JFactory#asGraphUnion(Repository, 
org.apache.commons.rdf.rdf4j.RDF4JFactory.Option...)
+ * @see RDF4JFactory#asGraph(Repository, Option...)
+ * @see RDF4JFactory#asGraphUnion(Repository, Option...)
  * @see RDF4JDataset#getGraph()
  * @see RDF4JDataset#getGraph(BlankNodeOrIRI)
  */
@@ -64,7 +65,7 @@ public interface RDF4JGraph extends Graph, 
RDF4JGraphLike {
 * Note that the context mask itself cannot be null.
 * 
 * The returned set is an immutable copy; to specify a different mask, 
use
-* {@link RDF4JFactory#asGraph(Repository, Set, 
org.apache.commons.rdf.rdf4j.RDF4JFactory.Option...)}
+* {@link RDF4JFactory#asGraph(Repository, Set, Option...)}
 *
 * @return The context mask as a set of {@link BlankNodeOrIRI} graph 
names, which
 * may contain the value null.

[46/50] [abbrv] incubator-commonsrdf git commit: remove duplicate junit dependency

[stain]

remove duplicate junit dependency

.. now in parent 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/13464e28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/13464e28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/13464e28

Branch: refs/heads/COMMONSRDF-46
Commit: 13464e2858ac394d783d782a94449d478741bcd6
Parents: b54b5c6
Author: Stian Soiland-Reyes 
Authored: Wed Oct 26 11:45:36 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Oct 26 11:45:36 2016 +0100

--
 api/pom.xml| 7 ---
 simple/pom.xml | 5 -
 2 files changed, 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/13464e28/api/pom.xml
--
diff --git a/api/pom.xml b/api/pom.xml
index 14278d6..f3090c7 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -33,13 +33,6 @@
 Commons RDF: API
 Commons Java API for RDF 1.1
 
-
-
-junit
-junit
-test
-
-
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/13464e28/simple/pom.xml
--
diff --git a/simple/pom.xml b/simple/pom.xml
index bc8a861..8e0ad57 100644
--- a/simple/pom.xml
+++ b/simple/pom.xml
@@ -46,10 +46,5 @@
 tests
 test
 
-
-junit
-junit
-test
-
 
 

[47/50] [abbrv] incubator-commonsrdf git commit: more extensive Jena tests

[stain]

more extensive Jena tests


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

Branch: refs/heads/COMMONSRDF-46
Commit: 6fdc9903b70fe8c4cacd7c70c6ed012d93a7d8f9
Parents: 13464e2
Author: Stian Soiland-Reyes 
Authored: Wed Oct 26 12:10:32 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Oct 26 12:10:32 2016 +0100

--
 .../jena/TestJenaGraphToCommonsRDFGraph.java| 93 +---
 1 file changed, 80 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/6fdc9903/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
--
diff --git 
a/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
 
b/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
index 13ee7e7..050de4e 100644
--- 
a/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
+++ 
b/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
@@ -18,14 +18,22 @@
 
 package org.apache.commons.rdf.jena;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 
+import org.apache.commons.rdf.api.BlankNode;
+import org.apache.commons.rdf.api.BlankNodeOrIRI;
 import org.apache.commons.rdf.api.Graph ;
-import org.apache.commons.rdf.api.RDFTermFactory ;
-import org.apache.jena.riot.Lang ;
+import org.apache.commons.rdf.api.RDFTerm;
+import org.apache.commons.rdf.api.Triple;
+import org.apache.commons.rdf.simple.Types;
+import org.apache.jena.riot.Lang;
 import org.apache.jena.riot.RDFDataMgr ;
 import org.apache.jena.sparql.graph.GraphFactory ;
 import org.junit.After;
@@ -34,7 +42,8 @@ import org.junit.Test;
 
 /** Adapt a Jena Graph after parsing data into it */
 public class TestJenaGraphToCommonsRDFGraph {
-private Path turtleFile;
+private static final boolean DEBUG = false;
+   private Path turtleFile;
 
 
 @Before
@@ -55,19 +64,77 @@ public class TestJenaGraphToCommonsRDFGraph {
 org.apache.jena.graph.Graph jGraph = GraphFactory.createGraphMem() ;   
 
 RDFDataMgr.read(jGraph, turtleFile.toUri().toString()) ;
 
+JenaFactory factory = new JenaFactory() ;
+
 // "graph" is a CommonsRDF graph 
-Graph graph = new JenaFactory().fromJena(jGraph) ;
+Graph graph = factory.fromJena(jGraph) ;
+
+
+
+// The below check expected statements from D.ttl
+
+JenaIRI p = factory.createIRI("http://example.com/p;);
+   JenaIRI s = factory.createIRI("http://example.com/s;);
+   JenaLiteral literal123 = factory.createLiteral("123", 
Types.XSD_INTEGER);
+   assertTrue(graph.contains(s, p, literal123));
+
+JenaIRI p1 = factory.createIRI("http://example.com/p1;);
+// Let's look up the BlankNode
+   BlankNodeOrIRI bnode1 = graph.stream(null, p1, null)
+   .findFirst().map(Triple::getSubject).get();
+assertTrue(bnode1 instanceof BlankNode);
+
+// Verify we can use BlankNode in query again
+RDFTerm obj = graph.stream(bnode1, p1, 
null).findFirst().map(Triple::getObject).get();
+
+// Let's look up also that nested blank node
+assertTrue(obj instanceof BlankNode);
+BlankNode bnode2 = (BlankNode)obj;
 
+
+
+JenaIRI q = factory.createIRI("http://example.com/q;);
+JenaLiteral literalR = factory.createLiteral("r", "en");
+   assertTrue(graph.contains(bnode2, q, literalR));
+
+
+   // Can we add the same triple again as s/p/o 
+   // without affecting graph size?
+   // Just to be evil we add a blanknode-iri-blanknode statement
+assertEquals(3, graph.size());
+   graph.add(bnode1, p1, bnode2);
+   assertEquals(3, graph.size());
+
+   // Add the same Triple again
+   
graph.stream(bnode2,null,null).findFirst().ifPresent(graph::add);
+   assertEquals(3, graph.size());
+   
+   
 // Add to CommonsRDF Graph
-RDFTermFactory rft = new JenaFactory() ;
-

[29/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'master' into jena-jsonld-rdf4j-integration

[stain]

Merge branch 'master' into jena-jsonld-rdf4j-integration


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

Branch: refs/heads/COMMONSRDF-46
Commit: 6df7f1db169ad134d32738e820278f1f763b70c9
Parents: 6c17d5e e0d3191
Author: Stian Soiland-Reyes 
Authored: Wed Sep 28 14:49:19 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Sep 28 14:49:19 2016 +0100

--
 .../commons/rdf/simple/RDFParseException.java   | 50 
 .../simple/experimental/AbstractRDFParser.java  |  1 -
 .../simple/experimental/RDFParseException.java  | 50 
 .../rdf/simple/DummyRDFParserBuilder.java   |  1 +
 4 files changed, 51 insertions(+), 51 deletions(-)
--

[32/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'rdf4j' into jena-jsonld-rdf4j-integration

[stain]

Merge branch 'rdf4j' into jena-jsonld-rdf4j-integration


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

Branch: refs/heads/COMMONSRDF-46
Commit: 549872958413218d854e4a21582eacd479dabca4
Parents: 0c11091 0a9c075
Author: Stian Soiland-Reyes 
Authored: Wed Sep 28 14:49:56 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Sep 28 14:49:56 2016 +0100

--

--

[19/50] [abbrv] incubator-commonsrdf git commit: comment on all to all

[stain]

comment on all to all


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

Branch: refs/heads/COMMONSRDF-46
Commit: 8a26fe8ff3e989ad0c808f95ad7670b9a2e91303
Parents: 92eb91a
Author: Stian Soiland-Reyes 
Authored: Fri Sep 23 17:58:17 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Fri Sep 23 17:58:17 2016 +0100

--
 .../java/org/apache/commons/rdf/integrationtests/AllToAllTest.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/8a26fe8f/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
--
diff --git 
a/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
 
b/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
index b0b4f3b..3edf6e4 100644
--- 
a/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
+++ 
b/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
@@ -48,6 +48,8 @@ public class AllToAllTest {
Collection  allToAll = new ArrayList<>();
for (Class from : factories) {
for (Class to : factories) {
+   // NOTE: we deliberately include self-to-self 
here
+   // to test two instances of the same 
implementation
allToAll.add(new Object[]{from, to});
}
}

[28/50] [abbrv] incubator-commonsrdf git commit: Jena*Impl prefixes

[stain]

Jena*Impl prefixes


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

Branch: refs/heads/COMMONSRDF-46
Commit: 6c17d5ed10400c840f749ac1f2d252a4010f8cad
Parents: ef6a1af
Author: Stian Soiland-Reyes 
Authored: Wed Sep 28 01:18:19 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Sep 28 01:18:19 2016 +0100

--
 .../commons/rdf/jena/JenaRDFTermFactory.java|   2 +-
 .../rdf/jena/impl/AbstractJenaRDFTerm.java  |  47 +
 .../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 | 154 ---
 .../apache/commons/rdf/jena/impl/IRIImpl.java   |  61 --
 .../commons/rdf/jena/impl/JenaAnyImpl.java  |  54 ++
 .../rdf/jena/impl/JenaBlankNodeImpl.java|  61 ++
 .../commons/rdf/jena/impl/JenaDatasetImpl.java  | 187 +++
 .../commons/rdf/jena/impl/JenaFactory.java  |  52 +++---
 .../rdf/jena/impl/JenaGeneralizedQuad.java  | 136 ++
 .../commons/rdf/jena/impl/JenaGraphImpl.java| 154 +++
 .../commons/rdf/jena/impl/JenaIRIImpl.java  |  61 ++
 .../commons/rdf/jena/impl/JenaLiteralImpl.java  |  73 
 .../commons/rdf/jena/impl/JenaQuadImpl.java |  66 +++
 .../commons/rdf/jena/impl/JenaTripleImpl.java   |  67 +++
 .../commons/rdf/jena/impl/JenaVariableImpl.java |  64 +++
 .../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 ---
 24 files changed, 997 insertions(+), 997 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/6c17d5ed/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
--
diff --git 
a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java 
b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
index ec84c0a..7359acb 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
@@ -681,7 +681,7 @@ public final class JenaRDFTermFactory implements 
RDFTermFactory {
return null;
}
if (term instanceof JenaRDFTerm)
-   // TODO: What if it's a BlankNodeImpl with
+   // TODO: What if it's a JenaBlankNodeImpl with
// a different salt? Do we need to rewrite the
// jena blanknode identifier?
return ((JenaRDFTerm) term).asJenaNode();

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/6c17d5ed/jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractJenaRDFTerm.java
--
diff --git 
a/jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractJenaRDFTerm.java 
b/jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractJenaRDFTerm.java
new file mode 100644
index 000..9c0d7ec
--- /dev/null
+++ 
b/jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractJenaRDFTerm.java
@@ -0,0 +1,47 @@
+/**
+ * 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.commons.rdf.jena.impl;
+
+import org.apache.commons.rdf.api.RDFTerm;
+import org.apache.commons.rdf.jena.JenaRDFTerm;
+import 

[13/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'jena' into jena-jsonld-rdf4j-integration

[stain]

Merge branch 'jena' into jena-jsonld-rdf4j-integration


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

Branch: refs/heads/COMMONSRDF-46
Commit: 60864de72d0f5ac38a765fcadaa9ce52d27b748e
Parents: ace02c0 47abae8
Author: Stian Soiland-Reyes 
Authored: Tue Sep 13 00:12:40 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Tue Sep 13 00:12:40 2016 +0100

--
 .../org/apache/commons/rdf/jena/JenaRDFTermFactory.java   | 10 +-
 .../apache/commons/rdf/jena/impl/GeneralizedQuadImpl.java |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
--

[09/50] [abbrv] incubator-commonsrdf git commit: addTermsFromOtherFactory

[stain]

addTermsFromOtherFactory


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

Branch: refs/heads/COMMONSRDF-46
Commit: b8ff697a9bab3804ac59d7764c26ab76fda4ba23
Parents: 1828c2a
Author: Stian Soiland-Reyes 
Authored: Fri Sep 9 17:42:27 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Fri Sep 9 17:44:30 2016 +0100

--
 .../rdf/integrationtests/AllToAllTest.java  | 46 
 1 file changed, 29 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/b8ff697a/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
--
diff --git 
a/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
 
b/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
index a8cd1cd..b9ea397 100644
--- 
a/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
+++ 
b/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
@@ -7,6 +7,7 @@ import org.apache.commons.rdf.api.BlankNode;
 import org.apache.commons.rdf.api.Graph;
 import org.apache.commons.rdf.api.IRI;
 import org.apache.commons.rdf.api.Literal;
+import org.apache.commons.rdf.api.RDFTerm;
 import org.apache.commons.rdf.api.RDFTermFactory;
 import org.apache.commons.rdf.api.Triple;
 import org.apache.commons.rdf.jena.JenaRDFTermFactory;
@@ -24,48 +25,57 @@ public class AllToAllTest {
 
@Test
public void jenaToRdf4j() throws Exception {
-   nodesIntoOther(jenaFactory, rdf4jFactory);
+   addTermsFromOtherFactory(jenaFactory, rdf4jFactory);
}
@Test
public void jenaToJsonLd() throws Exception {
-   nodesIntoOther(jenaFactory, jsonldFactory);
+   addTermsFromOtherFactory(jenaFactory, jsonldFactory);
}
@Test
public void jenaToSimple() throws Exception {
-   nodesIntoOther(jenaFactory, simpleFactory);
+   addTermsFromOtherFactory(jenaFactory, simpleFactory);
}

@Test
public void rdf4jToJena() throws Exception {
-   nodesIntoOther(rdf4jFactory, jenaFactory);
+   addTermsFromOtherFactory(rdf4jFactory, jenaFactory);
}
@Test
public void rdf4jToJsonLd() throws Exception {
-   nodesIntoOther(rdf4jFactory, jsonldFactory);
+   addTermsFromOtherFactory(rdf4jFactory, jsonldFactory);
}   
@Test
public void rdf4jToSimple() throws Exception {
-   nodesIntoOther(rdf4jFactory, simpleFactory);
+   addTermsFromOtherFactory(rdf4jFactory, simpleFactory);
}

@Test
public void simpletoJena() throws Exception {
-   nodesIntoOther(simpleFactory, jenaFactory);
+   addTermsFromOtherFactory(simpleFactory, jenaFactory);
}
@Test
public void simpleToJsonLd() throws Exception {
-   nodesIntoOther(simpleFactory, jsonldFactory);
+   addTermsFromOtherFactory(simpleFactory, jsonldFactory);
}
@Test
public void simpleToRdf4j() throws Exception {
-   nodesIntoOther(simpleFactory, rdf4jFactory);
+   addTermsFromOtherFactory(simpleFactory, rdf4jFactory);
}

-   public void nodesIntoOther(RDFTermFactory fromFactory, RDFTermFactory 
toFactory) throws Exception {
-   Graph g = fromFactory.createGraph();
-   BlankNode s = toFactory.createBlankNode();
-   IRI p = toFactory.createIRI("http://example.com/p;);
-   Literal o = toFactory.createLiteral("Hello");
+   /**
+* This test creates a {@link Graph} with the first
+* {@link RDFTermFactory}, then inserts/queries with
+* triples using {@link RDFTerm}s created with the second factory.
+* 
+* @param graphFactory Factory to create {@link Graph}
+* @param nodeFactory
+* @throws Exception
+*/
+   public void addTermsFromOtherFactory(RDFTermFactory nodeFactory, 
RDFTermFactory graphFactory) throws Exception {
+   Graph g = graphFactory.createGraph();
+   BlankNode s = nodeFactory.createBlankNode();
+   IRI p = nodeFactory.createIRI("http://example.com/p;);
+   Literal o = nodeFactory.createLiteral("Hello");
 

[49/50] [abbrv] incubator-commonsrdf git commit: Avoid ConcurrentModification

[stain]

Avoid ConcurrentModification

(can't modify graph while streaming it)


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

Branch: refs/heads/COMMONSRDF-46
Commit: 2a5dbf9ff0633f1f7f518ef1431d53e21831281f
Parents: 5c190d2
Author: Stian Soiland-Reyes 
Authored: Wed Oct 26 12:35:00 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Oct 26 12:35:00 2016 +0100

--
 .../apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java | 5 -
 1 file changed, 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/2a5dbf9f/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
--
diff --git 
a/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
 
b/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
index 393bc8f..728bba2 100644
--- 
a/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
+++ 
b/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
@@ -130,11 +130,6 @@ public class TestJenaGraphToCommonsRDFGraph {
System.out.println("\n Write Jena graph directly\n") ;
RDFDataMgr.write(System.out, jGraph, Lang.TTL) ;
 }
-
-// Can stream modify the jGraph? Let's try to remove..
-assertFalse(jGraph.isEmpty());
-graph.stream().forEach(graph::remove);
-assertTrue(jGraph.isEmpty());
 }
 }
 

[22/50] [abbrv] incubator-commonsrdf git commit: RDFParserBuilder -> RDFParser

[stain]

RDFParserBuilder -> RDFParser


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

Branch: refs/heads/COMMONSRDF-46
Commit: 313fbf75d349cf194baf83cb2da399bd8ad34bb6
Parents: ed73c6f
Author: Stian Soiland-Reyes 
Authored: Tue Sep 27 17:13:16 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Tue Sep 27 17:16:34 2016 +0100

--
 .../org/apache/commons/rdf/api/RDFParser.java   | 479 
 .../commons/rdf/api/RDFParserBuilder.java   | 479 
 .../apache/commons/rdf/jena/JenaRDFParser.java  | 103 
 .../commons/rdf/jena/JenaRDFParserBuilder.java  | 103 
 .../commons/rdf/jena/TestRDFParserBuilder.java  |   4 +-
 .../rdf/jsonldjava/JsonLdParserBuilder.java |   4 +-
 .../apache/commons/rdf/rdf4j/RDF4JParser.java   | 194 +++
 .../commons/rdf/rdf4j/RDF4JParserBuilder.java   | 194 ---
 .../apache/commons/rdf/rdf4j/package-info.java  |   6 +-
 .../commons/rdf/simple/AbstractRDFParser.java   | 541 +++
 .../rdf/simple/AbstractRDFParserBuilder.java| 541 ---
 .../commons/rdf/simple/RDFParseException.java   |  14 +-
 .../simple/AbstractRDFParserBuilderTest.java|  26 +-
 .../rdf/simple/DummyRDFParserBuilder.java   |  10 +-
 14 files changed, 1349 insertions(+), 1349 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/313fbf75/api/src/main/java/org/apache/commons/rdf/api/RDFParser.java
--
diff --git a/api/src/main/java/org/apache/commons/rdf/api/RDFParser.java 
b/api/src/main/java/org/apache/commons/rdf/api/RDFParser.java
new file mode 100644
index 000..72c7e61
--- /dev/null
+++ b/api/src/main/java/org/apache/commons/rdf/api/RDFParser.java
@@ -0,0 +1,479 @@
+/**
+ * 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.commons.rdf.api;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.Optional;
+import java.util.concurrent.Future;
+import java.util.function.Consumer;
+
+/**
+ * Parse an RDF source into a target (e.g. a Graph/Dataset).
+ * 
+ * This interface follows the
+ * https://en.wikipedia.org/wiki/Builder_pattern;>Builder pattern,
+ * allowing to set parser settings like {@link #contentType(RDFSyntax)} and
+ * {@link #base(IRI)}. A caller MUST call one of the source 
methods
+ * (e.g. {@link #source(IRI)}, {@link #source(Path)},
+ * {@link #source(InputStream)}), and MUST call one of the target
+ * methods (e.g. {@link #target(Consumer)}, {@link #target(Dataset)},
+ * {@link #target(Graph)}) before calling {@link #parse()} on the returned
+ * RDFParser - however methods can be called in any order.
+ * 
+ * The call to {@link #parse()} returns a {@link Future}, allowing asynchronous
+ * parse operations. Callers are recommended to check {@link Future#get()} to
+ * ensure parsing completed successfully, or catch exceptions thrown during
+ * parsing.
+ * 
+ * Setting a method that has already been set will override any existing value
+ * in the returned builder - regardless of the parameter type (e.g.
+ * {@link #source(IRI)} will override a previous {@link #source(Path)}. 
Settings
+ * can be unset by passing null - note that this may 
+ * require casting, e.g. contentType( (RDFSyntax) null ) 
+ * to undo a previous call to {@link #contentType(RDFSyntax)}.
+ * 
+ * It is undefined if a RDFParser is mutable or thread-safe, so callers
+ * should always use the returned modified RDFParser from the builder
+ * methods. The builder may return itself after modification, 
+ * or a cloned builder with the modified settings applied. 
+ * Implementations are however encouraged to be immutable,
+ * thread-safe and document this. As an example 

[12/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'parser-with-quads' into jena-jsonld-rdf4j-integration

[stain]

Merge branch 'parser-with-quads' into jena-jsonld-rdf4j-integration


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

Branch: refs/heads/COMMONSRDF-46
Commit: ace02c0c179f490d1e563d35e23dffbd6d951ef6
Parents: 2b51794 bfcead4
Author: Stian Soiland-Reyes 
Authored: Tue Sep 13 00:12:35 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Tue Sep 13 00:12:35 2016 +0100

--
 .../commons/rdf/api/RDFParserBuilder.java   | 21 +---
 .../rdf/simple/AbstractRDFParserBuilder.java|  6 +-
 2 files changed, 15 insertions(+), 12 deletions(-)
--

[07/50] [abbrv] incubator-commonsrdf git commit: correct jsonld dependency

[stain]

correct jsonld dependency


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

Branch: refs/heads/COMMONSRDF-46
Commit: 97e3acd9462ce7c66a787c5d45cd95d5f13a590d
Parents: 3f88d29
Author: Stian Soiland-Reyes 
Authored: Fri Sep 9 17:26:26 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Fri Sep 9 17:26:26 2016 +0100

--
 integration-tests/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/97e3acd9/integration-tests/pom.xml
--
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 7ddab6b..57835e5 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -53,7 +53,7 @@
as both rdf4j and jena depend on jsonld -->

${project.groupId}
-   commons-rdf-jsonld
+   commons-rdf-jsonld-java
${project.version}

[33/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'master' into jena-jsonld-rdf4j-integration

[stain]

Merge branch 'master' into jena-jsonld-rdf4j-integration


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

Branch: refs/heads/COMMONSRDF-46
Commit: 27e80654d917efc3d79c54f8596b20b6af3b8734
Parents: 5498729 5afd0bd
Author: Stian Soiland-Reyes 
Authored: Wed Sep 28 23:27:27 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Sep 28 23:27:27 2016 +0100

--
 .../java/org/apache/commons/rdf/api/Graph.java  |  5 ++
 .../java/org/apache/commons/rdf/api/Quad.java   |  4 +-
 .../commons/rdf/experimental/RDFParser.java |  8 +--
 .../commons/rdf/experimental/package-info.java  |  1 -
 pom.xml |  4 +-
 .../simple/experimental/AbstractRDFParser.java  | 54 +---
 .../rdf/simple/experimental/package-info.java   | 11 ++--
 7 files changed, 53 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/27e80654/pom.xml
--

[27/50] [abbrv] incubator-commonsrdf git commit: RDFParser is experimental feature for now

[stain]

RDFParser is experimental feature for now


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

Branch: refs/heads/COMMONSRDF-46
Commit: ef6a1af4819cddacd317952a950bda4ae46c6f18
Parents: 74196bd
Author: Stian Soiland-Reyes 
Authored: Tue Sep 27 18:54:06 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Tue Sep 27 18:54:06 2016 +0100

--
 .../java/org/apache/commons/rdf/experimental/RDFParser.java| 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/ef6a1af4/api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java
--
diff --git 
a/api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java 
b/api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java
index 39b7253..dd6bcf0 100644
--- a/api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java
+++ b/api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java
@@ -37,6 +37,12 @@ import org.apache.commons.rdf.api.Triple;
 
 /**
  * Parse an RDF source into a target (e.g. a Graph/Dataset).
+ * Experimental
+ * This interface (and its implementations) should be considered at
+ * risk; they might change or be removed in the next minor update of
+ * Commons RDF. It may move to the the  {@link org.apache.commons.rdf.api}
+ * package when it has stabilized.
+ * Description
  * 
  * This interface follows the
  * https://en.wikipedia.org/wiki/Builder_pattern;>Builder pattern,

[02/50] [abbrv] incubator-commonsrdf git commit: pom title

[stain]

pom title


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

Branch: refs/heads/COMMONSRDF-46
Commit: 888a2a436f2ea7d8645386cf20485ea91e7c84cb
Parents: 3353f9a
Author: Stian Soiland-Reyes 
Authored: Fri Sep 9 16:34:13 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Fri Sep 9 16:34:13 2016 +0100

--
 integration-tests/pom.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/888a2a43/integration-tests/pom.xml
--
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 196f4d5..71fd66b 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -64,4 +64,5 @@

 

+   Commons RDF: Integration tests
 

[11/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'master' into jena-jsonld-rdf4j-integration

[stain]

Merge branch 'master' into jena-jsonld-rdf4j-integration


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

Branch: refs/heads/COMMONSRDF-46
Commit: 2b51794e84caf64831c131f4cd84f34d3976dfa2
Parents: 112505d de7fe8a
Author: Stian Soiland-Reyes 
Authored: Mon Sep 12 19:03:47 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Mon Sep 12 19:03:47 2016 +0100

--
 .../apache/commons/rdf/simple/GraphImpl.java| 39 +++-
 1 file changed, 21 insertions(+), 18 deletions(-)
--

[35/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'jsonld-java' into jena-jsonld-rdf4j-integration

[stain]

Merge branch 'jsonld-java' into jena-jsonld-rdf4j-integration


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

Branch: refs/heads/COMMONSRDF-46
Commit: 8296419afd9705b23dbbf938d199ec927714c7bb
Parents: 9bfc39f 11a6a33
Author: Stian Soiland-Reyes 
Authored: Wed Sep 28 23:33:23 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Sep 28 23:33:23 2016 +0100

--
 .../apache/commons/rdf/jsonldjava/JsonLdGraphLike.java  |  8 ++--
 .../apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java |  2 +-
 .../rdf/jsonldjava/experimental/package-info.java   | 12 ++--
 .../commons/rdf/jsonldjava/JsonLdBlankNodeTest.java |  1 -
 4 files changed, 13 insertions(+), 10 deletions(-)
--

[42/50] [abbrv] incubator-commonsrdf git commit: Keep all dependency versions in top pom.xml

[stain]

Keep all dependency versions in top pom.xml

.. as 

Also slf4j-simple set as logging backend for Jena
and JSONLD-Java during tests.


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

Branch: refs/heads/COMMONSRDF-46
Commit: 49601fed85787296d42b53fbdd074deded7f5e9b
Parents: 887c9e6
Author: Stian Soiland-Reyes 
Authored: Wed Oct 26 11:40:27 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Oct 26 11:40:51 2016 +0100

--
 integration-tests/pom.xml | 15 ---
 jena/pom.xml  |  9 ++---
 jsonld-java/pom.xml   |  7 +--
 pom.xml   | 37 +++--
 rdf4j/pom.xml | 10 +-
 5 files changed, 35 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/49601fed/integration-tests/pom.xml
--
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 57835e5..8487ac9 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -56,20 +56,5 @@
commons-rdf-jsonld-java
${project.version}

-   
-   ${project.groupId}
-   commons-rdf-api
-   ${project.version}
-   test-jar
-   test
-   
-   
-   junit
-   junit
-   test
-   
-

-
-
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/49601fed/jena/pom.xml
--
diff --git a/jena/pom.xml b/jena/pom.xml
index f8a2dc4..ab9ff8b 100644
--- a/jena/pom.xml
+++ b/jena/pom.xml
@@ -52,7 +52,7 @@

org.apache.jena
apache-jena-libs
-   ${ver.jena}
+   ${jena.version}
pom
optional

@@ -62,7 +62,7 @@

org.apache.jena
jena-osgi
-   ${ver.jena}
+   ${jena.version}

 

@@ -85,11 +85,6 @@
tests
test

-   
-   junit
-   junit
-   test
-   

 
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/49601fed/jsonld-java/pom.xml
--
diff --git a/jsonld-java/pom.xml b/jsonld-java/pom.xml
index 6a4826c..ad8645c 100644
--- a/jsonld-java/pom.xml
+++ b/jsonld-java/pom.xml
@@ -54,14 +54,9 @@
 
com.github.jsonld-java
jsonld-java
-   0.8.2
+   ${jsonldjava.version}

 
-
-junit
-junit
-test
-
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/49601fed/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 22c01c3..9ef400a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,11 +52,26 @@
 
https://svn.apache.org/repos/infra/websites/production/commonsrdf/content/
 
${project.build.directory}/site-content
 
https://docs.oracle.com/javase/8/docs/api/
-
- 0.9.1
-3.1.0
+
+
+0.9.1
+
+
+
+0.8.2
+2.0
+3.1.0
+
 0.6
 2.11.0_1
+
+
+
+1.7.20
+4.12
+
 
 
 
@@ -224,16 +239,26 @@
 integration-tests
 
 
-
+   
 
 
 junit
 junit
-4.12
+${junit.version}
 test
 
+   
+   
+   org.slf4j
+   slf4j-simple
+   ${slf4j.version}
+   test
+   
 
-
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/49601fed/rdf4j/pom.xml
--
diff --git a/rdf4j/pom.xml 

[24/50] [abbrv] incubator-commonsrdf git commit: RDFParser moved to org.apache.commons.rdf.experimental

[stain]

RDFParser moved to org.apache.commons.rdf.experimental


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

Branch: refs/heads/COMMONSRDF-46
Commit: a189f91efba570f0039c6187e612f7d42aeb2f8d
Parents: 313fbf7
Author: Stian Soiland-Reyes 
Authored: Tue Sep 27 17:29:28 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Tue Sep 27 18:42:28 2016 +0100

--
 .../org/apache/commons/rdf/api/RDFParser.java   | 479 
 .../commons/rdf/experimental/RDFParser.java | 489 +
 .../commons/rdf/experimental/package-info.java  |  34 ++
 .../apache/commons/rdf/jena/JenaRDFParser.java  | 103 
 .../rdf/jena/experimental/JenaRDFParser.java| 105 
 .../rdf/jena/experimental/package-info.java |  34 ++
 .../commons/rdf/jena/TestRDFParserBuilder.java  |   3 +-
 .../rdf/jsonldjava/JsonLdParserBuilder.java | 157 --
 .../jsonldjava/experimental/JsonLdParser.java   | 160 ++
 .../jsonldjava/experimental/package-info.java   |  34 ++
 .../rdf/jsonldjava/JsonLdParserBuilderTest.java |   7 +-
 .../apache/commons/rdf/rdf4j/RDF4JParser.java   | 194 ---
 .../rdf/rdf4j/experimental/RDF4JParser.java | 197 +++
 .../rdf/rdf4j/experimental/package-info.java|  34 ++
 .../apache/commons/rdf/rdf4j/package-info.java  |   6 +-
 .../commons/rdf/simple/AbstractRDFParser.java   | 541 --
 .../commons/rdf/simple/RDFParseException.java   |   2 +-
 .../simple/experimental/AbstractRDFParser.java  | 543 +++
 .../rdf/simple/experimental/package-info.java   |  34 ++
 .../simple/AbstractRDFParserBuilderTest.java|   3 +-
 .../rdf/simple/DummyRDFParserBuilder.java   |   3 +-
 21 files changed, 1678 insertions(+), 1484 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/a189f91e/api/src/main/java/org/apache/commons/rdf/api/RDFParser.java
--
diff --git a/api/src/main/java/org/apache/commons/rdf/api/RDFParser.java 
b/api/src/main/java/org/apache/commons/rdf/api/RDFParser.java
deleted file mode 100644
index 72c7e61..000
--- a/api/src/main/java/org/apache/commons/rdf/api/RDFParser.java
+++ /dev/null
@@ -1,479 +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.commons.rdf.api;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
-import java.util.Optional;
-import java.util.concurrent.Future;
-import java.util.function.Consumer;
-
-/**
- * Parse an RDF source into a target (e.g. a Graph/Dataset).
- * 
- * This interface follows the
- * https://en.wikipedia.org/wiki/Builder_pattern;>Builder pattern,
- * allowing to set parser settings like {@link #contentType(RDFSyntax)} and
- * {@link #base(IRI)}. A caller MUST call one of the source 
methods
- * (e.g. {@link #source(IRI)}, {@link #source(Path)},
- * {@link #source(InputStream)}), and MUST call one of the target
- * methods (e.g. {@link #target(Consumer)}, {@link #target(Dataset)},
- * {@link #target(Graph)}) before calling {@link #parse()} on the returned
- * RDFParser - however methods can be called in any order.
- * 
- * The call to {@link #parse()} returns a {@link Future}, allowing asynchronous
- * parse operations. Callers are recommended to check {@link Future#get()} to
- * ensure parsing completed successfully, or catch exceptions thrown during
- * parsing.
- * 
- * Setting a method that has already been set will override any existing value
- * in the returned builder - regardless of the parameter type (e.g.
- * {@link #source(IRI)} will override a previous {@link #source(Path)}. 
Settings
- * can be unset by passing null - note that this may 
- * require casting, e.g. contentType( (RDFSyntax) null ) 
- * 

[44/50] [abbrv] incubator-commonsrdf git commit: Avoid System.out

[stain]

Avoid System.out


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

Branch: refs/heads/COMMONSRDF-46
Commit: c34a85e14994831825f966a6a9bdb65c59711436
Parents: b51b7bc
Author: Stian Soiland-Reyes 
Authored: Wed Oct 26 11:41:41 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Oct 26 11:41:49 2016 +0100

--
 .../commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java  | 7 +++
 .../java/org/apache/commons/rdf/simple/SimpleGraphTest.java   | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/c34a85e1/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
--
diff --git 
a/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
 
b/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
index 1a7b4e0..13ee7e7 100644
--- 
a/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
+++ 
b/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
@@ -63,10 +63,9 @@ public class TestJenaGraphToCommonsRDFGraph {
 graph.add(rft.createIRI("http://example/s2;),
   rft.createIRI("http://example/p2;),
   rft.createLiteral("foo")) ;
-System.out.println(" Write CommonsRDF graph\n") ;
-graph.stream().forEach(System.out::println) ;
-
-System.out.println("\n Write Jena graph directly\n") ;
+//System.out.println(" Write CommonsRDF graph\n") ;
+//graph.stream().forEach(System.out::println) ;
+//System.out.println("\n Write Jena graph directly\n") ;
 // And its in the Jena graph
 RDFDataMgr.write(System.out, jGraph, Lang.TTL) ;
 }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/c34a85e1/simple/src/test/java/org/apache/commons/rdf/simple/SimpleGraphTest.java
--
diff --git 
a/simple/src/test/java/org/apache/commons/rdf/simple/SimpleGraphTest.java 
b/simple/src/test/java/org/apache/commons/rdf/simple/SimpleGraphTest.java
index 14f14a6..90015c9 100644
--- a/simple/src/test/java/org/apache/commons/rdf/simple/SimpleGraphTest.java
+++ b/simple/src/test/java/org/apache/commons/rdf/simple/SimpleGraphTest.java
@@ -37,7 +37,7 @@ public class SimpleGraphTest extends AbstractGraphTest {
 @Test
 public void graphToString() {
 Assume.assumeNotNull(aliceName, companyName);
-System.out.println(graph);
+//System.out.println(graph);
 assertTrue(graph
 .toString()
 .contains(

[08/50] [abbrv] incubator-commonsrdf git commit: AllToAllTest

[stain]

AllToAllTest


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

Branch: refs/heads/COMMONSRDF-46
Commit: 1828c2abf584958bf25de48d0827c825fd3bb21a
Parents: 97e3acd
Author: Stian Soiland-Reyes 
Authored: Fri Sep 9 17:36:32 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Fri Sep 9 17:36:41 2016 +0100

--
 .../rdf/integrationtests/AllToAllTest.java  | 99 
 .../rdf/integrationtests/JenaRDF4JTest.java | 78 ---
 2 files changed, 99 insertions(+), 78 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/1828c2ab/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
--
diff --git 
a/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
 
b/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
new file mode 100644
index 000..a8cd1cd
--- /dev/null
+++ 
b/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
@@ -0,0 +1,99 @@
+package org.apache.commons.rdf.integrationtests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.apache.commons.rdf.api.BlankNode;
+import org.apache.commons.rdf.api.Graph;
+import org.apache.commons.rdf.api.IRI;
+import org.apache.commons.rdf.api.Literal;
+import org.apache.commons.rdf.api.RDFTermFactory;
+import org.apache.commons.rdf.api.Triple;
+import org.apache.commons.rdf.jena.JenaRDFTermFactory;
+import org.apache.commons.rdf.jsonldjava.JsonLdRDFTermFactory;
+import org.apache.commons.rdf.rdf4j.RDF4JTermFactory;
+import org.apache.commons.rdf.simple.SimpleRDFTermFactory;
+import org.junit.Test;
+
+public class AllToAllTest {
+
+   private RDFTermFactory simpleFactory = new SimpleRDFTermFactory();
+   private RDFTermFactory jenaFactory = new JenaRDFTermFactory();
+   private RDFTermFactory rdf4jFactory = new RDF4JTermFactory();
+   private RDFTermFactory jsonldFactory = new JsonLdRDFTermFactory();
+
+   @Test
+   public void jenaToRdf4j() throws Exception {
+   nodesIntoOther(jenaFactory, rdf4jFactory);
+   }
+   @Test
+   public void jenaToJsonLd() throws Exception {
+   nodesIntoOther(jenaFactory, jsonldFactory);
+   }
+   @Test
+   public void jenaToSimple() throws Exception {
+   nodesIntoOther(jenaFactory, simpleFactory);
+   }
+   
+   @Test
+   public void rdf4jToJena() throws Exception {
+   nodesIntoOther(rdf4jFactory, jenaFactory);
+   }
+   @Test
+   public void rdf4jToJsonLd() throws Exception {
+   nodesIntoOther(rdf4jFactory, jsonldFactory);
+   }   
+   @Test
+   public void rdf4jToSimple() throws Exception {
+   nodesIntoOther(rdf4jFactory, simpleFactory);
+   }
+   
+   @Test
+   public void simpletoJena() throws Exception {
+   nodesIntoOther(simpleFactory, jenaFactory);
+   }
+   @Test
+   public void simpleToJsonLd() throws Exception {
+   nodesIntoOther(simpleFactory, jsonldFactory);
+   }
+   @Test
+   public void simpleToRdf4j() throws Exception {
+   nodesIntoOther(simpleFactory, rdf4jFactory);
+   }
+   
+   public void nodesIntoOther(RDFTermFactory fromFactory, RDFTermFactory 
toFactory) throws Exception {
+   Graph g = fromFactory.createGraph();
+   BlankNode s = toFactory.createBlankNode();
+   IRI p = toFactory.createIRI("http://example.com/p;);
+   Literal o = toFactory.createLiteral("Hello");
+
+   g.add(s, p, o);
+
+   // blankNode should still work with g.contains()
+   assertTrue(g.contains(s, p, o));
+   Triple t1 = g.stream().findAny().get();
+
+   // Can't make assumptions about mappegetPredicated BlankNode 
equality
+   // assertEquals(s, t.getSubject());
+   assertEquals(p, t1.getPredicate());
+   assertEquals(o, t1.getObject());
+
+   IRI s2 = toFactory.createIRI("http://example.com/s2;);
+   g.add(s2, p, s);
+   assertTrue(g.contains(s2, p, s));
+
+   // This should be mapped to the same BlankNode
+   // (even if it has a different identifier), e.g.
+   // we should be able to do:
+
+   Triple t2 = 

[34/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'jena' into jena-jsonld-rdf4j-integration

[stain]

Merge branch 'jena' into jena-jsonld-rdf4j-integration


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

Branch: refs/heads/COMMONSRDF-46
Commit: 9bfc39fce3dfd78d824c93c381b663efe43009f3
Parents: 27e8065 a423c41
Author: Stian Soiland-Reyes 
Authored: Wed Sep 28 23:27:30 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Sep 28 23:27:30 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/src/test/resources/log4j.properties| 15 +++
 4 files changed, 15 insertions(+), 15 deletions(-)
--

[18/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'jsonld-java' into jena-jsonld-rdf4j-integration

[stain]

Merge branch 'jsonld-java' into jena-jsonld-rdf4j-integration


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

Branch: refs/heads/COMMONSRDF-46
Commit: 92eb91a6d530964732d5d45b294ff214fea0f813
Parents: a7849c8 be7bfc8
Author: Stian Soiland-Reyes 
Authored: Fri Sep 23 17:56:55 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Fri Sep 23 17:56:55 2016 +0100

--
 .../commons/rdf/jsonldjava/JsonLdRDFTermFactory.java  | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)
--

[26/50] [abbrv] incubator-commonsrdf git commit: AbstractRDFParserTest moved to ...experimental

[stain]

AbstractRDFParserTest moved to ...experimental


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

Branch: refs/heads/COMMONSRDF-46
Commit: 74196bdd363983648860e98e59888ce552e95933
Parents: c3c1719
Author: Stian Soiland-Reyes 
Authored: Tue Sep 27 18:46:25 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Tue Sep 27 18:46:25 2016 +0100

--
 .../simple/AbstractRDFParserBuilderTest.java| 254 --
 .../experimental/AbstractRDFParserTest.java | 256 +++
 2 files changed, 256 insertions(+), 254 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/74196bdd/simple/src/test/java/org/apache/commons/rdf/simple/AbstractRDFParserBuilderTest.java
--
diff --git 
a/simple/src/test/java/org/apache/commons/rdf/simple/AbstractRDFParserBuilderTest.java
 
b/simple/src/test/java/org/apache/commons/rdf/simple/AbstractRDFParserBuilderTest.java
deleted file mode 100644
index f115e94..000
--- 
a/simple/src/test/java/org/apache/commons/rdf/simple/AbstractRDFParserBuilderTest.java
+++ /dev/null
@@ -1,254 +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.commons.rdf.simple;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.commons.rdf.api.Graph;
-import org.apache.commons.rdf.api.IRI;
-import org.apache.commons.rdf.api.Literal;
-import org.apache.commons.rdf.api.RDFSyntax;
-import org.apache.commons.rdf.api.RDFTerm;
-import org.apache.commons.rdf.api.RDFTermFactory;
-import org.apache.commons.rdf.api.Triple;
-import org.apache.commons.rdf.experimental.RDFParser;
-import org.apache.commons.rdf.simple.experimental.AbstractRDFParser;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-public class AbstractRDFParserBuilderTest {
-
-   private RDFTermFactory factory = new SimpleRDFTermFactory();
-   
-   private DummyRDFParserBuilder dummyParser = new DummyRDFParserBuilder();
-   private Path testNt;
-   private Path testTtl;
-   private Path testXml;
-
-   @Before
-   public void createTempFile() throws IOException {
-   testNt = Files.createTempFile("test", ".nt");
-   testTtl = Files.createTempFile("test", ".ttl");
-   testXml = Files.createTempFile("test", ".xml");
-
-   // No need to populate the files as the dummy parser
-   // doesn't actually read anything
-   }
-
-   @After
-   public void deleteTempFiles() throws IOException {
-   Files.deleteIfExists(testNt);
-   Files.deleteIfExists(testTtl);
-   Files.deleteIfExists(testXml);
-   }
-
-   @Test
-   public void guessRDFSyntax() throws Exception {
-   assertEquals(RDFSyntax.NTRIPLES, 
AbstractRDFParser.guessRDFSyntax(testNt).get());
-   assertEquals(RDFSyntax.TURTLE, 
AbstractRDFParser.guessRDFSyntax(testTtl).get());
-   
assertFalse(AbstractRDFParser.guessRDFSyntax(testXml).isPresent());
-   }
-
-   private void checkGraph(Graph g) throws Exception { 

-   assertTrue(g.size() > 0);   
-   IRI greeting = 
factory.createIRI("http://example.com/greeting;);
-   // Should only have parsed once!
-   

[45/50] [abbrv] incubator-commonsrdf git commit: jena no longer need log4j.properties

[stain]

jena no longer need log4j.properties


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

Branch: refs/heads/COMMONSRDF-46
Commit: b54b5c6862b570a181390f32537310642fb88690
Parents: c34a85e
Author: Stian Soiland-Reyes 
Authored: Wed Oct 26 11:45:13 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Oct 26 11:45:13 2016 +0100

--
 jena/src/test/resources/log4j.properties | 33 ---
 1 file changed, 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/b54b5c68/jena/src/test/resources/log4j.properties
--
diff --git a/jena/src/test/resources/log4j.properties 
b/jena/src/test/resources/log4j.properties
deleted file mode 100644
index 794559f..000
--- a/jena/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,33 +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.
-log4j.rootLogger=INFO, stdlog
-
-log4j.appender.stdlog=org.apache.log4j.ConsoleAppender
-## log4j.appender.stdlog.target=System.err
-log4j.appender.stdlog.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdlog.layout.ConversionPattern=%d{HH:mm:ss} %-5p %-25c{1} :: 
%m%n
-
-# Execution logging
-log4j.logger.org.apache.jena.arq.info=INFO
-log4j.logger.org.apache.jena.arq.exec=INFO
-
-# Everything else in Jena
-log4j.logger.org.apache.jena=WARN
-log4j.logger.org.apache.jena.riot=INFO
-
-# Apache Commons HTTP
-# May be useful to turn up to DEBUG if debugging HTTP communication issues
-log4j.logger.org.apache.http=WARN

[05/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'jsonld-java' into jena-jsonld-rdf4j-integration

[stain]

Merge branch 'jsonld-java' into jena-jsonld-rdf4j-integration


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

Branch: refs/heads/COMMONSRDF-46
Commit: e5e85bd39ba700ac2072b142c867717b4a462baf
Parents: 5ed73ac 3d63a0e
Author: Stian Soiland-Reyes 
Authored: Fri Sep 9 17:15:44 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Fri Sep 9 17:15:44 2016 +0100

--
 .../rdf/jsonldjava/JsonLdParserBuilder.java | 66 ++--
 .../rdf/jsonldjava/JsonLdRDFTermFactory.java|  2 +-
 2 files changed, 47 insertions(+), 21 deletions(-)
--

[41/50] [abbrv] incubator-commonsrdf git commit: Add integration test

[stain]

Add integration test

Merge branch 'jena-jsonld-rdf4j-integration'


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

Branch: refs/heads/COMMONSRDF-46
Commit: 887c9e68a37106f17b5c609a149af718c3e679c4
Parents: 5f6bcff c991d05
Author: Stian Soiland-Reyes 
Authored: Wed Oct 26 11:15:06 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Oct 26 11:17:16 2016 +0100

--
 integration-tests/pom.xml   |  75 
 .../rdf/integrationtests/AllToAllTest.java  | 178 +++
 pom.xml |   1 +
 3 files changed, 254 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/887c9e68/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
--
diff --cc 
integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
index 000,09c887c..24d3697
mode 00,100644..100644
--- 
a/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
+++ 
b/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
@@@ -1,0 -1,161 +1,178 @@@
++/**
++ * 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.commons.rdf.integrationtests;
+ 
+ import static org.junit.Assert.assertEquals;
+ import static org.junit.Assert.assertTrue;
+ 
+ import java.util.ArrayList;
+ import java.util.Arrays;
+ import java.util.Collection;
+ import java.util.List;
+ 
+ import org.apache.commons.rdf.api.BlankNode;
+ import org.apache.commons.rdf.api.Graph;
+ import org.apache.commons.rdf.api.IRI;
+ import org.apache.commons.rdf.api.Literal;
+ import org.apache.commons.rdf.api.RDFTerm;
+ import org.apache.commons.rdf.api.RDFTermFactory;
+ import org.apache.commons.rdf.api.Triple;
+ import org.apache.commons.rdf.jena.JenaRDFTermFactory;
+ import org.apache.commons.rdf.jsonldjava.JsonLdRDFTermFactory;
+ import org.apache.commons.rdf.rdf4j.RDF4JTermFactory;
+ import org.apache.commons.rdf.simple.SimpleRDFTermFactory;
+ import org.junit.Test;
+ import org.junit.runner.RunWith;
+ import org.junit.runners.Parameterized;
+ import org.junit.runners.Parameterized.Parameters;
+ 
+ @RunWith(Parameterized.class)
+ public class AllToAllTest {
+ 
+   private RDFTermFactory nodeFactory;
+   private RDFTermFactory graphFactory;
+ 
+ 
+   public AllToAllTest(
 -  Class from, 
++  Class from,
+   Class to) throws 
InstantiationException, IllegalAccessException {
+   this.nodeFactory = from.newInstance();
 -  this.graphFactory = to.newInstance();   
++  this.graphFactory = to.newInstance();
+   }
 -  
++
+   @SuppressWarnings("rawtypes")
+   @Parameters(name = "{index}: {0}->{1}")
 -  public static Collection data() { 
++  public static Collection data() {
+   List factories = Arrays.asList(
 -  SimpleRDFTermFactory.class, 
 -  JenaRDFTermFactory.class, 
++  SimpleRDFTermFactory.class,
++  JenaRDFTermFactory.class,
+   RDF4JTermFactory.class,
+   JsonLdRDFTermFactory.class);
+   Collection  allToAll = new ArrayList<>();
+   for (Class from : factories) {
+   for (Class to : factories) {
+   // NOTE: we deliberately include self-to-self 
here
+   

[38/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'jena' into jena-jsonld-rdf4j-integration

[stain]

Merge branch 'jena' into jena-jsonld-rdf4j-integration


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

Branch: refs/heads/COMMONSRDF-46
Commit: 489ed91795a423453e6a2919728d976d4cdec9d2
Parents: 28e38ca eb391f8
Author: Stian Soiland-Reyes 
Authored: Thu Sep 29 01:10:31 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Thu Sep 29 01:10:31 2016 +0100

--
 .../commons/rdf/jena/JenaRDFTermFactory.java| 20 
 .../commons/rdf/jena/impl/JenaFactory.java  |  5 ++---
 pom.xml |  6 ++
 3 files changed, 24 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/489ed917/pom.xml
--

[43/50] [abbrv] incubator-commonsrdf git commit: Integration test - use *Factory instead of *RDFTermFactory

[stain]

Integration test - use *Factory instead of *RDFTermFactory


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

Branch: refs/heads/COMMONSRDF-46
Commit: b51b7bc05af83b7478884e94086557a7f5bcb760
Parents: 49601fe
Author: Stian Soiland-Reyes 
Authored: Wed Oct 26 11:41:23 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Oct 26 11:41:23 2016 +0100

--
 .../commons/rdf/integrationtests/AllToAllTest.java  | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/b51b7bc0/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
--
diff --git 
a/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
 
b/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
index 24d3697..1b32e35 100644
--- 
a/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
+++ 
b/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
@@ -32,9 +32,9 @@ import org.apache.commons.rdf.api.Literal;
 import org.apache.commons.rdf.api.RDFTerm;
 import org.apache.commons.rdf.api.RDFTermFactory;
 import org.apache.commons.rdf.api.Triple;
-import org.apache.commons.rdf.jena.JenaRDFTermFactory;
-import org.apache.commons.rdf.jsonldjava.JsonLdRDFTermFactory;
-import org.apache.commons.rdf.rdf4j.RDF4JTermFactory;
+import org.apache.commons.rdf.jena.JenaFactory;
+import org.apache.commons.rdf.jsonldjava.JsonLdFactory;
+import org.apache.commons.rdf.rdf4j.RDF4JFactory;
 import org.apache.commons.rdf.simple.SimpleRDFTermFactory;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -60,9 +60,9 @@ public class AllToAllTest {
public static Collection data() {
List factories = Arrays.asList(
SimpleRDFTermFactory.class,
-   JenaRDFTermFactory.class,
-   RDF4JTermFactory.class,
-   JsonLdRDFTermFactory.class);
+   JenaFactory.class,
+   RDF4JFactory.class,
+   JsonLdFactory.class);
Collection  allToAll = new ArrayList<>();
for (Class from : factories) {
for (Class to : factories) {

[39/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'jena' into jena-jsonld-rdf4j-integration

[stain]

Merge branch 'jena' into jena-jsonld-rdf4j-integration


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

Branch: refs/heads/COMMONSRDF-46
Commit: c991d0562e21ecc49ddb607ec308f3a5b7e13bed
Parents: 489ed91 c763ffa
Author: Stian Soiland-Reyes 
Authored: Thu Sep 29 01:14:05 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Thu Sep 29 01:14:05 2016 +0100

--
 .../java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--

[04/50] [abbrv] incubator-commonsrdf git commit: also depend on jsonld-java

[stain]

also depend on jsonld-java


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

Branch: refs/heads/COMMONSRDF-46
Commit: 5ed73ac6e8c18f7c319bfb73b598d75adb2d3332
Parents: 5a49f96
Author: Stian Soiland-Reyes 
Authored: Fri Sep 9 16:43:43 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Fri Sep 9 16:43:43 2016 +0100

--
 integration-tests/pom.xml | 79 +++---
 1 file changed, 43 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/5ed73ac6/integration-tests/pom.xml
--
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 71fd66b..7ddab6b 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -27,42 +27,49 @@
0.3.0-incubating-SNAPSHOT

commons-rdf-integration-tests
+   Commons RDF: Integration tests

-   
-   ${project.groupId}
-   commons-rdf-api
-   ${project.version}
-   
+   
+   ${project.groupId}
+   commons-rdf-api
+   ${project.version}
+   
+   
+   ${project.groupId}
+   commons-rdf-simple
+   ${project.version}
+   
+   
+   ${project.groupId}
+   commons-rdf-rdf4j
+   ${project.version}
+   
+   
+   ${project.groupId}
+   commons-rdf-jena
+   ${project.version}
+   
+   
+   
+   ${project.groupId}
+   commons-rdf-jsonld
+   ${project.version}
+   
+   
+   ${project.groupId}
+   commons-rdf-api
+   ${project.version}
+   test-jar
+   test
+   
+   
+   junit
+   junit
+   test
+   
+
+   
+
 
-   
-   ${project.groupId}
-   commons-rdf-simple
-   ${project.version}
-   
-   
-   ${project.groupId}
-   commons-rdf-rdf4j
-   ${project.version}
-   
-   
-   ${project.groupId}
-   commons-rdf-jena
-   ${project.version}
-   
-   
-   ${project.groupId}
-   commons-rdf-api
-   ${project.version}
-   test-jar
-   test
-  
-   
-   junit
-   junit
-   test
-   
-   
-
-   
-   Commons RDF: Integration tests
 

[48/50] [abbrv] incubator-commonsrdf git commit: fromJena/toJena -> as* / asJena*

[stain]

fromJena/toJena -> as* / asJena*


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

Branch: refs/heads/COMMONSRDF-46
Commit: 5c190d2104db3b64bd87b7520f9d45859e5805d9
Parents: 6fdc990
Author: Stian Soiland-Reyes 
Authored: Wed Oct 26 12:30:51 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Oct 26 12:30:51 2016 +0100

--
 .../apache/commons/rdf/jena/JenaFactory.java| 150 ++-
 .../rdf/jena/experimental/JenaRDFParser.java|   4 +-
 .../commons/rdf/jena/impl/AbstractQuadLike.java |  28 ++--
 .../rdf/jena/impl/InternalJenaFactory.java  |  72 -
 .../commons/rdf/jena/impl/JenaDatasetImpl.java  |  28 ++--
 .../commons/rdf/jena/impl/JenaGraphImpl.java|  30 ++--
 .../jena/TestJenaGraphToCommonsRDFGraph.java|   2 +-
 7 files changed, 164 insertions(+), 150 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/5c190d21/jena/src/main/java/org/apache/commons/rdf/jena/JenaFactory.java
--
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaFactory.java 
b/jena/src/main/java/org/apache/commons/rdf/jena/JenaFactory.java
index 0d735c7..f2c65df 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaFactory.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaFactory.java
@@ -50,11 +50,25 @@ import org.apache.jena.sparql.graph.GraphFactory;
 /**
  * RDFTermFactory with Jena-backed objects.
  * 
- * This factory can also convert existing objects from/to Jena with methods 
like
- * {@link #fromJena(org.apache.jena.graph.Graph)} and {@link #toJena(Graph)}.
+ * This factory can also convert existing objects from Jena with methods like
+ * {@link #asRDFTerm(Node)} and {@link #asGraph(org.apache.jena.graph.Graph)},
+ * and vice versa from any Commons RDF object to Jena with the
+ * asJena* methods like {@link #asJenaNode(RDFTerm)} and
+ * {@link #asJenaGraph(Graph)}.
  * 
- * For the purpose of {@link BlankNode} identity, this factory will use an 
internal
- * {@link UUID} as a salt. See {@link BlankNode#uniqueReference()} for details.
+ * Note that Commons RDF objects created by this class implement the
+ * specializations interfaces like {@link JenaRDFTerm}, {@link JenaGraph} and
+ * {@link JenaTriple}, which provide access to the underlying Jena objects, 
e.g.
+ * with {@link JenaRDFTerm#asJenaNode()}.
+ * 
+ * For the purpose of {@link BlankNode} identity when using
+ * {@link #createBlankNode(String)} (see {@link BlankNode#equals(Object)} and
+ * {@link BlankNode#uniqueReference()}), each instance of this factory uses an
+ * internal random state. If for some reason consistent/reproducible BlankNode
+ * identity is desired, it is possible to retrieve the state as a UUID using
+ * {@link #salt} for subsequent use with {@link JenaFactory#JenaFactory(UUID)} 
-
+ * note that such consistency is only guaranteed within the same minor version
+ * of Commons RDF.
  * 
  * @see RDFTermFactory
  */
@@ -68,7 +82,7 @@ public final class JenaFactory implements RDFTermFactory {
 * Create a JenaFactory.
 * 
 * This constructor will use a randomly generated {@link UUID} as a 
salt 
-* for the purposes of {@link BlankNode} identity, see {@link 
#getSalt()}.
+* for the purposes of {@link BlankNode} identity, see {@link #salt()}.
 */
public JenaFactory() {
this.salt = UUID.randomUUID();
@@ -91,22 +105,22 @@ public final class JenaFactory implements RDFTermFactory {
 
@Override
public JenaBlankNode createBlankNode() {
-   return internalJenaFactory.createBlankNode(getSalt());
+   return internalJenaFactory.createBlankNode(salt());
}
 
@Override
public JenaBlankNode createBlankNode(String name) {
-   return internalJenaFactory.createBlankNode(name, getSalt());
+   return internalJenaFactory.createBlankNode(name, salt());
}

@Override
public JenaDataset createDataset() {
-   return internalJenaFactory.createDataset(getSalt());
+   return internalJenaFactory.createDataset(salt());
}
 
@Override
public JenaGraph createGraph() {
-   return internalJenaFactory.createGraph(getSalt());
+   return internalJenaFactory.createGraph(salt());
}
 
@Override
@@ -203,7 +217,7 @@ public final class JenaFactory implements RDFTermFactory {
 * {@link Node#getBlankNodeId()} 

[15/50] [abbrv] incubator-commonsrdf git commit: No need for another .gitignore

[stain]

No need for another .gitignore


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

Branch: refs/heads/COMMONSRDF-46
Commit: 0c58bd8e594d9ecebc5e9d3d71cad8cb96d68b92
Parents: 485a7eb
Author: Stian Soiland-Reyes 
Authored: Tue Sep 13 00:39:21 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Tue Sep 13 00:39:21 2016 +0100

--
 jsonld-java/.gitignore | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/0c58bd8e/jsonld-java/.gitignore
--
diff --git a/jsonld-java/.gitignore b/jsonld-java/.gitignore
deleted file mode 100644
index b83d222..000
--- a/jsonld-java/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target/

[31/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'jsonld-java' into jena-jsonld-rdf4j-integration

[stain]

Merge branch 'jsonld-java' into jena-jsonld-rdf4j-integration


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

Branch: refs/heads/COMMONSRDF-46
Commit: 0c110914fbbb737d6cfc141e2d284d9c6f9281ba
Parents: 68438f4 492ea23
Author: Stian Soiland-Reyes 
Authored: Wed Sep 28 14:49:51 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Sep 28 14:49:51 2016 +0100

--
 .../commons/rdf/jsonldjava/JsonLdBlankNode.java |  2 +-
 .../commons/rdf/jsonldjava/JsonLdDataset.java   | 15 ++-
 .../commons/rdf/jsonldjava/JsonLdGraph.java | 12 ++---
 .../commons/rdf/jsonldjava/JsonLdGraphLike.java | 22 +++
 .../commons/rdf/jsonldjava/JsonLdIRI.java   |  3 +--
 .../commons/rdf/jsonldjava/JsonLdLiteral.java   |  3 +--
 .../commons/rdf/jsonldjava/JsonLdQuad.java  |  7 ++---
 .../commons/rdf/jsonldjava/JsonLdQuadLike.java  |  2 +-
 .../rdf/jsonldjava/JsonLdRDFTermFactory.java| 28 +---
 .../commons/rdf/jsonldjava/JsonLdTerm.java  |  3 ++-
 .../commons/rdf/jsonldjava/JsonLdTriple.java|  5 ++--
 .../rdf/jsonldjava/JsonLdUnionGraph.java| 12 +
 12 files changed, 65 insertions(+), 49 deletions(-)
--

[17/50] [abbrv] incubator-commonsrdf git commit: parameterized all to all test

[stain]

parameterized all to all test


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

Branch: refs/heads/COMMONSRDF-46
Commit: a7849c8671cd3ad0ee9e1fc8f7b51bf7de4aa26f
Parents: f5a1604
Author: Stian Soiland-Reyes 
Authored: Fri Sep 23 17:45:36 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Fri Sep 23 17:45:36 2016 +0100

--
 .../rdf/integrationtests/AllToAllTest.java  | 87 
 1 file changed, 36 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/a7849c86/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
--
diff --git 
a/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
 
b/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
index 0d65f05..b0b4f3b 100644
--- 
a/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
+++ 
b/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
@@ -3,6 +3,11 @@ package org.apache.commons.rdf.integrationtests;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
 import org.apache.commons.rdf.api.BlankNode;
 import org.apache.commons.rdf.api.Graph;
 import org.apache.commons.rdf.api.IRI;
@@ -15,63 +20,41 @@ import 
org.apache.commons.rdf.jsonldjava.JsonLdRDFTermFactory;
 import org.apache.commons.rdf.rdf4j.RDF4JTermFactory;
 import org.apache.commons.rdf.simple.SimpleRDFTermFactory;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
 
+@RunWith(Parameterized.class)
 public class AllToAllTest {
 
-   private RDFTermFactory simpleFactory = new SimpleRDFTermFactory();
-   private RDFTermFactory jenaFactory = new JenaRDFTermFactory();
-   private RDFTermFactory rdf4jFactory = new RDF4JTermFactory();
-   private RDFTermFactory jsonldFactory = new JsonLdRDFTermFactory();
+   private RDFTermFactory nodeFactory;
+   private RDFTermFactory graphFactory;
 
-   @Test
-   public void jenaToRdf4j() throws Exception {
-   addTermsFromOtherFactory(jenaFactory, rdf4jFactory);
-   addTriplesFromOtherFactory(jenaFactory, rdf4jFactory);
-   }
-   @Test
-   public void jenaToJsonLd() throws Exception {
-   addTermsFromOtherFactory(jenaFactory, jsonldFactory);
-   addTriplesFromOtherFactory( jenaFactory, jsonldFactory );
-   }
-   @Test
-   public void jenaToSimple() throws Exception {
-   addTermsFromOtherFactory(jenaFactory, simpleFactory);
-   addTriplesFromOtherFactory( jenaFactory, simpleFactory );
-   }
-   
-   @Test
-   public void rdf4jToJena() throws Exception {
-   addTermsFromOtherFactory(rdf4jFactory, jenaFactory);
-   addTriplesFromOtherFactory( rdf4jFactory, jenaFactory );
-   }
-   @Test
-   public void rdf4jToJsonLd() throws Exception {
-   addTermsFromOtherFactory(rdf4jFactory, jsonldFactory);
-   addTriplesFromOtherFactory( rdf4jFactory, jenaFactory );
-   }   
-   @Test
-   public void rdf4jToSimple() throws Exception {
-   addTermsFromOtherFactory(rdf4jFactory, simpleFactory);
-   addTriplesFromOtherFactory(rdf4jFactory, simpleFactory  );
+
+   public AllToAllTest(
+   Class from, 
+   Class to) throws 
InstantiationException, IllegalAccessException {
+   this.nodeFactory = from.newInstance();
+   this.graphFactory = to.newInstance();   
}

-   @Test
-   public void simpletoJena() throws Exception {
-   addTermsFromOtherFactory(simpleFactory, jenaFactory);
-   addTriplesFromOtherFactory( simpleFactory, jenaFactory);
-   }
-   @Test
-   public void simpleToJsonLd() throws Exception {
-   addTermsFromOtherFactory(simpleFactory, jsonldFactory);
-   addTriplesFromOtherFactory( simpleFactory, jsonldFactory );
-   }
-   @Test
-   public void simpleToRdf4j() throws Exception {
-   addTermsFromOtherFactory(simpleFactory, rdf4jFactory);
-   

[40/50] [abbrv] incubator-commonsrdf git commit: only needed for -Prelease

[stain]

 only needed for -Prelease


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

Branch: refs/heads/COMMONSRDF-46
Commit: 5f6bcff7f28d8936523fc98cbe26c4433194f39a
Parents: 351c296
Author: Stian Soiland-Reyes 
Authored: Sun Oct 23 03:19:04 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Sun Oct 23 03:19:04 2016 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/5f6bcff7/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 72563be..1c5d354 100644
--- a/pom.xml
+++ b/pom.xml
@@ -235,7 +235,6 @@
 
 
 
-apache-commonsrdf-${project.version}
 
 
 org.apache.maven.plugins
@@ -562,6 +561,7 @@
 release
 
 
+   apache-commonsrdf-${project.version}
 
   
   

[06/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'jsonld-java' into jena-jsonld-rdf4j-integration

[stain]

Merge branch 'jsonld-java' into jena-jsonld-rdf4j-integration


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

Branch: refs/heads/COMMONSRDF-46
Commit: 3f88d29dc5e63f6fdb7c7d18196bf486258c1857
Parents: e5e85bd fa5580c
Author: Stian Soiland-Reyes 
Authored: Fri Sep 9 17:20:55 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Fri Sep 9 17:20:55 2016 +0100

--
 .../rdf/jsonldjava/JsonLdParserBuilderTest.java | 40 
 1 file changed, 25 insertions(+), 15 deletions(-)
--

[16/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'jena' into jena-jsonld-rdf4j-integration

[stain]

Merge branch 'jena' into jena-jsonld-rdf4j-integration


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

Branch: refs/heads/COMMONSRDF-46
Commit: f5a1604c5cabc3eac92177825f4ad6cb9c09228b
Parents: 0c58bd8 5e78763
Author: Stian Soiland-Reyes 
Authored: Fri Sep 23 17:30:20 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Fri Sep 23 17:30:20 2016 +0100

--
 jena/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[20/50] [abbrv] incubator-commonsrdf git commit: avoid rawtypes warnings

[stain]

avoid rawtypes warnings


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

Branch: refs/heads/COMMONSRDF-46
Commit: ed73c6f5dbe454865cf4a8f49c407beeb9d7d835
Parents: 8a26fe8
Author: Stian Soiland-Reyes 
Authored: Fri Sep 23 17:59:00 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Fri Sep 23 17:59:00 2016 +0100

--
 .../java/org/apache/commons/rdf/integrationtests/AllToAllTest.java  | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/ed73c6f5/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
--
diff --git 
a/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
 
b/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
index 3edf6e4..09c887c 100644
--- 
a/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
+++ 
b/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
@@ -38,6 +38,7 @@ public class AllToAllTest {
this.graphFactory = to.newInstance();   
}

+   @SuppressWarnings("rawtypes")
@Parameters(name = "{index}: {0}->{1}")
public static Collection data() { 
List factories = Arrays.asList(

[incubator-commonsrdf] Git Push Summary

[stain]

Repository: incubator-commonsrdf
Updated Branches:
  refs/heads/jena-jsonld-rdf4j-integration [deleted] c991d0562

[40/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'jena' into jena-jsonld-rdf4j-integration

[stain]

Merge branch 'jena' into jena-jsonld-rdf4j-integration


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

Branch: refs/heads/master
Commit: 489ed91795a423453e6a2919728d976d4cdec9d2
Parents: 28e38ca eb391f8
Author: Stian Soiland-Reyes 
Authored: Thu Sep 29 01:10:31 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Thu Sep 29 01:10:31 2016 +0100

--
 .../commons/rdf/jena/JenaRDFTermFactory.java| 20 
 .../commons/rdf/jena/impl/JenaFactory.java  |  5 ++---
 pom.xml |  6 ++
 3 files changed, 24 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/489ed917/pom.xml
--

[10/50] [abbrv] incubator-commonsrdf git commit: AllToAllTest

[stain]

AllToAllTest


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

Branch: refs/heads/master
Commit: 1828c2abf584958bf25de48d0827c825fd3bb21a
Parents: 97e3acd
Author: Stian Soiland-Reyes 
Authored: Fri Sep 9 17:36:32 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Fri Sep 9 17:36:41 2016 +0100

--
 .../rdf/integrationtests/AllToAllTest.java  | 99 
 .../rdf/integrationtests/JenaRDF4JTest.java | 78 ---
 2 files changed, 99 insertions(+), 78 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/1828c2ab/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
--
diff --git 
a/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
 
b/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
new file mode 100644
index 000..a8cd1cd
--- /dev/null
+++ 
b/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
@@ -0,0 +1,99 @@
+package org.apache.commons.rdf.integrationtests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.apache.commons.rdf.api.BlankNode;
+import org.apache.commons.rdf.api.Graph;
+import org.apache.commons.rdf.api.IRI;
+import org.apache.commons.rdf.api.Literal;
+import org.apache.commons.rdf.api.RDFTermFactory;
+import org.apache.commons.rdf.api.Triple;
+import org.apache.commons.rdf.jena.JenaRDFTermFactory;
+import org.apache.commons.rdf.jsonldjava.JsonLdRDFTermFactory;
+import org.apache.commons.rdf.rdf4j.RDF4JTermFactory;
+import org.apache.commons.rdf.simple.SimpleRDFTermFactory;
+import org.junit.Test;
+
+public class AllToAllTest {
+
+   private RDFTermFactory simpleFactory = new SimpleRDFTermFactory();
+   private RDFTermFactory jenaFactory = new JenaRDFTermFactory();
+   private RDFTermFactory rdf4jFactory = new RDF4JTermFactory();
+   private RDFTermFactory jsonldFactory = new JsonLdRDFTermFactory();
+
+   @Test
+   public void jenaToRdf4j() throws Exception {
+   nodesIntoOther(jenaFactory, rdf4jFactory);
+   }
+   @Test
+   public void jenaToJsonLd() throws Exception {
+   nodesIntoOther(jenaFactory, jsonldFactory);
+   }
+   @Test
+   public void jenaToSimple() throws Exception {
+   nodesIntoOther(jenaFactory, simpleFactory);
+   }
+   
+   @Test
+   public void rdf4jToJena() throws Exception {
+   nodesIntoOther(rdf4jFactory, jenaFactory);
+   }
+   @Test
+   public void rdf4jToJsonLd() throws Exception {
+   nodesIntoOther(rdf4jFactory, jsonldFactory);
+   }   
+   @Test
+   public void rdf4jToSimple() throws Exception {
+   nodesIntoOther(rdf4jFactory, simpleFactory);
+   }
+   
+   @Test
+   public void simpletoJena() throws Exception {
+   nodesIntoOther(simpleFactory, jenaFactory);
+   }
+   @Test
+   public void simpleToJsonLd() throws Exception {
+   nodesIntoOther(simpleFactory, jsonldFactory);
+   }
+   @Test
+   public void simpleToRdf4j() throws Exception {
+   nodesIntoOther(simpleFactory, rdf4jFactory);
+   }
+   
+   public void nodesIntoOther(RDFTermFactory fromFactory, RDFTermFactory 
toFactory) throws Exception {
+   Graph g = fromFactory.createGraph();
+   BlankNode s = toFactory.createBlankNode();
+   IRI p = toFactory.createIRI("http://example.com/p;);
+   Literal o = toFactory.createLiteral("Hello");
+
+   g.add(s, p, o);
+
+   // blankNode should still work with g.contains()
+   assertTrue(g.contains(s, p, o));
+   Triple t1 = g.stream().findAny().get();
+
+   // Can't make assumptions about mappegetPredicated BlankNode 
equality
+   // assertEquals(s, t.getSubject());
+   assertEquals(p, t1.getPredicate());
+   assertEquals(o, t1.getObject());
+
+   IRI s2 = toFactory.createIRI("http://example.com/s2;);
+   g.add(s2, p, s);
+   assertTrue(g.contains(s2, p, s));
+
+   // This should be mapped to the same BlankNode
+   // (even if it has a different identifier), e.g.
+   // we should be able to do:
+
+   Triple t2 = 

[29/50] [abbrv] incubator-commonsrdf git commit: RDFParser is experimental feature for now

[stain]

RDFParser is experimental feature for now


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

Branch: refs/heads/master
Commit: ef6a1af4819cddacd317952a950bda4ae46c6f18
Parents: 74196bd
Author: Stian Soiland-Reyes 
Authored: Tue Sep 27 18:54:06 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Tue Sep 27 18:54:06 2016 +0100

--
 .../java/org/apache/commons/rdf/experimental/RDFParser.java| 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/ef6a1af4/api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java
--
diff --git 
a/api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java 
b/api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java
index 39b7253..dd6bcf0 100644
--- a/api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java
+++ b/api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java
@@ -37,6 +37,12 @@ import org.apache.commons.rdf.api.Triple;
 
 /**
  * Parse an RDF source into a target (e.g. a Graph/Dataset).
+ * Experimental
+ * This interface (and its implementations) should be considered at
+ * risk; they might change or be removed in the next minor update of
+ * Commons RDF. It may move to the the  {@link org.apache.commons.rdf.api}
+ * package when it has stabilized.
+ * Description
  * 
  * This interface follows the
  * https://en.wikipedia.org/wiki/Builder_pattern;>Builder pattern,

[19/50] [abbrv] incubator-commonsrdf git commit: parameterized all to all test

[stain]

parameterized all to all test


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

Branch: refs/heads/master
Commit: a7849c8671cd3ad0ee9e1fc8f7b51bf7de4aa26f
Parents: f5a1604
Author: Stian Soiland-Reyes 
Authored: Fri Sep 23 17:45:36 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Fri Sep 23 17:45:36 2016 +0100

--
 .../rdf/integrationtests/AllToAllTest.java  | 87 
 1 file changed, 36 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/a7849c86/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
--
diff --git 
a/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
 
b/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
index 0d65f05..b0b4f3b 100644
--- 
a/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
+++ 
b/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
@@ -3,6 +3,11 @@ package org.apache.commons.rdf.integrationtests;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
 import org.apache.commons.rdf.api.BlankNode;
 import org.apache.commons.rdf.api.Graph;
 import org.apache.commons.rdf.api.IRI;
@@ -15,63 +20,41 @@ import 
org.apache.commons.rdf.jsonldjava.JsonLdRDFTermFactory;
 import org.apache.commons.rdf.rdf4j.RDF4JTermFactory;
 import org.apache.commons.rdf.simple.SimpleRDFTermFactory;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
 
+@RunWith(Parameterized.class)
 public class AllToAllTest {
 
-   private RDFTermFactory simpleFactory = new SimpleRDFTermFactory();
-   private RDFTermFactory jenaFactory = new JenaRDFTermFactory();
-   private RDFTermFactory rdf4jFactory = new RDF4JTermFactory();
-   private RDFTermFactory jsonldFactory = new JsonLdRDFTermFactory();
+   private RDFTermFactory nodeFactory;
+   private RDFTermFactory graphFactory;
 
-   @Test
-   public void jenaToRdf4j() throws Exception {
-   addTermsFromOtherFactory(jenaFactory, rdf4jFactory);
-   addTriplesFromOtherFactory(jenaFactory, rdf4jFactory);
-   }
-   @Test
-   public void jenaToJsonLd() throws Exception {
-   addTermsFromOtherFactory(jenaFactory, jsonldFactory);
-   addTriplesFromOtherFactory( jenaFactory, jsonldFactory );
-   }
-   @Test
-   public void jenaToSimple() throws Exception {
-   addTermsFromOtherFactory(jenaFactory, simpleFactory);
-   addTriplesFromOtherFactory( jenaFactory, simpleFactory );
-   }
-   
-   @Test
-   public void rdf4jToJena() throws Exception {
-   addTermsFromOtherFactory(rdf4jFactory, jenaFactory);
-   addTriplesFromOtherFactory( rdf4jFactory, jenaFactory );
-   }
-   @Test
-   public void rdf4jToJsonLd() throws Exception {
-   addTermsFromOtherFactory(rdf4jFactory, jsonldFactory);
-   addTriplesFromOtherFactory( rdf4jFactory, jenaFactory );
-   }   
-   @Test
-   public void rdf4jToSimple() throws Exception {
-   addTermsFromOtherFactory(rdf4jFactory, simpleFactory);
-   addTriplesFromOtherFactory(rdf4jFactory, simpleFactory  );
+
+   public AllToAllTest(
+   Class from, 
+   Class to) throws 
InstantiationException, IllegalAccessException {
+   this.nodeFactory = from.newInstance();
+   this.graphFactory = to.newInstance();   
}

-   @Test
-   public void simpletoJena() throws Exception {
-   addTermsFromOtherFactory(simpleFactory, jenaFactory);
-   addTriplesFromOtherFactory( simpleFactory, jenaFactory);
-   }
-   @Test
-   public void simpleToJsonLd() throws Exception {
-   addTermsFromOtherFactory(simpleFactory, jsonldFactory);
-   addTriplesFromOtherFactory( simpleFactory, jsonldFactory );
-   }
-   @Test
-   public void simpleToRdf4j() throws Exception {
-   addTermsFromOtherFactory(simpleFactory, rdf4jFactory);
-   

[41/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'jena' into jena-jsonld-rdf4j-integration

[stain]

Merge branch 'jena' into jena-jsonld-rdf4j-integration


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

Branch: refs/heads/master
Commit: c991d0562e21ecc49ddb607ec308f3a5b7e13bed
Parents: 489ed91 c763ffa
Author: Stian Soiland-Reyes 
Authored: Thu Sep 29 01:14:05 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Thu Sep 29 01:14:05 2016 +0100

--
 .../java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--

[14/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'parser-with-quads' into jena-jsonld-rdf4j-integration

[stain]

Merge branch 'parser-with-quads' into jena-jsonld-rdf4j-integration


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

Branch: refs/heads/master
Commit: ace02c0c179f490d1e563d35e23dffbd6d951ef6
Parents: 2b51794 bfcead4
Author: Stian Soiland-Reyes 
Authored: Tue Sep 13 00:12:35 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Tue Sep 13 00:12:35 2016 +0100

--
 .../commons/rdf/api/RDFParserBuilder.java   | 21 +---
 .../rdf/simple/AbstractRDFParserBuilder.java|  6 +-
 2 files changed, 15 insertions(+), 12 deletions(-)
--

[38/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'rdf4j' into jena-jsonld-rdf4j-integration

[stain]

Merge branch 'rdf4j' into jena-jsonld-rdf4j-integration


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

Branch: refs/heads/master
Commit: b7dec9b0237f529674b3bdbc36c10276bf56a5a3
Parents: 8296419 06711f9
Author: Stian Soiland-Reyes 
Authored: Wed Sep 28 23:56:42 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Sep 28 23:56:42 2016 +0100

--
 .../commons/rdf/rdf4j/RDF4JTermFactory.java | 33 +++-
 .../rdf/rdf4j/experimental/package-info.java|  3 +-
 2 files changed, 19 insertions(+), 17 deletions(-)
--

[22/50] [abbrv] incubator-commonsrdf git commit: avoid rawtypes warnings

[stain]

avoid rawtypes warnings


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

Branch: refs/heads/master
Commit: ed73c6f5dbe454865cf4a8f49c407beeb9d7d835
Parents: 8a26fe8
Author: Stian Soiland-Reyes 
Authored: Fri Sep 23 17:59:00 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Fri Sep 23 17:59:00 2016 +0100

--
 .../java/org/apache/commons/rdf/integrationtests/AllToAllTest.java  | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/ed73c6f5/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
--
diff --git 
a/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
 
b/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
index 3edf6e4..09c887c 100644
--- 
a/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
+++ 
b/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
@@ -38,6 +38,7 @@ public class AllToAllTest {
this.graphFactory = to.newInstance();   
}

+   @SuppressWarnings("rawtypes")
@Parameters(name = "{index}: {0}->{1}")
public static Collection data() { 
List factories = Arrays.asList(

[24/50] [abbrv] incubator-commonsrdf git commit: RDFParserBuilder -> RDFParser

[stain]

RDFParserBuilder -> RDFParser


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

Branch: refs/heads/master
Commit: 313fbf75d349cf194baf83cb2da399bd8ad34bb6
Parents: ed73c6f
Author: Stian Soiland-Reyes 
Authored: Tue Sep 27 17:13:16 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Tue Sep 27 17:16:34 2016 +0100

--
 .../org/apache/commons/rdf/api/RDFParser.java   | 479 
 .../commons/rdf/api/RDFParserBuilder.java   | 479 
 .../apache/commons/rdf/jena/JenaRDFParser.java  | 103 
 .../commons/rdf/jena/JenaRDFParserBuilder.java  | 103 
 .../commons/rdf/jena/TestRDFParserBuilder.java  |   4 +-
 .../rdf/jsonldjava/JsonLdParserBuilder.java |   4 +-
 .../apache/commons/rdf/rdf4j/RDF4JParser.java   | 194 +++
 .../commons/rdf/rdf4j/RDF4JParserBuilder.java   | 194 ---
 .../apache/commons/rdf/rdf4j/package-info.java  |   6 +-
 .../commons/rdf/simple/AbstractRDFParser.java   | 541 +++
 .../rdf/simple/AbstractRDFParserBuilder.java| 541 ---
 .../commons/rdf/simple/RDFParseException.java   |  14 +-
 .../simple/AbstractRDFParserBuilderTest.java|  26 +-
 .../rdf/simple/DummyRDFParserBuilder.java   |  10 +-
 14 files changed, 1349 insertions(+), 1349 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/313fbf75/api/src/main/java/org/apache/commons/rdf/api/RDFParser.java
--
diff --git a/api/src/main/java/org/apache/commons/rdf/api/RDFParser.java 
b/api/src/main/java/org/apache/commons/rdf/api/RDFParser.java
new file mode 100644
index 000..72c7e61
--- /dev/null
+++ b/api/src/main/java/org/apache/commons/rdf/api/RDFParser.java
@@ -0,0 +1,479 @@
+/**
+ * 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.commons.rdf.api;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.Optional;
+import java.util.concurrent.Future;
+import java.util.function.Consumer;
+
+/**
+ * Parse an RDF source into a target (e.g. a Graph/Dataset).
+ * 
+ * This interface follows the
+ * https://en.wikipedia.org/wiki/Builder_pattern;>Builder pattern,
+ * allowing to set parser settings like {@link #contentType(RDFSyntax)} and
+ * {@link #base(IRI)}. A caller MUST call one of the source 
methods
+ * (e.g. {@link #source(IRI)}, {@link #source(Path)},
+ * {@link #source(InputStream)}), and MUST call one of the target
+ * methods (e.g. {@link #target(Consumer)}, {@link #target(Dataset)},
+ * {@link #target(Graph)}) before calling {@link #parse()} on the returned
+ * RDFParser - however methods can be called in any order.
+ * 
+ * The call to {@link #parse()} returns a {@link Future}, allowing asynchronous
+ * parse operations. Callers are recommended to check {@link Future#get()} to
+ * ensure parsing completed successfully, or catch exceptions thrown during
+ * parsing.
+ * 
+ * Setting a method that has already been set will override any existing value
+ * in the returned builder - regardless of the parameter type (e.g.
+ * {@link #source(IRI)} will override a previous {@link #source(Path)}. 
Settings
+ * can be unset by passing null - note that this may 
+ * require casting, e.g. contentType( (RDFSyntax) null ) 
+ * to undo a previous call to {@link #contentType(RDFSyntax)}.
+ * 
+ * It is undefined if a RDFParser is mutable or thread-safe, so callers
+ * should always use the returned modified RDFParser from the builder
+ * methods. The builder may return itself after modification, 
+ * or a cloned builder with the modified settings applied. 
+ * Implementations are however encouraged to be immutable,
+ * thread-safe and document this. As an example 

[23/50] [abbrv] incubator-commonsrdf git commit: RDFParserBuilder -> RDFParser

[stain]

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/313fbf75/simple/src/main/java/org/apache/commons/rdf/simple/AbstractRDFParser.java
--
diff --git 
a/simple/src/main/java/org/apache/commons/rdf/simple/AbstractRDFParser.java 
b/simple/src/main/java/org/apache/commons/rdf/simple/AbstractRDFParser.java
new file mode 100644
index 000..e58fced
--- /dev/null
+++ b/simple/src/main/java/org/apache/commons/rdf/simple/AbstractRDFParser.java
@@ -0,0 +1,541 @@
+/**
+ * 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.commons.rdf.simple;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Optional;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.function.Consumer;
+
+import org.apache.commons.rdf.api.Dataset;
+import org.apache.commons.rdf.api.Graph;
+import org.apache.commons.rdf.api.IRI;
+import org.apache.commons.rdf.api.Quad;
+import org.apache.commons.rdf.api.RDFParser;
+import org.apache.commons.rdf.api.RDFSyntax;
+import org.apache.commons.rdf.api.RDFTermFactory;
+
+/**
+ * Abstract RDFParser
+ * 
+ * This abstract class keeps the properties in protected fields like
+ * {@link #sourceFile} using {@link Optional}. Some basic checking like
+ * {@link #checkIsAbsolute(IRI)} is performed.
+ * 
+ * This class and its subclasses are {@link Cloneable}, immutable and
+ * (therefore) thread-safe - each call to option methods like
+ * {@link #contentType(String)} or {@link #source(IRI)} will return a cloned,
+ * mutated copy.
+ * 
+ * By default, parsing is done by the abstract method
+ * {@link #parseSynchronusly()} - which is executed in a cloned snapshot - 
hence
+ * multiple {@link #parse()} calls are thread-safe. The default {@link 
#parse()}
+ * uses a thread pool in {@link #threadGroup} - but implementations can 
override
+ * {@link #parse()} (e.g. because it has its own threading model or use
+ * asynchronous remote execution).
+ */
+public abstract class AbstractRDFParser> 
+   implements RDFParser, Cloneable {   
+   
+   public static final ThreadGroup threadGroup = new ThreadGroup("Commons 
RDF parsers");
+   private static final ExecutorService threadpool = 
Executors.newCachedThreadPool(r -> new Thread(threadGroup, r));
+
+   // Basically only used for creating IRIs
+   private static RDFTermFactory internalRdfTermFactory = new 
SimpleRDFTermFactory();
+
+   /**
+* Get the set {@link RDFTermFactory}, if any.
+*/
+   public Optional getRdfTermFactory() {
+   return rdfTermFactory;
+   }
+
+   /**
+* Get the set content-type {@link RDFSyntax}, if any.
+* 
+* If this is {@link Optional#isPresent()}, then 
+* {@link #getContentType()} contains the 
+* value of {@link RDFSyntax#mediaType}. 
+*/
+   public Optional getContentTypeSyntax() {
+   return contentTypeSyntax;
+   }
+   
+   /**
+* Get the set content-type String, if any.
+* 
+* If this is {@link Optional#isPresent()} and 
+* is recognized by {@link RDFSyntax#byMediaType(String)}, then
+* the corresponding {@link RDFSyntax} is set on 
+* {@link #getContentType()}, otherwise that is
+* {@link Optional#empty()}. 
+*/
+   public final Optional getContentType() {
+   return contentType;
+   }
+
+   /**
+* Get the target to consume parsed Quads.
+* 
+* From the call to {@link #parseSynchronusly()}, this
+* method is always {@link Optional#isPresent()}.
+* 
+*/ 
+   public Consumer getTarget() {
+   return target;
+   }
+
+   /**
+* Get the target dataset as set by {@link #target(Dataset)}.
+* 
+* The return value is {@link Optional#isPresent()} if and only if
+* {@link #target(Dataset)} has been set, meaning that the 
implementation
+* may choose to append parsed 

[20/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'jsonld-java' into jena-jsonld-rdf4j-integration

[stain]

Merge branch 'jsonld-java' into jena-jsonld-rdf4j-integration


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

Branch: refs/heads/master
Commit: 92eb91a6d530964732d5d45b294ff214fea0f813
Parents: a7849c8 be7bfc8
Author: Stian Soiland-Reyes 
Authored: Fri Sep 23 17:56:55 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Fri Sep 23 17:56:55 2016 +0100

--
 .../commons/rdf/jsonldjava/JsonLdRDFTermFactory.java  | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)
--

[44/50] [abbrv] incubator-commonsrdf git commit: Integration test - use *Factory instead of *RDFTermFactory

[stain]

Integration test - use *Factory instead of *RDFTermFactory


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

Branch: refs/heads/master
Commit: b51b7bc05af83b7478884e94086557a7f5bcb760
Parents: 49601fe
Author: Stian Soiland-Reyes 
Authored: Wed Oct 26 11:41:23 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Oct 26 11:41:23 2016 +0100

--
 .../commons/rdf/integrationtests/AllToAllTest.java  | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/b51b7bc0/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
--
diff --git 
a/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
 
b/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
index 24d3697..1b32e35 100644
--- 
a/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
+++ 
b/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
@@ -32,9 +32,9 @@ import org.apache.commons.rdf.api.Literal;
 import org.apache.commons.rdf.api.RDFTerm;
 import org.apache.commons.rdf.api.RDFTermFactory;
 import org.apache.commons.rdf.api.Triple;
-import org.apache.commons.rdf.jena.JenaRDFTermFactory;
-import org.apache.commons.rdf.jsonldjava.JsonLdRDFTermFactory;
-import org.apache.commons.rdf.rdf4j.RDF4JTermFactory;
+import org.apache.commons.rdf.jena.JenaFactory;
+import org.apache.commons.rdf.jsonldjava.JsonLdFactory;
+import org.apache.commons.rdf.rdf4j.RDF4JFactory;
 import org.apache.commons.rdf.simple.SimpleRDFTermFactory;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -60,9 +60,9 @@ public class AllToAllTest {
public static Collection data() {
List factories = Arrays.asList(
SimpleRDFTermFactory.class,
-   JenaRDFTermFactory.class,
-   RDF4JTermFactory.class,
-   JsonLdRDFTermFactory.class);
+   JenaFactory.class,
+   RDF4JFactory.class,
+   JsonLdFactory.class);
Collection  allToAll = new ArrayList<>();
for (Class from : factories) {
for (Class to : factories) {

[07/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'jsonld-java' into jena-jsonld-rdf4j-integration

[stain]

Merge branch 'jsonld-java' into jena-jsonld-rdf4j-integration


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

Branch: refs/heads/master
Commit: e5e85bd39ba700ac2072b142c867717b4a462baf
Parents: 5ed73ac 3d63a0e
Author: Stian Soiland-Reyes 
Authored: Fri Sep 9 17:15:44 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Fri Sep 9 17:15:44 2016 +0100

--
 .../rdf/jsonldjava/JsonLdParserBuilder.java | 66 ++--
 .../rdf/jsonldjava/JsonLdRDFTermFactory.java|  2 +-
 2 files changed, 47 insertions(+), 21 deletions(-)
--

[33/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'jsonld-java' into jena-jsonld-rdf4j-integration

[stain]

Merge branch 'jsonld-java' into jena-jsonld-rdf4j-integration


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

Branch: refs/heads/master
Commit: 0c110914fbbb737d6cfc141e2d284d9c6f9281ba
Parents: 68438f4 492ea23
Author: Stian Soiland-Reyes 
Authored: Wed Sep 28 14:49:51 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Sep 28 14:49:51 2016 +0100

--
 .../commons/rdf/jsonldjava/JsonLdBlankNode.java |  2 +-
 .../commons/rdf/jsonldjava/JsonLdDataset.java   | 15 ++-
 .../commons/rdf/jsonldjava/JsonLdGraph.java | 12 ++---
 .../commons/rdf/jsonldjava/JsonLdGraphLike.java | 22 +++
 .../commons/rdf/jsonldjava/JsonLdIRI.java   |  3 +--
 .../commons/rdf/jsonldjava/JsonLdLiteral.java   |  3 +--
 .../commons/rdf/jsonldjava/JsonLdQuad.java  |  7 ++---
 .../commons/rdf/jsonldjava/JsonLdQuadLike.java  |  2 +-
 .../rdf/jsonldjava/JsonLdRDFTermFactory.java| 28 +---
 .../commons/rdf/jsonldjava/JsonLdTerm.java  |  3 ++-
 .../commons/rdf/jsonldjava/JsonLdTriple.java|  5 ++--
 .../rdf/jsonldjava/JsonLdUnionGraph.java| 12 +
 12 files changed, 65 insertions(+), 49 deletions(-)
--

[39/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'jena' into jena-jsonld-rdf4j-integration

[stain]

Merge branch 'jena' into jena-jsonld-rdf4j-integration


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

Branch: refs/heads/master
Commit: 28e38cad831eb32da5d78582b534dfaf7e062564
Parents: b7dec9b b0c55bd
Author: Stian Soiland-Reyes 
Authored: Thu Sep 29 00:50:06 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Thu Sep 29 00:50:06 2016 +0100

--
 .../commons/rdf/jena/JenaRDFTermFactory.java| 202 ++-
 .../rdf/jena/experimental/package-info.java |   3 +-
 2 files changed, 149 insertions(+), 56 deletions(-)
--

[36/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'jena' into jena-jsonld-rdf4j-integration

[stain]

Merge branch 'jena' into jena-jsonld-rdf4j-integration


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

Branch: refs/heads/master
Commit: 9bfc39fce3dfd78d824c93c381b663efe43009f3
Parents: 27e8065 a423c41
Author: Stian Soiland-Reyes 
Authored: Wed Sep 28 23:27:30 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Sep 28 23:27:30 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/src/test/resources/log4j.properties| 15 +++
 4 files changed, 15 insertions(+), 15 deletions(-)
--

[26/50] [abbrv] incubator-commonsrdf git commit: RDFParser moved to org.apache.commons.rdf.experimental

[stain]

RDFParser moved to org.apache.commons.rdf.experimental


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

Branch: refs/heads/master
Commit: a189f91efba570f0039c6187e612f7d42aeb2f8d
Parents: 313fbf7
Author: Stian Soiland-Reyes 
Authored: Tue Sep 27 17:29:28 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Tue Sep 27 18:42:28 2016 +0100

--
 .../org/apache/commons/rdf/api/RDFParser.java   | 479 
 .../commons/rdf/experimental/RDFParser.java | 489 +
 .../commons/rdf/experimental/package-info.java  |  34 ++
 .../apache/commons/rdf/jena/JenaRDFParser.java  | 103 
 .../rdf/jena/experimental/JenaRDFParser.java| 105 
 .../rdf/jena/experimental/package-info.java |  34 ++
 .../commons/rdf/jena/TestRDFParserBuilder.java  |   3 +-
 .../rdf/jsonldjava/JsonLdParserBuilder.java | 157 --
 .../jsonldjava/experimental/JsonLdParser.java   | 160 ++
 .../jsonldjava/experimental/package-info.java   |  34 ++
 .../rdf/jsonldjava/JsonLdParserBuilderTest.java |   7 +-
 .../apache/commons/rdf/rdf4j/RDF4JParser.java   | 194 ---
 .../rdf/rdf4j/experimental/RDF4JParser.java | 197 +++
 .../rdf/rdf4j/experimental/package-info.java|  34 ++
 .../apache/commons/rdf/rdf4j/package-info.java  |   6 +-
 .../commons/rdf/simple/AbstractRDFParser.java   | 541 --
 .../commons/rdf/simple/RDFParseException.java   |   2 +-
 .../simple/experimental/AbstractRDFParser.java  | 543 +++
 .../rdf/simple/experimental/package-info.java   |  34 ++
 .../simple/AbstractRDFParserBuilderTest.java|   3 +-
 .../rdf/simple/DummyRDFParserBuilder.java   |   3 +-
 21 files changed, 1678 insertions(+), 1484 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/a189f91e/api/src/main/java/org/apache/commons/rdf/api/RDFParser.java
--
diff --git a/api/src/main/java/org/apache/commons/rdf/api/RDFParser.java 
b/api/src/main/java/org/apache/commons/rdf/api/RDFParser.java
deleted file mode 100644
index 72c7e61..000
--- a/api/src/main/java/org/apache/commons/rdf/api/RDFParser.java
+++ /dev/null
@@ -1,479 +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.commons.rdf.api;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
-import java.util.Optional;
-import java.util.concurrent.Future;
-import java.util.function.Consumer;
-
-/**
- * Parse an RDF source into a target (e.g. a Graph/Dataset).
- * 
- * This interface follows the
- * https://en.wikipedia.org/wiki/Builder_pattern;>Builder pattern,
- * allowing to set parser settings like {@link #contentType(RDFSyntax)} and
- * {@link #base(IRI)}. A caller MUST call one of the source 
methods
- * (e.g. {@link #source(IRI)}, {@link #source(Path)},
- * {@link #source(InputStream)}), and MUST call one of the target
- * methods (e.g. {@link #target(Consumer)}, {@link #target(Dataset)},
- * {@link #target(Graph)}) before calling {@link #parse()} on the returned
- * RDFParser - however methods can be called in any order.
- * 
- * The call to {@link #parse()} returns a {@link Future}, allowing asynchronous
- * parse operations. Callers are recommended to check {@link Future#get()} to
- * ensure parsing completed successfully, or catch exceptions thrown during
- * parsing.
- * 
- * Setting a method that has already been set will override any existing value
- * in the returned builder - regardless of the parameter type (e.g.
- * {@link #source(IRI)} will override a previous {@link #source(Path)}. 
Settings
- * can be unset by passing null - note that this may 
- * require casting, e.g. contentType( (RDFSyntax) null ) 
- * to undo 

[47/50] [abbrv] incubator-commonsrdf git commit: remove duplicate junit dependency

[stain]

remove duplicate junit dependency

.. now in parent 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/13464e28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/13464e28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/13464e28

Branch: refs/heads/master
Commit: 13464e2858ac394d783d782a94449d478741bcd6
Parents: b54b5c6
Author: Stian Soiland-Reyes 
Authored: Wed Oct 26 11:45:36 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Oct 26 11:45:36 2016 +0100

--
 api/pom.xml| 7 ---
 simple/pom.xml | 5 -
 2 files changed, 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/13464e28/api/pom.xml
--
diff --git a/api/pom.xml b/api/pom.xml
index 14278d6..f3090c7 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -33,13 +33,6 @@
 Commons RDF: API
 Commons Java API for RDF 1.1
 
-
-
-junit
-junit
-test
-
-
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/13464e28/simple/pom.xml
--
diff --git a/simple/pom.xml b/simple/pom.xml
index bc8a861..8e0ad57 100644
--- a/simple/pom.xml
+++ b/simple/pom.xml
@@ -46,10 +46,5 @@
 tests
 test
 
-
-junit
-junit
-test
-
 
 

[08/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'jsonld-java' into jena-jsonld-rdf4j-integration

[stain]

Merge branch 'jsonld-java' into jena-jsonld-rdf4j-integration


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

Branch: refs/heads/master
Commit: 3f88d29dc5e63f6fdb7c7d18196bf486258c1857
Parents: e5e85bd fa5580c
Author: Stian Soiland-Reyes 
Authored: Fri Sep 9 17:20:55 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Fri Sep 9 17:20:55 2016 +0100

--
 .../rdf/jsonldjava/JsonLdParserBuilderTest.java | 40 
 1 file changed, 25 insertions(+), 15 deletions(-)
--

[30/50] [abbrv] incubator-commonsrdf git commit: Jena*Impl prefixes

[stain]

Jena*Impl prefixes


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

Branch: refs/heads/master
Commit: 6c17d5ed10400c840f749ac1f2d252a4010f8cad
Parents: ef6a1af
Author: Stian Soiland-Reyes 
Authored: Wed Sep 28 01:18:19 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Sep 28 01:18:19 2016 +0100

--
 .../commons/rdf/jena/JenaRDFTermFactory.java|   2 +-
 .../rdf/jena/impl/AbstractJenaRDFTerm.java  |  47 +
 .../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 | 154 ---
 .../apache/commons/rdf/jena/impl/IRIImpl.java   |  61 --
 .../commons/rdf/jena/impl/JenaAnyImpl.java  |  54 ++
 .../rdf/jena/impl/JenaBlankNodeImpl.java|  61 ++
 .../commons/rdf/jena/impl/JenaDatasetImpl.java  | 187 +++
 .../commons/rdf/jena/impl/JenaFactory.java  |  52 +++---
 .../rdf/jena/impl/JenaGeneralizedQuad.java  | 136 ++
 .../commons/rdf/jena/impl/JenaGraphImpl.java| 154 +++
 .../commons/rdf/jena/impl/JenaIRIImpl.java  |  61 ++
 .../commons/rdf/jena/impl/JenaLiteralImpl.java  |  73 
 .../commons/rdf/jena/impl/JenaQuadImpl.java |  66 +++
 .../commons/rdf/jena/impl/JenaTripleImpl.java   |  67 +++
 .../commons/rdf/jena/impl/JenaVariableImpl.java |  64 +++
 .../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 ---
 24 files changed, 997 insertions(+), 997 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/6c17d5ed/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
--
diff --git 
a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java 
b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
index ec84c0a..7359acb 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFTermFactory.java
@@ -681,7 +681,7 @@ public final class JenaRDFTermFactory implements 
RDFTermFactory {
return null;
}
if (term instanceof JenaRDFTerm)
-   // TODO: What if it's a BlankNodeImpl with
+   // TODO: What if it's a JenaBlankNodeImpl with
// a different salt? Do we need to rewrite the
// jena blanknode identifier?
return ((JenaRDFTerm) term).asJenaNode();

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/6c17d5ed/jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractJenaRDFTerm.java
--
diff --git 
a/jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractJenaRDFTerm.java 
b/jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractJenaRDFTerm.java
new file mode 100644
index 000..9c0d7ec
--- /dev/null
+++ 
b/jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractJenaRDFTerm.java
@@ -0,0 +1,47 @@
+/**
+ * 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.commons.rdf.jena.impl;
+
+import org.apache.commons.rdf.api.RDFTerm;
+import org.apache.commons.rdf.jena.JenaRDFTerm;
+import org.apache.jena.graph.Node;

[09/50] [abbrv] incubator-commonsrdf git commit: correct jsonld dependency

[stain]

correct jsonld dependency


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

Branch: refs/heads/master
Commit: 97e3acd9462ce7c66a787c5d45cd95d5f13a590d
Parents: 3f88d29
Author: Stian Soiland-Reyes 
Authored: Fri Sep 9 17:26:26 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Fri Sep 9 17:26:26 2016 +0100

--
 integration-tests/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/97e3acd9/integration-tests/pom.xml
--
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 7ddab6b..57835e5 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -53,7 +53,7 @@
as both rdf4j and jena depend on jsonld -->

${project.groupId}
-   commons-rdf-jsonld
+   commons-rdf-jsonld-java
${project.version}

[48/50] [abbrv] incubator-commonsrdf git commit: more extensive Jena tests

[stain]

more extensive Jena tests


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

Branch: refs/heads/master
Commit: 6fdc9903b70fe8c4cacd7c70c6ed012d93a7d8f9
Parents: 13464e2
Author: Stian Soiland-Reyes 
Authored: Wed Oct 26 12:10:32 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Oct 26 12:10:32 2016 +0100

--
 .../jena/TestJenaGraphToCommonsRDFGraph.java| 93 +---
 1 file changed, 80 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/6fdc9903/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
--
diff --git 
a/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
 
b/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
index 13ee7e7..050de4e 100644
--- 
a/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
+++ 
b/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
@@ -18,14 +18,22 @@
 
 package org.apache.commons.rdf.jena;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 
+import org.apache.commons.rdf.api.BlankNode;
+import org.apache.commons.rdf.api.BlankNodeOrIRI;
 import org.apache.commons.rdf.api.Graph ;
-import org.apache.commons.rdf.api.RDFTermFactory ;
-import org.apache.jena.riot.Lang ;
+import org.apache.commons.rdf.api.RDFTerm;
+import org.apache.commons.rdf.api.Triple;
+import org.apache.commons.rdf.simple.Types;
+import org.apache.jena.riot.Lang;
 import org.apache.jena.riot.RDFDataMgr ;
 import org.apache.jena.sparql.graph.GraphFactory ;
 import org.junit.After;
@@ -34,7 +42,8 @@ import org.junit.Test;
 
 /** Adapt a Jena Graph after parsing data into it */
 public class TestJenaGraphToCommonsRDFGraph {
-private Path turtleFile;
+private static final boolean DEBUG = false;
+   private Path turtleFile;
 
 
 @Before
@@ -55,19 +64,77 @@ public class TestJenaGraphToCommonsRDFGraph {
 org.apache.jena.graph.Graph jGraph = GraphFactory.createGraphMem() ;   
 
 RDFDataMgr.read(jGraph, turtleFile.toUri().toString()) ;
 
+JenaFactory factory = new JenaFactory() ;
+
 // "graph" is a CommonsRDF graph 
-Graph graph = new JenaFactory().fromJena(jGraph) ;
+Graph graph = factory.fromJena(jGraph) ;
+
+
+
+// The below check expected statements from D.ttl
+
+JenaIRI p = factory.createIRI("http://example.com/p;);
+   JenaIRI s = factory.createIRI("http://example.com/s;);
+   JenaLiteral literal123 = factory.createLiteral("123", 
Types.XSD_INTEGER);
+   assertTrue(graph.contains(s, p, literal123));
+
+JenaIRI p1 = factory.createIRI("http://example.com/p1;);
+// Let's look up the BlankNode
+   BlankNodeOrIRI bnode1 = graph.stream(null, p1, null)
+   .findFirst().map(Triple::getSubject).get();
+assertTrue(bnode1 instanceof BlankNode);
+
+// Verify we can use BlankNode in query again
+RDFTerm obj = graph.stream(bnode1, p1, 
null).findFirst().map(Triple::getObject).get();
+
+// Let's look up also that nested blank node
+assertTrue(obj instanceof BlankNode);
+BlankNode bnode2 = (BlankNode)obj;
 
+
+
+JenaIRI q = factory.createIRI("http://example.com/q;);
+JenaLiteral literalR = factory.createLiteral("r", "en");
+   assertTrue(graph.contains(bnode2, q, literalR));
+
+
+   // Can we add the same triple again as s/p/o 
+   // without affecting graph size?
+   // Just to be evil we add a blanknode-iri-blanknode statement
+assertEquals(3, graph.size());
+   graph.add(bnode1, p1, bnode2);
+   assertEquals(3, graph.size());
+
+   // Add the same Triple again
+   
graph.stream(bnode2,null,null).findFirst().ifPresent(graph::add);
+   assertEquals(3, graph.size());
+   
+   
 // Add to CommonsRDF Graph
-RDFTermFactory rft = new JenaFactory() ;
-

[12/50] [abbrv] incubator-commonsrdf git commit: Also test adding Triple instances

[stain]

Also test adding Triple instances

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

Branch: refs/heads/master
Commit: 112505dfe49b1ad16dca1120bd6c59ae8075
Parents: b8ff697
Author: Stian Soiland-Reyes 
Authored: Mon Sep 12 18:59:33 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Mon Sep 12 18:59:33 2016 +0100

--
 .../rdf/integrationtests/AllToAllTest.java  | 64 +++-
 1 file changed, 63 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/112505df/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
--
diff --git 
a/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
 
b/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
index b9ea397..0d65f05 100644
--- 
a/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
+++ 
b/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
@@ -26,40 +26,49 @@ public class AllToAllTest {
@Test
public void jenaToRdf4j() throws Exception {
addTermsFromOtherFactory(jenaFactory, rdf4jFactory);
+   addTriplesFromOtherFactory(jenaFactory, rdf4jFactory);
}
@Test
public void jenaToJsonLd() throws Exception {
addTermsFromOtherFactory(jenaFactory, jsonldFactory);
+   addTriplesFromOtherFactory( jenaFactory, jsonldFactory );
}
@Test
public void jenaToSimple() throws Exception {
addTermsFromOtherFactory(jenaFactory, simpleFactory);
+   addTriplesFromOtherFactory( jenaFactory, simpleFactory );
}

@Test
public void rdf4jToJena() throws Exception {
addTermsFromOtherFactory(rdf4jFactory, jenaFactory);
+   addTriplesFromOtherFactory( rdf4jFactory, jenaFactory );
}
@Test
public void rdf4jToJsonLd() throws Exception {
addTermsFromOtherFactory(rdf4jFactory, jsonldFactory);
+   addTriplesFromOtherFactory( rdf4jFactory, jenaFactory );
}   
@Test
public void rdf4jToSimple() throws Exception {
addTermsFromOtherFactory(rdf4jFactory, simpleFactory);
+   addTriplesFromOtherFactory(rdf4jFactory, simpleFactory  );
}

@Test
public void simpletoJena() throws Exception {
addTermsFromOtherFactory(simpleFactory, jenaFactory);
+   addTriplesFromOtherFactory( simpleFactory, jenaFactory);
}
@Test
public void simpleToJsonLd() throws Exception {
addTermsFromOtherFactory(simpleFactory, jsonldFactory);
+   addTriplesFromOtherFactory( simpleFactory, jsonldFactory );
}
@Test
public void simpleToRdf4j() throws Exception {
addTermsFromOtherFactory(simpleFactory, rdf4jFactory);
+   addTriplesFromOtherFactory( simpleFactory, rdf4jFactory );
}

/**
@@ -67,8 +76,8 @@ public class AllToAllTest {
 * {@link RDFTermFactory}, then inserts/queries with
 * triples using {@link RDFTerm}s created with the second factory.
 * 
+* @param nodeFactory Factory to create {@link RDFTerm} instances
 * @param graphFactory Factory to create {@link Graph}
-* @param nodeFactory
 * @throws Exception
 */
public void addTermsFromOtherFactory(RDFTermFactory nodeFactory, 
RDFTermFactory graphFactory) throws Exception {
@@ -108,4 +117,57 @@ public class AllToAllTest {
Triple t3 = g.stream(bnode, p, null).findAny().get();
assertEquals(t1, t3);   
}
+   
+
+   /**
+* This is a variation of {@link 
#addTermsFromOtherFactory(RDFTermFactory, RDFTermFactory)}, 
+* but here {@link Triple} is created in the "foreign" nodeFactory 
before adding to the graph.
+* 
+* @param nodeFactory Factory to create {@link RDFTerm} and {@link 
Triple}s
+* @param graphFactory Factory to create {@link Graph}
+* @throws Exception
+*/
+   public void addTriplesFromOtherFactory(RDFTermFactory nodeFactory, 
RDFTermFactory graphFactory) throws Exception {
+   Graph g = graphFactory.createGraph();
+   BlankNode s = 

[45/50] [abbrv] incubator-commonsrdf git commit: Avoid System.out

[stain]

Avoid System.out


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

Branch: refs/heads/master
Commit: c34a85e14994831825f966a6a9bdb65c59711436
Parents: b51b7bc
Author: Stian Soiland-Reyes 
Authored: Wed Oct 26 11:41:41 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Oct 26 11:41:49 2016 +0100

--
 .../commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java  | 7 +++
 .../java/org/apache/commons/rdf/simple/SimpleGraphTest.java   | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/c34a85e1/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
--
diff --git 
a/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
 
b/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
index 1a7b4e0..13ee7e7 100644
--- 
a/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
+++ 
b/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
@@ -63,10 +63,9 @@ public class TestJenaGraphToCommonsRDFGraph {
 graph.add(rft.createIRI("http://example/s2;),
   rft.createIRI("http://example/p2;),
   rft.createLiteral("foo")) ;
-System.out.println(" Write CommonsRDF graph\n") ;
-graph.stream().forEach(System.out::println) ;
-
-System.out.println("\n Write Jena graph directly\n") ;
+//System.out.println(" Write CommonsRDF graph\n") ;
+//graph.stream().forEach(System.out::println) ;
+//System.out.println("\n Write Jena graph directly\n") ;
 // And its in the Jena graph
 RDFDataMgr.write(System.out, jGraph, Lang.TTL) ;
 }

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/c34a85e1/simple/src/test/java/org/apache/commons/rdf/simple/SimpleGraphTest.java
--
diff --git 
a/simple/src/test/java/org/apache/commons/rdf/simple/SimpleGraphTest.java 
b/simple/src/test/java/org/apache/commons/rdf/simple/SimpleGraphTest.java
index 14f14a6..90015c9 100644
--- a/simple/src/test/java/org/apache/commons/rdf/simple/SimpleGraphTest.java
+++ b/simple/src/test/java/org/apache/commons/rdf/simple/SimpleGraphTest.java
@@ -37,7 +37,7 @@ public class SimpleGraphTest extends AbstractGraphTest {
 @Test
 public void graphToString() {
 Assume.assumeNotNull(aliceName, companyName);
-System.out.println(graph);
+//System.out.println(graph);
 assertTrue(graph
 .toString()
 .contains(

[34/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'rdf4j' into jena-jsonld-rdf4j-integration

[stain]

Merge branch 'rdf4j' into jena-jsonld-rdf4j-integration


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

Branch: refs/heads/master
Commit: 549872958413218d854e4a21582eacd479dabca4
Parents: 0c11091 0a9c075
Author: Stian Soiland-Reyes 
Authored: Wed Sep 28 14:49:56 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Sep 28 14:49:56 2016 +0100

--

--

[02/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'rdf4j' into rdf4j-jena-compat

[stain]

Merge branch 'rdf4j' into rdf4j-jena-compat


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

Branch: refs/heads/master
Commit: 5855fa4883c10621bf4f240dfa3328abc94ab75a
Parents: bdd7cf6 5cb811e
Author: Stian Soiland-Reyes 
Authored: Fri Sep 9 16:31:01 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Fri Sep 9 16:31:01 2016 +0100

--
 rdf4j/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/5855fa48/rdf4j/pom.xml
--

[17/50] [abbrv] incubator-commonsrdf git commit: No need for another .gitignore

[stain]

No need for another .gitignore


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

Branch: refs/heads/master
Commit: 0c58bd8e594d9ecebc5e9d3d71cad8cb96d68b92
Parents: 485a7eb
Author: Stian Soiland-Reyes 
Authored: Tue Sep 13 00:39:21 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Tue Sep 13 00:39:21 2016 +0100

--
 jsonld-java/.gitignore | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/0c58bd8e/jsonld-java/.gitignore
--
diff --git a/jsonld-java/.gitignore b/jsonld-java/.gitignore
deleted file mode 100644
index b83d222..000
--- a/jsonld-java/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target/

[32/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'jena' into jena-jsonld-rdf4j-integration

[stain]

Merge branch 'jena' into jena-jsonld-rdf4j-integration


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

Branch: refs/heads/master
Commit: 68438f41a34a8ee7c404304637a19b15245fe1c1
Parents: 6df7f1d c52979b
Author: Stian Soiland-Reyes 
Authored: Wed Sep 28 14:49:27 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Sep 28 14:49:27 2016 +0100

--

--

[06/50] [abbrv] incubator-commonsrdf git commit: also depend on jsonld-java

[stain]

also depend on jsonld-java


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

Branch: refs/heads/master
Commit: 5ed73ac6e8c18f7c319bfb73b598d75adb2d3332
Parents: 5a49f96
Author: Stian Soiland-Reyes 
Authored: Fri Sep 9 16:43:43 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Fri Sep 9 16:43:43 2016 +0100

--
 integration-tests/pom.xml | 79 +++---
 1 file changed, 43 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/5ed73ac6/integration-tests/pom.xml
--
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 71fd66b..7ddab6b 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -27,42 +27,49 @@
0.3.0-incubating-SNAPSHOT

commons-rdf-integration-tests
+   Commons RDF: Integration tests

-   
-   ${project.groupId}
-   commons-rdf-api
-   ${project.version}
-   
+   
+   ${project.groupId}
+   commons-rdf-api
+   ${project.version}
+   
+   
+   ${project.groupId}
+   commons-rdf-simple
+   ${project.version}
+   
+   
+   ${project.groupId}
+   commons-rdf-rdf4j
+   ${project.version}
+   
+   
+   ${project.groupId}
+   commons-rdf-jena
+   ${project.version}
+   
+   
+   
+   ${project.groupId}
+   commons-rdf-jsonld
+   ${project.version}
+   
+   
+   ${project.groupId}
+   commons-rdf-api
+   ${project.version}
+   test-jar
+   test
+   
+   
+   junit
+   junit
+   test
+   
+
+   
+
 
-   
-   ${project.groupId}
-   commons-rdf-simple
-   ${project.version}
-   
-   
-   ${project.groupId}
-   commons-rdf-rdf4j
-   ${project.version}
-   
-   
-   ${project.groupId}
-   commons-rdf-jena
-   ${project.version}
-   
-   
-   ${project.groupId}
-   commons-rdf-api
-   ${project.version}
-   test-jar
-   test
-  
-   
-   junit
-   junit
-   test
-   
-   
-
-   
-   Commons RDF: Integration tests
 

[16/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'jsonld-java' into jena-jsonld-rdf4j-integration

[stain]

Merge branch 'jsonld-java' into jena-jsonld-rdf4j-integration


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

Branch: refs/heads/master
Commit: 485a7eb5e545b9163f362adca89841644c8d44e5
Parents: 60864de 0928ddb
Author: Stian Soiland-Reyes 
Authored: Tue Sep 13 00:12:44 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Tue Sep 13 00:12:44 2016 +0100

--
 .../rdf/jsonldjava/JsonLdRDFTermFactory.java  | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)
--

[03/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'jsonld-java' into rdf4j-jena-compat

[stain]

Merge branch 'jsonld-java' into rdf4j-jena-compat


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

Branch: refs/heads/master
Commit: 3353f9a550ccb78131a17a186a28b7412ce03a92
Parents: 5855fa4 3a8cb56
Author: Stian Soiland-Reyes 
Authored: Fri Sep 9 16:31:35 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Fri Sep 9 16:31:35 2016 +0100

--
 jsonld-java/.gitignore  |   1 +
 jsonld-java/pom.xml |  67 
 .../commons/rdf/jsonldjava/JsonLdBlankNode.java |  62 
 .../commons/rdf/jsonldjava/JsonLdDataset.java   | 112 +++
 .../commons/rdf/jsonldjava/JsonLdGraph.java | 114 +++
 .../commons/rdf/jsonldjava/JsonLdGraphLike.java | 204 +
 .../commons/rdf/jsonldjava/JsonLdIRI.java   |  65 
 .../commons/rdf/jsonldjava/JsonLdLiteral.java   | 100 ++
 .../rdf/jsonldjava/JsonLdParserBuilder.java | 131 
 .../commons/rdf/jsonldjava/JsonLdQuad.java  |  65 
 .../commons/rdf/jsonldjava/JsonLdQuadLike.java  |  75 +
 .../rdf/jsonldjava/JsonLdRDFTermFactory.java| 304 +++
 .../commons/rdf/jsonldjava/JsonLdTerm.java  |  43 +++
 .../commons/rdf/jsonldjava/JsonLdTriple.java|  62 
 .../rdf/jsonldjava/JsonLdUnionGraph.java| 116 +++
 .../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 |  25 ++
 .../commons/rdf/jsonldjava/JsonLdGraphTest.java |  31 ++
 .../rdf/jsonldjava/JsonLdParserBuilderTest.java | 116 +++
 .../jsonldjava/JsonLdRDFTermFactoryTest.java|  54 
 pom.xml |  14 +
 23 files changed, 1815 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/3353f9a5/pom.xml
--
diff --cc pom.xml
index 3e858d1,5669122..02d205a
--- a/pom.xml
+++ b/pom.xml
@@@ -218,9 -215,7 +218,10 @@@
  
  api
  simple
 +rdf4j
 +jena
+ jsonld-java
 +integration-tests
  
  
  

[46/50] [abbrv] incubator-commonsrdf git commit: jena no longer need log4j.properties

[stain]

jena no longer need log4j.properties


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

Branch: refs/heads/master
Commit: b54b5c6862b570a181390f32537310642fb88690
Parents: c34a85e
Author: Stian Soiland-Reyes 
Authored: Wed Oct 26 11:45:13 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Oct 26 11:45:13 2016 +0100

--
 jena/src/test/resources/log4j.properties | 33 ---
 1 file changed, 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/b54b5c68/jena/src/test/resources/log4j.properties
--
diff --git a/jena/src/test/resources/log4j.properties 
b/jena/src/test/resources/log4j.properties
deleted file mode 100644
index 794559f..000
--- a/jena/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,33 +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.
-log4j.rootLogger=INFO, stdlog
-
-log4j.appender.stdlog=org.apache.log4j.ConsoleAppender
-## log4j.appender.stdlog.target=System.err
-log4j.appender.stdlog.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdlog.layout.ConversionPattern=%d{HH:mm:ss} %-5p %-25c{1} :: 
%m%n
-
-# Execution logging
-log4j.logger.org.apache.jena.arq.info=INFO
-log4j.logger.org.apache.jena.arq.exec=INFO
-
-# Everything else in Jena
-log4j.logger.org.apache.jena=WARN
-log4j.logger.org.apache.jena.riot=INFO
-
-# Apache Commons HTTP
-# May be useful to turn up to DEBUG if debugging HTTP communication issues
-log4j.logger.org.apache.http=WARN

[50/50] [abbrv] incubator-commonsrdf git commit: Avoid ConcurrentModification

[stain]

Avoid ConcurrentModification

(can't modify graph while streaming it)


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

Branch: refs/heads/master
Commit: 2a5dbf9ff0633f1f7f518ef1431d53e21831281f
Parents: 5c190d2
Author: Stian Soiland-Reyes 
Authored: Wed Oct 26 12:35:00 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Oct 26 12:35:00 2016 +0100

--
 .../apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java | 5 -
 1 file changed, 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/2a5dbf9f/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
--
diff --git 
a/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
 
b/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
index 393bc8f..728bba2 100644
--- 
a/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
+++ 
b/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
@@ -130,11 +130,6 @@ public class TestJenaGraphToCommonsRDFGraph {
System.out.println("\n Write Jena graph directly\n") ;
RDFDataMgr.write(System.out, jGraph, Lang.TTL) ;
 }
-
-// Can stream modify the jGraph? Let's try to remove..
-assertFalse(jGraph.isEmpty());
-graph.stream().forEach(graph::remove);
-assertTrue(jGraph.isEmpty());
 }
 }
 

[01/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'jena' into rdf4j-jena-compat

[stain]

Repository: incubator-commonsrdf
Updated Branches:
  refs/heads/master 5f6bcff7f -> 2a5dbf9ff


Merge branch 'jena' into rdf4j-jena-compat


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

Branch: refs/heads/master
Commit: bdd7cf6261a2d78b72ab798560613d7cc8f82f50
Parents: 84c7032 387eaae
Author: Stian Soiland-Reyes 
Authored: Fri Sep 9 16:30:36 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Fri Sep 9 16:30:36 2016 +0100

--
 LICENSE-header.txt  |  16 +
 api/pom.xml |   5 +-
 .../org/apache/commons/rdf/api/GraphLike.java   |  27 +-
 .../java/org/apache/commons/rdf/api/Quad.java   |  25 +-
 .../org/apache/commons/rdf/api/QuadLike.java|  24 +-
 .../apache/commons/rdf/api/RDFTermFactory.java  |   1 +
 .../java/org/apache/commons/rdf/api/Triple.java |   2 +
 .../org/apache/commons/rdf/api/TripleLike.java  |  20 +-
 api/src/site/resources/profile.jacoco   |   0
 api/src/site/resources/profile.japicmp  |   0
 jena/pom.xml|  15 +-
 .../org/apache/commons/rdf/jena/JenaGraph.java  |  19 ++
 .../commons/rdf/jena/JenaRDFTermFactory.java|  74 -
 .../apache/commons/rdf/jena/impl/GraphImpl.java |  25 +-
 .../commons/rdf/jena/impl/JenaFactory.java  |  33 +-
 .../commons/rdf/jena/TestBlankNodeJena.java |   6 +-
 pom.xml | 307 ---
 .../commons/rdf/simple/DatasetGraphView.java|   2 +-
 simple/src/site/resources/profile.jacoco|   0
 simple/src/site/resources/profile.japicmp   |   0
 src/conf/checkstyle-suppressions.xml|  32 ++
 src/conf/checkstyle.xml | 197 
 src/conf/findbugs-exclude-filter.xml|  27 ++
 src/conf/pmd.xml|  25 ++
 src/site/markdown/implementations.md|  63 +++-
 src/site/markdown/index.md  |  58 +++-
 src/site/resources/images/class-diagram.nomnoml |  49 ++-
 src/site/resources/images/class-diagram.png | Bin 57632 -> 56161 bytes
 src/site/site.xml   |   3 +-
 29 files changed, 834 insertions(+), 221 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/bdd7cf62/pom.xml
--

[27/50] [abbrv] incubator-commonsrdf git commit: JsonLdDataSet and JsonLdGraph made public for JsonLdParser

[stain]

JsonLdDataSet and JsonLdGraph made public for JsonLdParser


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

Branch: refs/heads/master
Commit: c3c17192ad049d2d86678f440e4a6d0f29f28dc4
Parents: a189f91
Author: Stian Soiland-Reyes 
Authored: Tue Sep 27 18:43:30 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Tue Sep 27 18:43:30 2016 +0100

--
 .../main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java | 2 +-
 .../main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/c3c17192/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java
--
diff --git 
a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java
 
b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java
index 1ab4b11..55b9f3c 100644
--- 
a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java
+++ 
b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java
@@ -32,7 +32,7 @@ import org.apache.commons.rdf.api.RDFTerm;
 
 import com.github.jsonldjava.core.RDFDataset;
 
-class JsonLdDataset extends JsonLdGraphLike 
implements Dataset {
+public class JsonLdDataset extends 
JsonLdGraphLike implements Dataset {
 
JsonLdDataset(RDFDataset rdfDataSet) {
super(rdfDataSet);

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/c3c17192/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
--
diff --git 
a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java 
b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
index 3b35c76..206c82a 100644
--- 
a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
+++ 
b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
@@ -34,7 +34,7 @@ import com.github.jsonldjava.core.RDFDataset;
  * A {@link Graph} view of a JsonLd {@link RDFDataset}.
  * 
  */
-class JsonLdGraph extends JsonLdGraphLike 
implements Graph {
+public class JsonLdGraph extends 
JsonLdGraphLike implements Graph {
 
private final Optional graphName;
 

[21/50] [abbrv] incubator-commonsrdf git commit: comment on all to all

[stain]

comment on all to all


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

Branch: refs/heads/master
Commit: 8a26fe8ff3e989ad0c808f95ad7670b9a2e91303
Parents: 92eb91a
Author: Stian Soiland-Reyes 
Authored: Fri Sep 23 17:58:17 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Fri Sep 23 17:58:17 2016 +0100

--
 .../java/org/apache/commons/rdf/integrationtests/AllToAllTest.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/8a26fe8f/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
--
diff --git 
a/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
 
b/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
index b0b4f3b..3edf6e4 100644
--- 
a/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
+++ 
b/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
@@ -48,6 +48,8 @@ public class AllToAllTest {
Collection  allToAll = new ArrayList<>();
for (Class from : factories) {
for (Class to : factories) {
+   // NOTE: we deliberately include self-to-self 
here
+   // to test two instances of the same 
implementation
allToAll.add(new Object[]{from, to});
}
}

[35/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'master' into jena-jsonld-rdf4j-integration

[stain]

Merge branch 'master' into jena-jsonld-rdf4j-integration


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

Branch: refs/heads/master
Commit: 27e80654d917efc3d79c54f8596b20b6af3b8734
Parents: 5498729 5afd0bd
Author: Stian Soiland-Reyes 
Authored: Wed Sep 28 23:27:27 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Sep 28 23:27:27 2016 +0100

--
 .../java/org/apache/commons/rdf/api/Graph.java  |  5 ++
 .../java/org/apache/commons/rdf/api/Quad.java   |  4 +-
 .../commons/rdf/experimental/RDFParser.java |  8 +--
 .../commons/rdf/experimental/package-info.java  |  1 -
 pom.xml |  4 +-
 .../simple/experimental/AbstractRDFParser.java  | 54 +---
 .../rdf/simple/experimental/package-info.java   | 11 ++--
 7 files changed, 53 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/27e80654/pom.xml
--

[13/50] [abbrv] incubator-commonsrdf git commit: Merge branch 'master' into jena-jsonld-rdf4j-integration

[stain]

Merge branch 'master' into jena-jsonld-rdf4j-integration


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

Branch: refs/heads/master
Commit: 2b51794e84caf64831c131f4cd84f34d3976dfa2
Parents: 112505d de7fe8a
Author: Stian Soiland-Reyes 
Authored: Mon Sep 12 19:03:47 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Mon Sep 12 19:03:47 2016 +0100

--
 .../apache/commons/rdf/simple/GraphImpl.java| 39 +++-
 1 file changed, 21 insertions(+), 18 deletions(-)
--

[42/50] [abbrv] incubator-commonsrdf git commit: Add integration test

[stain]

Add integration test

Merge branch 'jena-jsonld-rdf4j-integration'


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

Branch: refs/heads/master
Commit: 887c9e68a37106f17b5c609a149af718c3e679c4
Parents: 5f6bcff c991d05
Author: Stian Soiland-Reyes 
Authored: Wed Oct 26 11:15:06 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Wed Oct 26 11:17:16 2016 +0100

--
 integration-tests/pom.xml   |  75 
 .../rdf/integrationtests/AllToAllTest.java  | 178 +++
 pom.xml |   1 +
 3 files changed, 254 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/887c9e68/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
--
diff --cc 
integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
index 000,09c887c..24d3697
mode 00,100644..100644
--- 
a/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
+++ 
b/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
@@@ -1,0 -1,161 +1,178 @@@
++/**
++ * 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.commons.rdf.integrationtests;
+ 
+ import static org.junit.Assert.assertEquals;
+ import static org.junit.Assert.assertTrue;
+ 
+ import java.util.ArrayList;
+ import java.util.Arrays;
+ import java.util.Collection;
+ import java.util.List;
+ 
+ import org.apache.commons.rdf.api.BlankNode;
+ import org.apache.commons.rdf.api.Graph;
+ import org.apache.commons.rdf.api.IRI;
+ import org.apache.commons.rdf.api.Literal;
+ import org.apache.commons.rdf.api.RDFTerm;
+ import org.apache.commons.rdf.api.RDFTermFactory;
+ import org.apache.commons.rdf.api.Triple;
+ import org.apache.commons.rdf.jena.JenaRDFTermFactory;
+ import org.apache.commons.rdf.jsonldjava.JsonLdRDFTermFactory;
+ import org.apache.commons.rdf.rdf4j.RDF4JTermFactory;
+ import org.apache.commons.rdf.simple.SimpleRDFTermFactory;
+ import org.junit.Test;
+ import org.junit.runner.RunWith;
+ import org.junit.runners.Parameterized;
+ import org.junit.runners.Parameterized.Parameters;
+ 
+ @RunWith(Parameterized.class)
+ public class AllToAllTest {
+ 
+   private RDFTermFactory nodeFactory;
+   private RDFTermFactory graphFactory;
+ 
+ 
+   public AllToAllTest(
 -  Class from, 
++  Class from,
+   Class to) throws 
InstantiationException, IllegalAccessException {
+   this.nodeFactory = from.newInstance();
 -  this.graphFactory = to.newInstance();   
++  this.graphFactory = to.newInstance();
+   }
 -  
++
+   @SuppressWarnings("rawtypes")
+   @Parameters(name = "{index}: {0}->{1}")
 -  public static Collection data() { 
++  public static Collection data() {
+   List factories = Arrays.asList(
 -  SimpleRDFTermFactory.class, 
 -  JenaRDFTermFactory.class, 
++  SimpleRDFTermFactory.class,
++  JenaRDFTermFactory.class,
+   RDF4JTermFactory.class,
+   JsonLdRDFTermFactory.class);
+   Collection  allToAll = new ArrayList<>();
+   for (Class from : factories) {
+   for (Class to : factories) {
+   // NOTE: we deliberately include self-to-self 
here
+  

[11/50] [abbrv] incubator-commonsrdf git commit: addTermsFromOtherFactory

[stain]

addTermsFromOtherFactory


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

Branch: refs/heads/master
Commit: b8ff697a9bab3804ac59d7764c26ab76fda4ba23
Parents: 1828c2a
Author: Stian Soiland-Reyes 
Authored: Fri Sep 9 17:42:27 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Fri Sep 9 17:44:30 2016 +0100

--
 .../rdf/integrationtests/AllToAllTest.java  | 46 
 1 file changed, 29 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/b8ff697a/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
--
diff --git 
a/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
 
b/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
index a8cd1cd..b9ea397 100644
--- 
a/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
+++ 
b/integration-tests/src/test/java/org/apache/commons/rdf/integrationtests/AllToAllTest.java
@@ -7,6 +7,7 @@ import org.apache.commons.rdf.api.BlankNode;
 import org.apache.commons.rdf.api.Graph;
 import org.apache.commons.rdf.api.IRI;
 import org.apache.commons.rdf.api.Literal;
+import org.apache.commons.rdf.api.RDFTerm;
 import org.apache.commons.rdf.api.RDFTermFactory;
 import org.apache.commons.rdf.api.Triple;
 import org.apache.commons.rdf.jena.JenaRDFTermFactory;
@@ -24,48 +25,57 @@ public class AllToAllTest {
 
@Test
public void jenaToRdf4j() throws Exception {
-   nodesIntoOther(jenaFactory, rdf4jFactory);
+   addTermsFromOtherFactory(jenaFactory, rdf4jFactory);
}
@Test
public void jenaToJsonLd() throws Exception {
-   nodesIntoOther(jenaFactory, jsonldFactory);
+   addTermsFromOtherFactory(jenaFactory, jsonldFactory);
}
@Test
public void jenaToSimple() throws Exception {
-   nodesIntoOther(jenaFactory, simpleFactory);
+   addTermsFromOtherFactory(jenaFactory, simpleFactory);
}

@Test
public void rdf4jToJena() throws Exception {
-   nodesIntoOther(rdf4jFactory, jenaFactory);
+   addTermsFromOtherFactory(rdf4jFactory, jenaFactory);
}
@Test
public void rdf4jToJsonLd() throws Exception {
-   nodesIntoOther(rdf4jFactory, jsonldFactory);
+   addTermsFromOtherFactory(rdf4jFactory, jsonldFactory);
}   
@Test
public void rdf4jToSimple() throws Exception {
-   nodesIntoOther(rdf4jFactory, simpleFactory);
+   addTermsFromOtherFactory(rdf4jFactory, simpleFactory);
}

@Test
public void simpletoJena() throws Exception {
-   nodesIntoOther(simpleFactory, jenaFactory);
+   addTermsFromOtherFactory(simpleFactory, jenaFactory);
}
@Test
public void simpleToJsonLd() throws Exception {
-   nodesIntoOther(simpleFactory, jsonldFactory);
+   addTermsFromOtherFactory(simpleFactory, jsonldFactory);
}
@Test
public void simpleToRdf4j() throws Exception {
-   nodesIntoOther(simpleFactory, rdf4jFactory);
+   addTermsFromOtherFactory(simpleFactory, rdf4jFactory);
}

-   public void nodesIntoOther(RDFTermFactory fromFactory, RDFTermFactory 
toFactory) throws Exception {
-   Graph g = fromFactory.createGraph();
-   BlankNode s = toFactory.createBlankNode();
-   IRI p = toFactory.createIRI("http://example.com/p;);
-   Literal o = toFactory.createLiteral("Hello");
+   /**
+* This test creates a {@link Graph} with the first
+* {@link RDFTermFactory}, then inserts/queries with
+* triples using {@link RDFTerm}s created with the second factory.
+* 
+* @param graphFactory Factory to create {@link Graph}
+* @param nodeFactory
+* @throws Exception
+*/
+   public void addTermsFromOtherFactory(RDFTermFactory nodeFactory, 
RDFTermFactory graphFactory) throws Exception {
+   Graph g = graphFactory.createGraph();
+   BlankNode s = nodeFactory.createBlankNode();
+   IRI p = nodeFactory.createIRI("http://example.com/p;);
+   Literal o = nodeFactory.createLiteral("Hello");
 
g.add(s, p, 

incubator-commonsrdf git commit: only needed for -Prelease

[stain]

Repository: incubator-commonsrdf
Updated Branches:
  refs/heads/master 351c2965b -> 5f6bcff7f


 only needed for -Prelease


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

Branch: refs/heads/master
Commit: 5f6bcff7f28d8936523fc98cbe26c4433194f39a
Parents: 351c296
Author: Stian Soiland-Reyes 
Authored: Sun Oct 23 03:19:04 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Sun Oct 23 03:19:04 2016 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/5f6bcff7/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 72563be..1c5d354 100644
--- a/pom.xml
+++ b/pom.xml
@@ -235,7 +235,6 @@
 
 
 
-apache-commonsrdf-${project.version}
 
 
 org.apache.maven.plugins
@@ -562,6 +561,7 @@
 release
 
 
+   apache-commonsrdf-${project.version}
 
   
   

[2/2] incubator-commonsrdf git commit: Merge branch 'master' into a

[stain]

Merge branch 'master' into a


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

Branch: refs/heads/COMMONSRDF-46
Commit: 44b4b6808d19715006adcc075f749fd57345b965
Parents: 9c191fc 351c296
Author: Stian Soiland-Reyes 
Authored: Sun Oct 23 03:16:39 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Sun Oct 23 03:16:39 2016 +0100

--
 .../org/apache/commons/rdf/rdf4j/RDF4J.java | 22 ++--
 .../apache/commons/rdf/rdf4j/RDF4JDataset.java  |  2 +-
 .../apache/commons/rdf/rdf4j/RDF4JGraph.java|  8 +++
 .../rdf/rdf4j/impl/InternalRDF4JFactory.java|  2 +-
 .../apache/commons/rdf/rdf4j/package-info.java  |  4 ++--
 .../commons/rdf/rdf4j/MemoryGraphTest.java  |  2 +-
 .../commons/rdf/rdf4j/NativeStoreGraphTest.java |  2 +-
 7 files changed, 21 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/44b4b680/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4J.java
--
diff --cc rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4J.java
index fb5743b,000..7f70c75
mode 100644,00..100644
--- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4J.java
+++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4J.java
@@@ -1,603 -1,0 +1,603 @@@
 +/**
 + * 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.commons.rdf.rdf4j;
 +
 +import java.util.Arrays;
 +import java.util.EnumSet;
 +import java.util.Objects;
 +import java.util.Set;
 +import java.util.UUID;
 +
 +// To avoid confusion, avoid importing
 +// classes that are in both
 +// commons.rdf and openrdf.model (e.g. IRI, Literal)
 +import org.apache.commons.rdf.api.BlankNode;
 +import org.apache.commons.rdf.api.BlankNodeOrIRI;
 +import org.apache.commons.rdf.api.Dataset;
 +import org.apache.commons.rdf.api.Graph;
 +import org.apache.commons.rdf.api.Quad;
 +import org.apache.commons.rdf.api.RDFTerm;
 +import org.apache.commons.rdf.api.RDF;
 +import org.apache.commons.rdf.api.Triple;
 +import org.apache.commons.rdf.api.TripleLike;
 +import org.apache.commons.rdf.rdf4j.impl.InternalRDF4JFactory;
 +import org.eclipse.rdf4j.model.BNode;
 +import org.eclipse.rdf4j.model.Model;
 +import org.eclipse.rdf4j.model.Resource;
 +import org.eclipse.rdf4j.model.Statement;
 +import org.eclipse.rdf4j.model.Value;
 +import org.eclipse.rdf4j.model.ValueFactory;
 +import org.eclipse.rdf4j.model.impl.LinkedHashModel;
 +import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
 +import org.eclipse.rdf4j.repository.Repository;
 +import org.eclipse.rdf4j.repository.RepositoryConnection;
 +import org.eclipse.rdf4j.repository.sail.SailRepository;
 +import org.eclipse.rdf4j.sail.Sail;
 +import org.eclipse.rdf4j.sail.memory.MemoryStore;
 +
 +/**
 + * RDF4J implementation of RDF.
 + * 
 + * The {@link #RDF4J()} constructor uses a {@link SimpleValueFactory}
 + * to create corresponding RDF4J {@link Value} instances. Alternatively, this
 + * factory can be constructed with a different {@link ValueFactory} using
 + * {@link #RDF4J(ValueFactory)}.
 + * 
 + * {@link #asRDFTerm(Value)} can be used to convert any RDF4J {@link Value} to
 + * an RDFTerm. Note that adapted {@link BNode}s are considered equal if they 
are
 + * converted with the same {@link RDF4J} instance and have the same
 + * {@link BNode#getID()}.
 + * 
 + * {@link #createGraph()} creates a new Graph backed by {@link 
LinkedHashModel}.
-  * To use other models, see {@link #asRDFTermGraph(Model)}.
++ * To use other models, see {@link #asGraph(Model)}.
 + * 
 + * To adapt a RDF4J {@link Repository} as a {@link Dataset} or {@link Graph},
-  * use {@link #asRDFTermDataset(Repository, Option...)} 
++ * use {@link #asDataset(Repository, Option...)} 
 + * or 
-  * {@link 

incubator-commonsrdf git commit: RDF4J asRDFTermDataset -> asDataset()

[stain]

Repository: incubator-commonsrdf
Updated Branches:
  refs/heads/master 0bb936968 -> 351c2965b


RDF4J asRDFTermDataset -> asDataset()

..and friends


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

Branch: refs/heads/master
Commit: 351c2965b5cc0694fc4b21b21e99a8ac80bcde83
Parents: 0bb9369
Author: Stian Soiland-Reyes 
Authored: Sun Oct 23 03:11:07 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Sun Oct 23 03:11:07 2016 +0100

--
 .../apache/commons/rdf/rdf4j/RDF4JDataset.java  |  2 +-
 .../apache/commons/rdf/rdf4j/RDF4JFactory.java  | 22 ++--
 .../apache/commons/rdf/rdf4j/RDF4JGraph.java|  8 +++
 .../rdf/rdf4j/impl/InternalRDF4JFactory.java|  2 +-
 .../apache/commons/rdf/rdf4j/package-info.java  |  4 ++--
 .../commons/rdf/rdf4j/MemoryGraphTest.java  |  2 +-
 .../commons/rdf/rdf4j/NativeStoreGraphTest.java |  2 +-
 7 files changed, 21 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/351c2965/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JDataset.java
--
diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JDataset.java 
b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JDataset.java
index 2066c34..87803fa 100644
--- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JDataset.java
+++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JDataset.java
@@ -31,7 +31,7 @@ import org.apache.commons.rdf.api.RDFTerm;
  * Marker interface for RDF4J implementations of Dataset.
  * 
  * @see RDF4JFactory#createDataset()
- * @see RDF4JFactory#asRDFTermDataset(org.eclipse.rdf4j.repository.Repository, 
org.apache.commons.rdf.rdf4j.RDF4JFactory.Option...)
+ * @see RDF4JFactory#asDataset(org.eclipse.rdf4j.repository.Repository, 
org.apache.commons.rdf.rdf4j.RDF4JFactory.Option...)
  */
 public interface RDF4JDataset extends Dataset, RDF4JGraphLike {


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/351c2965/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JFactory.java
--
diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JFactory.java 
b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JFactory.java
index 7d4eabe..e435167 100644
--- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JFactory.java
+++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4JFactory.java
@@ -64,12 +64,12 @@ import org.eclipse.rdf4j.sail.memory.MemoryStore;
  * {@link BNode#getID()}.
  * 
  * {@link #createGraph()} creates a new Graph backed by {@link 
LinkedHashModel}.
- * To use other models, see {@link #asRDFTermGraph(Model)}.
+ * To use other models, see {@link #asGraph(Model)}.
  * 
  * To adapt a RDF4J {@link Repository} as a {@link Dataset} or {@link Graph},
- * use {@link #asRDFTermDataset(Repository, Option...)} 
+ * use {@link #asDataset(Repository, Option...)} 
  * or 
- * {@link #asRDFTermGraph(Repository, Option...)}.
+ * {@link #asGraph(Repository, Option...)}.
  * 
  * {@link #asTriple(Statement)} can be used to convert a RDF4J {@link 
Statement}
  * to a Commons RDF {@link Triple}, and equivalent {@link #asQuad(Statement)} 
to
@@ -93,9 +93,9 @@ import org.eclipse.rdf4j.sail.memory.MemoryStore;
  * the same {@link BNode#getID()}, converting them with the above methods might
  * cause accidental {@link BlankNode} equivalence. Note that the {@link Graph}
  * and {@link Dataset} adapter methods like
- * {@link #asRDFTermDataset(Repository, Option...)}
+ * {@link #asDataset(Repository, Option...)}
  * and 
- * {@link #asRDFTermGraph(Repository, Option...)}
+ * {@link #asGraph(Repository, Option...)}
  * therefore uses a unique {@link RDF4JFactory} internally.
  *
  */
@@ -286,7 +286,7 @@ public final class RDF4JFactory implements RDFTermFactory {
 *Zero or more {@link Option}
 * @return A {@link Dataset} backed by the RDF4J repository.
 */
-   public RDF4JDataset asRDFTermDataset(Repository repository, Option... 
options) {
+   public RDF4JDataset asDataset(Repository repository, Option... options) 
{
EnumSet opts = optionSet(options);
return rdf4j.createRepositoryDatasetImpl(repository, 
opts.contains(Option.handleInitAndShutdown), 
@@ -302,7 +302,7 @@ public final class RDF4JFactory implements RDFTermFactory {
 *RDF4J {@link Model} to adapt.
 * @return 

incubator-commonsrdf git commit: RDFFactory -> RDF in user guide

[stain]

Repository: incubator-commonsrdf
Updated Branches:
  refs/heads/COMMONSRDF-46 fa27a1789 -> 9c191fc2f


RDFFactory -> RDF in user guide


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

Branch: refs/heads/COMMONSRDF-46
Commit: 9c191fc2f4ae00b6537e213d2681821b14104293
Parents: fa27a17
Author: Stian Soiland-Reyes 
Authored: Sun Oct 23 02:58:01 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Sun Oct 23 02:58:01 2016 +0100

--
 src/site/markdown/userguide.md | 257 +++-
 1 file changed, 134 insertions(+), 123 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/9c191fc2/src/site/markdown/userguide.md
--
diff --git a/src/site/markdown/userguide.md b/src/site/markdown/userguide.md
index 8451ab9..6191889 100644
--- a/src/site/markdown/userguide.md
+++ b/src/site/markdown/userguide.md
@@ -28,8 +28,8 @@ Commons RDF [API](apidocs/).
 * [RDF concepts](#RDF_concepts)
 * [Using Commons RDF from Maven](#Using_Commons_RDF_from_Maven)
 * [Creating Commons RDF instances](#Creating_Commons_RDF_instances)
-  * [Creating a RDFFactory](#Creating_a_RDFFactory)
-  * [Using a RDFFactory](#Using_a_RDFFactory)
+  * [Finding an RDF implementation](#Finding_an_RDF_implementation)
+  * [Using an RDF implementation](#Using_an_RDF_implementation)
 * [RDF terms](#RDF_terms)
 * [N-Triples string](#N-Triples_string)
 * [IRI](#IRI)
@@ -146,25 +146,26 @@ see the [download page](download.html) for the latest 
version._
 To create instances of Commons RDF interfaces like
 [`Graph`](apidocs/org/apache/commons/rdf/api/Graph.html) and
 [`IRI`](apidocs/org/apache/commons/rdf/api/IRI.html) you will need a
-[RDFFactory](apidocs/org/apache/commons/rdf/api/RDFFactory.html).
+[RDF](apidocs/org/apache/commons/rdf/api/RDF.html) implementation.
 
-### Creating a RDFFactory
+### Finding an RDF implementation
 
-How to get an instance of this factory is implementation-specific, for the
-_simple_ implementation, you can construct the
-[SimpleRDFFactory](apidocs/org/apache/commons/rdf/simple/SimpleRDFFactory.html):
+The [implementations](implementations.md) of `RDF` can usually be
+created using a normal Java constructor, for instance the
+_simple_ implementation from
+[SimpleRDF](apidocs/org/apache/commons/rdf/simple/SimpleRDF.html):
 
 ```java
 import org.apache.commons.rdf.api.*;
-import org.apache.commons.rdf.simple.SimpleRDFFactory;
+import org.apache.commons.rdf.simple.SimpleRDF;
 // ...
-RDFFactory factory = new SimpleRDFFactory();
+RDF rdf = new SimpleRDF();
 ```
 
-If you don't want to depend on instantiating a concrete implementation,
-you can alternatively use the
+If you don't want to depend on instantiating a concrete `RDF`
+implementation, you can alternatively use the
 
[ServiceLoader](http://docs.oracle.com/javase/8/docs/api/java/util/ServiceLoader.html)
-to lookup any `RDFFactory` implementations found on the classpath:
+to lookup any `RDF` implementations found on the classpath:
 
 ```java
 import java.util.Iterator;
@@ -172,43 +173,47 @@ import java.util.ServiceLoader;
 
 import org.apache.commons.rdf.api.*;
 // ...
-ServiceLoader loader = ServiceLoader.load(RDFFactory.class);
-Iterator iterator = loader.iterator();
-RDFFactory factory = iterator.next();
+ServiceLoader loader = ServiceLoader.load(RDF.class);
+Iterator iterator = loader.iterator();
+RDF rdf = iterator.next();
 ```
 
 Note that the `ServiceLoader` approach above might not work well within
 split classloader systems like OSGi.
 
+When using the factory method
+[createBlankNode(String)](apidocs/org/apache/commons/rdf/api/RDF.html#createBlankNode-java.lang.String-)
+from different sources,
+care should be taken to create correspondingly different `RDF` instances.
 
-### Using a RDFFactory
 
-Using the factory you can construct
+### Using an RDF implementation
+
+Using the `RDF` implementation you can construct
 any [RDFTerm](apidocs/org/apache/commons/rdf/api/RDFTerm.html), e.g. to create 
a
 [BlankNode](apidocs/org/apache/commons/rdf/api/BlankNode.html),
 [IRI](apidocs/org/apache/commons/rdf/api/IRI.html) and
 [Literal](apidocs/org/apache/commons/rdf/api/Literal.html):
 
 ```java
-BlankNode aliceBlankNode = factory.createBlankNode();
-IRI nameIri = factory.createIRI("http://example.com/name;);
-Literal aliceLiteral = factory.createLiteral("Alice");
+BlankNode aliceBlankNode = rdf.createBlankNode();
+IRI nameIri = rdf.createIRI("http://example.com/name;);
+Literal aliceLiteral = 

[incubator-commonsrdf] Git Push Summary

[stain]

Repository: incubator-commonsrdf
Updated Branches:
  refs/heads/jsonld-java [deleted] 11a6a3323

[incubator-commonsrdf] Git Push Summary

[stain]

Repository: incubator-commonsrdf
Updated Branches:
  refs/heads/parser-with-quads [deleted] bfcead4f8

[13/22] incubator-commonsrdf git commit: RDFFactory -> RDF

[stain]

RDFFactory -> RDF


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

Branch: refs/heads/COMMONSRDF-46
Commit: ff94b9da54f1176816c48cb95edd12928eb0b035
Parents: 9addc8c
Author: Stian Soiland-Reyes 
Authored: Sun Oct 23 00:17:49 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Sun Oct 23 00:17:49 2016 +0100

--
 .../org/apache/commons/rdf/api/BlankNode.java   |   6 +-
 .../org/apache/commons/rdf/api/Dataset.java |   2 +-
 .../java/org/apache/commons/rdf/api/Graph.java  |   2 +-
 .../java/org/apache/commons/rdf/api/IRI.java|   2 +-
 .../org/apache/commons/rdf/api/Literal.java |   6 +-
 .../java/org/apache/commons/rdf/api/Quad.java   |   2 +-
 .../java/org/apache/commons/rdf/api/RDF.java| 277 ++
 .../org/apache/commons/rdf/api/RDFFactory.java  | 279 ---
 .../apache/commons/rdf/api/RDFTermFactory.java  |   4 +-
 .../java/org/apache/commons/rdf/api/Triple.java |   2 +-
 .../apache/commons/rdf/api/package-info.java|   2 +-
 .../commons/rdf/experimental/RDFParser.java |  12 +-
 .../commons/rdf/api/AbstractGraphTest.java  |  14 +-
 .../rdf/api/AbstractRDFTermFactoryTest.java |  14 +-
 .../rdf/api/DefaultRDFTermFactoryTest.java  |   6 +-
 examples/src/example/UserGuideTest.java |   4 +-
 .../apache/commons/rdf/jena/JenaFactory.java|  42 +--
 .../rdf/jena/experimental/JenaRDFParser.java|   4 +-
 .../commons/rdf/jena/JenaServiceLoaderTest.java |   6 +-
 .../apache/commons/rdf/jena/TestGraphJena.java  |   4 +-
 .../jena/TestJenaGraphToCommonsRDFGraph.java|   4 +-
 .../rdf/jena/TestRDFTermFactoryJena.java|   4 +-
 .../commons/rdf/jsonldjava/JsonLdFactory.java   |   4 +-
 .../rdf/jsonldjava/JsonLdFactoryTest.java   |   4 +-
 .../commons/rdf/jsonldjava/JsonLdGraphTest.java |   4 +-
 .../rdf/jsonldjava/JsonLdServiceLoaderTest.java |   6 +-
 .../apache/commons/rdf/rdf4j/RDF4JFactory.java  |   6 +-
 .../org/apache/commons/rdf/rdf4j/GraphTest.java |   4 +-
 .../commons/rdf/rdf4j/MemoryGraphTest.java  |   6 +-
 .../rdf/rdf4j/MemoryRDFTermFactoryTest.java |   4 +-
 .../commons/rdf/rdf4j/NativeStoreGraphTest.java |   6 +-
 .../rdf/rdf4j/RDF4JServiceLoaderTest.java   |   6 +-
 .../rdf/rdf4j/Rdf4JRDFTermFactoryTest.java  |   4 +-
 .../commons/rdf/simple/BlankNodeImpl.java   |   6 +-
 .../commons/rdf/simple/SimpleRDFFactory.java|   6 +-
 .../simple/experimental/AbstractRDFParser.java  |  26 +-
 .../commons/rdf/simple/DefaultGraphTest.java|  10 +-
 .../rdf/simple/DummyRDFParserBuilder.java   |   4 +-
 .../commons/rdf/simple/SimpleGraphTest.java |   4 +-
 .../SimpleNoRelativeIRIRDFTermFactoryTest.java  |   4 +-
 .../rdf/simple/SimpleRDFTermFactoryTest.java|   6 +-
 .../rdf/simple/SimpleServiceLoaderTest.java |   6 +-
 .../commons/rdf/simple/TestWritingGraph.java|   4 +-
 .../experimental/AbstractRDFParserTest.java |   4 +-
 44 files changed, 415 insertions(+), 417 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/ff94b9da/api/src/main/java/org/apache/commons/rdf/api/BlankNode.java
--
diff --git a/api/src/main/java/org/apache/commons/rdf/api/BlankNode.java 
b/api/src/main/java/org/apache/commons/rdf/api/BlankNode.java
index efa4dfb..f8e6e05 100644
--- a/api/src/main/java/org/apache/commons/rdf/api/BlankNode.java
+++ b/api/src/main/java/org/apache/commons/rdf/api/BlankNode.java
@@ -50,8 +50,8 @@ import java.util.UUID;
  * A BlankNode SHOULD contain a {@link UUID}-derived string as part of its
  * universally unique {@link #uniqueReference()}.
  *
- * @see RDFFactory#createBlankNode()
- * @see RDFFactory#createBlankNode(String)
+ * @see RDF#createBlankNode()
+ * @see RDF#createBlankNode(String)
  * @see http://www.w3.org/TR/rdf11-concepts/#dfn-blank-node;>RDF-1.1
  * Blank Node
  */
@@ -62,7 +62,7 @@ public interface BlankNode extends BlankNodeOrIRI {
  * 
  * The reference string MUST universally and uniquely identify this blank
  * node. That is, different blank nodes created separately in different 
JVMs
- * or from different {@link RDFFactory} instances MUST NOT have the same
+ * or from different {@link RDF} instances MUST NOT have the same
  * reference string.
  * 
  * The {@link #uniqueReference()} of two BlankNode instances

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/ff94b9da/api/src/main/java/org/apache/commons/rdf/api/Dataset.java

[14/22] incubator-commonsrdf git commit: JenaFactory -> JenaRDF

[stain]

JenaFactory -> JenaRDF


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

Branch: refs/heads/COMMONSRDF-46
Commit: 384a83377e8f643d61ffc91d202e84053450fa55
Parents: ff94b9d
Author: Stian Soiland-Reyes 
Authored: Sun Oct 23 00:44:43 2016 +0100
Committer: Stian Soiland-Reyes 
Committed: Sun Oct 23 00:44:43 2016 +0100

--
 .../apache/commons/rdf/jena/JenaFactory.java| 727 ---
 .../org/apache/commons/rdf/jena/JenaRDF.java| 727 +++
 .../rdf/jena/experimental/JenaRDFParser.java|  20 +-
 .../commons/rdf/jena/impl/AbstractQuadLike.java |   6 +-
 .../rdf/jena/impl/InternalJenaFactory.java  |   4 +-
 .../commons/rdf/jena/impl/JenaDatasetImpl.java  |  14 +-
 .../commons/rdf/jena/impl/JenaGraphImpl.java|  12 +-
 .../org.apache.commons.rdf.api.RDFFactory   |   2 +-
 .../commons/rdf/jena/JenaServiceLoaderTest.java |   4 +-
 .../apache/commons/rdf/jena/TestGraphJena.java  |   2 +-
 .../jena/TestJenaGraphToCommonsRDFGraph.java|   4 +-
 .../commons/rdf/jena/TestRDFParserBuilder.java  |   2 +-
 .../rdf/jena/TestRDFTermFactoryJena.java|   2 +-
 13 files changed, 763 insertions(+), 763 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/384a8337/jena/src/main/java/org/apache/commons/rdf/jena/JenaFactory.java
--
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaFactory.java 
b/jena/src/main/java/org/apache/commons/rdf/jena/JenaFactory.java
deleted file mode 100644
index 4832e44..000
--- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaFactory.java
+++ /dev/null
@@ -1,727 +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.commons.rdf.jena;
-
-import java.util.Optional;
-import java.util.UUID;
-import java.util.function.Consumer;
-
-import org.apache.commons.rdf.api.BlankNode;
-import org.apache.commons.rdf.api.BlankNodeOrIRI;
-import org.apache.commons.rdf.api.Dataset;
-import org.apache.commons.rdf.api.Graph;
-import org.apache.commons.rdf.api.IRI;
-import org.apache.commons.rdf.api.Literal;
-import org.apache.commons.rdf.api.Quad;
-import org.apache.commons.rdf.api.QuadLike;
-import org.apache.commons.rdf.api.RDFSyntax;
-import org.apache.commons.rdf.api.RDFTerm;
-import org.apache.commons.rdf.api.RDF;
-import org.apache.commons.rdf.api.Triple;
-import org.apache.commons.rdf.api.TripleLike;
-import org.apache.commons.rdf.jena.impl.InternalJenaFactory;
-import org.apache.jena.datatypes.RDFDatatype;
-import org.apache.jena.datatypes.xsd.XSDDatatype;
-import org.apache.jena.graph.Node;
-import org.apache.jena.graph.NodeFactory;
-import org.apache.jena.riot.Lang;
-import org.apache.jena.riot.RDFDataMgr;
-import org.apache.jena.riot.RDFLanguages;
-import org.apache.jena.riot.system.StreamRDF;
-import org.apache.jena.riot.system.StreamRDFBase;
-import org.apache.jena.sparql.core.DatasetGraph;
-import org.apache.jena.sparql.graph.GraphFactory;
-
-/**
- * RDF with Jena-backed objects.
- * 
- * This factory can also convert existing objects from/to Jena with methods 
like
- * {@link #fromJena(org.apache.jena.graph.Graph)} and {@link #toJena(Graph)}.
- * 
- * For the purpose of {@link BlankNode} identity, this factory will use an 
internal
- * {@link UUID} as a salt. See {@link BlankNode#uniqueReference()} for details.
- * 
- * @see RDF
- */
-public final class JenaFactory implements RDF {
-
-   private static InternalJenaFactory internalJenaFactory = new 
InternalJenaFactory(){};
-   
-   private final UUID salt;
-
-   /**
-* Create a JenaFactory.
-* 
-* This constructor will use a randomly generated {@link UUID} as a 
salt 
-* for the purposes of {@link BlankNode} identity, see 

[incubator-commonsrdf] Git Push Summary

[stain]

Repository: incubator-commonsrdf
Updated Branches:
  refs/heads/jena [deleted] 4528e695f