You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commonsrdf.apache.org by st...@apache.org on 2016/10/26 15:57:54 UTC

svn commit: r999954 [21/27] - in /websites/production/commonsrdf/content: ./ apidocs/ apidocs/org/apache/commons/rdf/api/ apidocs/org/apache/commons/rdf/api/class-use/ apidocs/org/apache/commons/rdf/jena/ apidocs/org/apache/commons/rdf/jena/class-use/ ...

Added: websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/integrationtests/AllToAllTest.html
==============================================================================
--- websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/integrationtests/AllToAllTest.html (added)
+++ websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/integrationtests/AllToAllTest.html Wed Oct 26 15:57:51 2016
@@ -0,0 +1,189 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head><meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+<title>AllToAllTest xref</title>
+<link type="text/css" rel="stylesheet" href="../../../../../stylesheet.css" />
+</head>
+<body>
+<div id="overview"><a href="../../../../../../testapidocs/org/apache/commons/rdf/integrationtests/AllToAllTest.html">View Javadoc</a></div><pre>
+<a class="jxr_linenumber" name="L1" href="#L1">1</a>   <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L2" href="#L2">2</a>   <em class="jxr_javadoccomment"> * Licensed to the Apache Software Foundation (ASF) under one</em>
+<a class="jxr_linenumber" name="L3" href="#L3">3</a>   <em class="jxr_javadoccomment"> * or more contributor license agreements.  See the NOTICE file</em>
+<a class="jxr_linenumber" name="L4" href="#L4">4</a>   <em class="jxr_javadoccomment"> * distributed with this work for additional information</em>
+<a class="jxr_linenumber" name="L5" href="#L5">5</a>   <em class="jxr_javadoccomment"> * regarding copyright ownership.  The ASF licenses this file</em>
+<a class="jxr_linenumber" name="L6" href="#L6">6</a>   <em class="jxr_javadoccomment"> * to you under the Apache License, Version 2.0 (the</em>
+<a class="jxr_linenumber" name="L7" href="#L7">7</a>   <em class="jxr_javadoccomment"> * "License"); you may not use this file except in compliance</em>
+<a class="jxr_linenumber" name="L8" href="#L8">8</a>   <em class="jxr_javadoccomment"> * with the License.  You may obtain a copy of the License at</em>
+<a class="jxr_linenumber" name="L9" href="#L9">9</a>   <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L10" href="#L10">10</a>  <em class="jxr_javadoccomment"> *     <a href="http://www.apache.org/licenses/LICENSE-2." target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.</a>0</em>
+<a class="jxr_linenumber" name="L11" href="#L11">11</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L12" href="#L12">12</a>  <em class="jxr_javadoccomment"> * Unless required by applicable law or agreed to in writing, software</em>
+<a class="jxr_linenumber" name="L13" href="#L13">13</a>  <em class="jxr_javadoccomment"> * distributed under the License is distributed on an "AS IS" BASIS,</em>
+<a class="jxr_linenumber" name="L14" href="#L14">14</a>  <em class="jxr_javadoccomment"> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.</em>
+<a class="jxr_linenumber" name="L15" href="#L15">15</a>  <em class="jxr_javadoccomment"> * See the License for the specific language governing permissions and</em>
+<a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_javadoccomment"> * limitations under the License.</em>
+<a class="jxr_linenumber" name="L17" href="#L17">17</a>  <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L18" href="#L18">18</a>  <strong class="jxr_keyword">package</strong> org.apache.commons.rdf.integrationtests;
+<a class="jxr_linenumber" name="L19" href="#L19">19</a>  
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.Assert.assertEquals;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.Assert.assertTrue;
+<a class="jxr_linenumber" name="L22" href="#L22">22</a>  
+<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> java.util.ArrayList;
+<a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> java.util.Arrays;
+<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> java.util.Collection;
+<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> java.util.List;
+<a class="jxr_linenumber" name="L27" href="#L27">27</a>  
+<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.api.BlankNode;
+<a class="jxr_linenumber" name="L29" href="#L29">29</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.api.Graph;
+<a class="jxr_linenumber" name="L30" href="#L30">30</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.api.IRI;
+<a class="jxr_linenumber" name="L31" href="#L31">31</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.api.Literal;
+<a class="jxr_linenumber" name="L32" href="#L32">32</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.api.RDFTerm;
+<a class="jxr_linenumber" name="L33" href="#L33">33</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.api.RDFTermFactory;
+<a class="jxr_linenumber" name="L34" href="#L34">34</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.api.Triple;
+<a class="jxr_linenumber" name="L35" href="#L35">35</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.jena.JenaFactory;
+<a class="jxr_linenumber" name="L36" href="#L36">36</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.jsonldjava.JsonLdFactory;
+<a class="jxr_linenumber" name="L37" href="#L37">37</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.rdf4j.RDF4JFactory;
+<a class="jxr_linenumber" name="L38" href="#L38">38</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.simple.SimpleRDFTermFactory;
+<a class="jxr_linenumber" name="L39" href="#L39">39</a>  <strong class="jxr_keyword">import</strong> org.junit.Test;
+<a class="jxr_linenumber" name="L40" href="#L40">40</a>  <strong class="jxr_keyword">import</strong> org.junit.runner.RunWith;
+<a class="jxr_linenumber" name="L41" href="#L41">41</a>  <strong class="jxr_keyword">import</strong> org.junit.runners.Parameterized;
+<a class="jxr_linenumber" name="L42" href="#L42">42</a>  <strong class="jxr_keyword">import</strong> org.junit.runners.Parameterized.Parameters;
+<a class="jxr_linenumber" name="L43" href="#L43">43</a>  
+<a class="jxr_linenumber" name="L44" href="#L44">44</a>  @RunWith(Parameterized.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/rdf/integrationtests/AllToAllTest.html">AllToAllTest</a> {
+<a class="jxr_linenumber" name="L46" href="#L46">46</a>  
+<a class="jxr_linenumber" name="L47" href="#L47">47</a>  	<strong class="jxr_keyword">private</strong> RDFTermFactory nodeFactory;
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>  	<strong class="jxr_keyword">private</strong> RDFTermFactory graphFactory;
+<a class="jxr_linenumber" name="L49" href="#L49">49</a>  
+<a class="jxr_linenumber" name="L50" href="#L50">50</a>  
+<a class="jxr_linenumber" name="L51" href="#L51">51</a>  	<strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/commons/rdf/integrationtests/AllToAllTest.html">AllToAllTest</a>(
+<a class="jxr_linenumber" name="L52" href="#L52">52</a>  			Class&lt;? <strong class="jxr_keyword">extends</strong> RDFTermFactory&gt; from,
+<a class="jxr_linenumber" name="L53" href="#L53">53</a>  			Class&lt;? <strong class="jxr_keyword">extends</strong> RDFTermFactory&gt; to) <strong class="jxr_keyword">throws</strong> InstantiationException, IllegalAccessException {
+<a class="jxr_linenumber" name="L54" href="#L54">54</a>  		<strong class="jxr_keyword">this</strong>.nodeFactory = from.newInstance();
+<a class="jxr_linenumber" name="L55" href="#L55">55</a>  		<strong class="jxr_keyword">this</strong>.graphFactory = to.newInstance();
+<a class="jxr_linenumber" name="L56" href="#L56">56</a>  	}
+<a class="jxr_linenumber" name="L57" href="#L57">57</a>  
+<a class="jxr_linenumber" name="L58" href="#L58">58</a>  	@SuppressWarnings(<span class="jxr_string">"rawtypes"</span>)
+<a class="jxr_linenumber" name="L59" href="#L59">59</a>  	@Parameters(name = <span class="jxr_string">"{index}: {0}-&gt;{1}"</span>)
+<a class="jxr_linenumber" name="L60" href="#L60">60</a>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> Collection&lt;Object[]&gt; data() {
+<a class="jxr_linenumber" name="L61" href="#L61">61</a>  		List&lt;Class&gt; factories = Arrays.asList(
+<a class="jxr_linenumber" name="L62" href="#L62">62</a>  						SimpleRDFTermFactory.<strong class="jxr_keyword">class</strong>,
+<a class="jxr_linenumber" name="L63" href="#L63">63</a>  						JenaFactory.<strong class="jxr_keyword">class</strong>,
+<a class="jxr_linenumber" name="L64" href="#L64">64</a>  						RDF4JFactory.<strong class="jxr_keyword">class</strong>,
+<a class="jxr_linenumber" name="L65" href="#L65">65</a>  						JsonLdFactory.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L66" href="#L66">66</a>  		Collection&lt;Object[]&gt;  allToAll = <strong class="jxr_keyword">new</strong> ArrayList&lt;&gt;();
+<a class="jxr_linenumber" name="L67" href="#L67">67</a>  		<strong class="jxr_keyword">for</strong> (Class from : factories) {
+<a class="jxr_linenumber" name="L68" href="#L68">68</a>  			<strong class="jxr_keyword">for</strong> (Class to : factories) {
+<a class="jxr_linenumber" name="L69" href="#L69">69</a>  				<em class="jxr_comment">// NOTE: we deliberately include self-to-self here</em>
+<a class="jxr_linenumber" name="L70" href="#L70">70</a>  				<em class="jxr_comment">// to test two instances of the same implementation</em>
+<a class="jxr_linenumber" name="L71" href="#L71">71</a>  				allToAll.add(<strong class="jxr_keyword">new</strong> Object[]{from, to});
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>  			}
+<a class="jxr_linenumber" name="L73" href="#L73">73</a>  		}
+<a class="jxr_linenumber" name="L74" href="#L74">74</a>  		<strong class="jxr_keyword">return</strong> allToAll;
+<a class="jxr_linenumber" name="L75" href="#L75">75</a>  	}
+<a class="jxr_linenumber" name="L76" href="#L76">76</a>  
+<a class="jxr_linenumber" name="L77" href="#L77">77</a>  	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L78" href="#L78">78</a>  <em class="jxr_javadoccomment">	 * This test creates a {@link Graph} with the first</em>
+<a class="jxr_linenumber" name="L79" href="#L79">79</a>  <em class="jxr_javadoccomment">	 * {@link RDFTermFactory}, then inserts/queries with</em>
+<a class="jxr_linenumber" name="L80" href="#L80">80</a>  <em class="jxr_javadoccomment">	 * triples using {@link RDFTerm}s created with the second factory.</em>
+<a class="jxr_linenumber" name="L81" href="#L81">81</a>  <em class="jxr_javadoccomment">	 *</em>
+<a class="jxr_linenumber" name="L82" href="#L82">82</a>  <em class="jxr_javadoccomment">	 * @throws Exception Just in case..</em>
+<a class="jxr_linenumber" name="L83" href="#L83">83</a>  <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L84" href="#L84">84</a>  	@Test
+<a class="jxr_linenumber" name="L85" href="#L85">85</a>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> addTermsFromOtherFactory() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="L86" href="#L86">86</a>  		Graph g = graphFactory.createGraph();
+<a class="jxr_linenumber" name="L87" href="#L87">87</a>  		BlankNode s = nodeFactory.createBlankNode();
+<a class="jxr_linenumber" name="L88" href="#L88">88</a>  		IRI p = nodeFactory.createIRI(<span class="jxr_string">"http://example.com/p"</span>);
+<a class="jxr_linenumber" name="L89" href="#L89">89</a>  		Literal o = nodeFactory.createLiteral(<span class="jxr_string">"Hello"</span>);
+<a class="jxr_linenumber" name="L90" href="#L90">90</a>  
+<a class="jxr_linenumber" name="L91" href="#L91">91</a>  		g.add(s, p, o);
+<a class="jxr_linenumber" name="L92" href="#L92">92</a>  
+<a class="jxr_linenumber" name="L93" href="#L93">93</a>  		<em class="jxr_comment">// blankNode should still work with g.contains()</em>
+<a class="jxr_linenumber" name="L94" href="#L94">94</a>  		assertTrue(g.contains(s, p, o));
+<a class="jxr_linenumber" name="L95" href="#L95">95</a>  		Triple t1 = g.stream().findAny().get();
+<a class="jxr_linenumber" name="L96" href="#L96">96</a>  
+<a class="jxr_linenumber" name="L97" href="#L97">97</a>  		<em class="jxr_comment">// Can't make assumptions about BlankNode equality - it might</em>
+<a class="jxr_linenumber" name="L98" href="#L98">98</a>  		<em class="jxr_comment">// have been mapped to a different BlankNode.uniqueReference()</em>
+<a class="jxr_linenumber" name="L99" href="#L99">99</a>  		<em class="jxr_comment">// assertEquals(s, t.getSubject());</em>
+<a class="jxr_linenumber" name="L100" href="#L100">100</a> 
+<a class="jxr_linenumber" name="L101" href="#L101">101</a> 		assertEquals(p, t1.getPredicate());
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> 		assertEquals(o, t1.getObject());
+<a class="jxr_linenumber" name="L103" href="#L103">103</a> 
+<a class="jxr_linenumber" name="L104" href="#L104">104</a> 		IRI s2 = nodeFactory.createIRI(<span class="jxr_string">"http://example.com/s2"</span>);
+<a class="jxr_linenumber" name="L105" href="#L105">105</a> 		g.add(s2, p, s);
+<a class="jxr_linenumber" name="L106" href="#L106">106</a> 		assertTrue(g.contains(s2, p, s));
+<a class="jxr_linenumber" name="L107" href="#L107">107</a> 
+<a class="jxr_linenumber" name="L108" href="#L108">108</a> 		<em class="jxr_comment">// This should be mapped to the same BlankNode</em>
+<a class="jxr_linenumber" name="L109" href="#L109">109</a> 		<em class="jxr_comment">// (even if it has a different identifier), e.g.</em>
+<a class="jxr_linenumber" name="L110" href="#L110">110</a> 		<em class="jxr_comment">// we should be able to do:</em>
+<a class="jxr_linenumber" name="L111" href="#L111">111</a> 
+<a class="jxr_linenumber" name="L112" href="#L112">112</a> 		Triple t2 = g.stream(s2, p, <strong class="jxr_keyword">null</strong>).findAny().get();
+<a class="jxr_linenumber" name="L113" href="#L113">113</a> 
+<a class="jxr_linenumber" name="L114" href="#L114">114</a> 		BlankNode bnode = (BlankNode) t2.getObject();
+<a class="jxr_linenumber" name="L115" href="#L115">115</a> 		<em class="jxr_comment">// And that (possibly adapted) BlankNode object should</em>
+<a class="jxr_linenumber" name="L116" href="#L116">116</a> 		<em class="jxr_comment">// match the subject of t1 statement</em>
+<a class="jxr_linenumber" name="L117" href="#L117">117</a> 		assertEquals(bnode, t1.getSubject());
+<a class="jxr_linenumber" name="L118" href="#L118">118</a> 		<em class="jxr_comment">// And can be used as a key:</em>
+<a class="jxr_linenumber" name="L119" href="#L119">119</a> 		Triple t3 = g.stream(bnode, p, <strong class="jxr_keyword">null</strong>).findAny().get();
+<a class="jxr_linenumber" name="L120" href="#L120">120</a> 		assertEquals(t1, t3);
+<a class="jxr_linenumber" name="L121" href="#L121">121</a> 	}
+<a class="jxr_linenumber" name="L122" href="#L122">122</a> 
+<a class="jxr_linenumber" name="L123" href="#L123">123</a> 
+<a class="jxr_linenumber" name="L124" href="#L124">124</a> 	<em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L125" href="#L125">125</a> <em class="jxr_javadoccomment">	 * This is a variation of {@link #addTermsFromOtherFactory()}, but here</em>
+<a class="jxr_linenumber" name="L126" href="#L126">126</a> <em class="jxr_javadoccomment">	 * {@link Triple} is created in the "foreign" nodeFactory before adding to</em>
+<a class="jxr_linenumber" name="L127" href="#L127">127</a> <em class="jxr_javadoccomment">	 * the graph.</em>
+<a class="jxr_linenumber" name="L128" href="#L128">128</a> <em class="jxr_javadoccomment">	 * </em>
+<a class="jxr_linenumber" name="L129" href="#L129">129</a> <em class="jxr_javadoccomment">	 * @throws Exception</em>
+<a class="jxr_linenumber" name="L130" href="#L130">130</a> <em class="jxr_javadoccomment">	 *             Just in case..</em>
+<a class="jxr_linenumber" name="L131" href="#L131">131</a> <em class="jxr_javadoccomment">	 */</em>
+<a class="jxr_linenumber" name="L132" href="#L132">132</a> 	@Test
+<a class="jxr_linenumber" name="L133" href="#L133">133</a> 	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> addTriplesFromOtherFactory() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="L134" href="#L134">134</a> 		Graph g = graphFactory.createGraph();
+<a class="jxr_linenumber" name="L135" href="#L135">135</a> 		BlankNode s = nodeFactory.createBlankNode();
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> 		IRI p = nodeFactory.createIRI(<span class="jxr_string">"http://example.com/p"</span>);
+<a class="jxr_linenumber" name="L137" href="#L137">137</a> 		Literal o = nodeFactory.createLiteral(<span class="jxr_string">"Hello"</span>);
+<a class="jxr_linenumber" name="L138" href="#L138">138</a> 
+<a class="jxr_linenumber" name="L139" href="#L139">139</a> 		Triple srcT1 = nodeFactory.createTriple(s, p, o);
+<a class="jxr_linenumber" name="L140" href="#L140">140</a> 		<em class="jxr_comment">// This should work even with BlankNode as they are from the same factory</em>
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> 		assertEquals(s, srcT1.getSubject());
+<a class="jxr_linenumber" name="L142" href="#L142">142</a> 		assertEquals(p, srcT1.getPredicate());
+<a class="jxr_linenumber" name="L143" href="#L143">143</a> 		assertEquals(o, srcT1.getObject());
+<a class="jxr_linenumber" name="L144" href="#L144">144</a> 		g.add(srcT1);
+<a class="jxr_linenumber" name="L145" href="#L145">145</a> 
+<a class="jxr_linenumber" name="L146" href="#L146">146</a> 		<em class="jxr_comment">// what about the blankNode within?</em>
+<a class="jxr_linenumber" name="L147" href="#L147">147</a> 		assertTrue(g.contains(srcT1));
+<a class="jxr_linenumber" name="L148" href="#L148">148</a> 		Triple t1 = g.stream().findAny().get();
+<a class="jxr_linenumber" name="L149" href="#L149">149</a> 
+<a class="jxr_linenumber" name="L150" href="#L150">150</a> 		<em class="jxr_comment">// Can't make assumptions about BlankNode equality - it might</em>
+<a class="jxr_linenumber" name="L151" href="#L151">151</a> 		<em class="jxr_comment">// have been mapped to a different BlankNode.uniqueReference()</em>
+<a class="jxr_linenumber" name="L152" href="#L152">152</a> 		<em class="jxr_comment">//assertEquals(srcT1, t1);</em>
+<a class="jxr_linenumber" name="L153" href="#L153">153</a> 		<em class="jxr_comment">//assertEquals(s, t1.getSubject());</em>
+<a class="jxr_linenumber" name="L154" href="#L154">154</a> 		assertEquals(p, t1.getPredicate());
+<a class="jxr_linenumber" name="L155" href="#L155">155</a> 		assertEquals(o, t1.getObject());
+<a class="jxr_linenumber" name="L156" href="#L156">156</a> 
+<a class="jxr_linenumber" name="L157" href="#L157">157</a> 		IRI s2 = nodeFactory.createIRI(<span class="jxr_string">"http://example.com/s2"</span>);
+<a class="jxr_linenumber" name="L158" href="#L158">158</a> 		Triple srcT2 = nodeFactory.createTriple(s2, p, s);
+<a class="jxr_linenumber" name="L159" href="#L159">159</a> 		g.add(srcT2);
+<a class="jxr_linenumber" name="L160" href="#L160">160</a> 		assertTrue(g.contains(srcT2));
+<a class="jxr_linenumber" name="L161" href="#L161">161</a> 
+<a class="jxr_linenumber" name="L162" href="#L162">162</a> 		<em class="jxr_comment">// This should be mapped to the same BlankNode</em>
+<a class="jxr_linenumber" name="L163" href="#L163">163</a> 		<em class="jxr_comment">// (even if it has a different identifier), e.g.</em>
+<a class="jxr_linenumber" name="L164" href="#L164">164</a> 		<em class="jxr_comment">// we should be able to do:</em>
+<a class="jxr_linenumber" name="L165" href="#L165">165</a> 
+<a class="jxr_linenumber" name="L166" href="#L166">166</a> 		Triple t2 = g.stream(s2, p, <strong class="jxr_keyword">null</strong>).findAny().get();
+<a class="jxr_linenumber" name="L167" href="#L167">167</a> 
+<a class="jxr_linenumber" name="L168" href="#L168">168</a> 		BlankNode bnode = (BlankNode) t2.getObject();
+<a class="jxr_linenumber" name="L169" href="#L169">169</a> 		<em class="jxr_comment">// And that (possibly adapted) BlankNode object should</em>
+<a class="jxr_linenumber" name="L170" href="#L170">170</a> 		<em class="jxr_comment">// match the subject of t1 statement</em>
+<a class="jxr_linenumber" name="L171" href="#L171">171</a> 		assertEquals(bnode, t1.getSubject());
+<a class="jxr_linenumber" name="L172" href="#L172">172</a> 		<em class="jxr_comment">// And can be used as a key:</em>
+<a class="jxr_linenumber" name="L173" href="#L173">173</a> 		Triple t3 = g.stream(bnode, p, <strong class="jxr_keyword">null</strong>).findAny().get();
+<a class="jxr_linenumber" name="L174" href="#L174">174</a> 		assertEquals(t1, t3);
+<a class="jxr_linenumber" name="L175" href="#L175">175</a> 	}
+<a class="jxr_linenumber" name="L176" href="#L176">176</a> }
+</pre>
+<hr/>
+<div id="footer">Copyright &#169; 2015&#x2013;2016 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>
+</body>
+</html>
\ No newline at end of file

Added: websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/integrationtests/package-frame.html
==============================================================================
--- websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/integrationtests/package-frame.html (added)
+++ websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/integrationtests/package-frame.html Wed Oct 26 15:57:51 2016
@@ -0,0 +1,24 @@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xml:lang="en" lang="en">
+	<head>
+		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		<title>Commons RDF 0.3.0-incubating-SNAPSHOT Reference Package org.apache.commons.rdf.integrationtests</title>
+		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
+	</head>
+	<body>
+
+		<h3>
+        	<a href="package-summary.html" target="classFrame">org.apache.commons.rdf.integrationtests</a>
+      	</h3>
+
+      	<h3>Classes</h3>
+
+      	<ul>
+      		          	<li>
+            	<a href="AllToAllTest.html" target="classFrame">AllToAllTest</a>
+          	</li>
+          	      	</ul>
+
+	</body>
+</html>
\ No newline at end of file

Added: websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/integrationtests/package-summary.html
==============================================================================
--- websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/integrationtests/package-summary.html (added)
+++ websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/integrationtests/package-summary.html Wed Oct 26 15:57:51 2016
@@ -0,0 +1,69 @@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xml:lang="en" lang="en">
+	<head>
+		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		<title>Commons RDF 0.3.0-incubating-SNAPSHOT Reference Package org.apache.commons.rdf.integrationtests</title>
+		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
+	</head>
+	<body>
+		      	<div class="overview">
+        	<ul>
+          		<li>
+            		<a href="../../../../../overview-summary.html">Overview</a>
+          		</li>
+          		<li class="selected">Package</li>
+        	</ul>
+      	</div>
+      	<div class="framenoframe">
+        	<ul>
+          		<li>
+            		<a href="../../../../../index.html" target="_top">FRAMES</a>
+          		</li>
+          		<li>
+            		<a href="package-summary.html" target="_top">NO FRAMES</a>
+          		</li>
+        	</ul>
+      	</div>
+		
+		      	<h2>Package org.apache.commons.rdf.integrationtests</h2>
+
+		<table class="summary">
+        	<thead>
+          		<tr>
+            		<th>Class Summary</th>
+          		</tr>
+        	</thead>
+        	<tbody>
+        		            	<tr>
+              		<td>
+                		<a href="AllToAllTest.html" target="classFrame">AllToAllTest</a>
+              		</td>
+            	</tr>
+				        	</tbody>
+      	</table>
+		
+		      	<div class="overview">
+        	<ul>
+          		<li>
+            		<a href="../../../../../overview-summary.html">Overview</a>
+          		</li>
+          		<li class="selected">Package</li>
+        	</ul>
+      	</div>
+      	<div class="framenoframe">
+        	<ul>
+          		<li>
+            		<a href="../../../../../index.html" target="_top">FRAMES</a>
+          		</li>
+          		<li>
+            		<a href="package-summary.html" target="_top">NO FRAMES</a>
+          		</li>
+        	</ul>
+      	</div>
+				<hr />
+		<div id="footer">
+			Copyright &#169; 2015&#x2013;2016 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.
+		</div>
+	</body>
+</html>
\ No newline at end of file

Modified: websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/jena/TestGraphJena.html
==============================================================================
--- websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/jena/TestGraphJena.html (original)
+++ websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/jena/TestGraphJena.html Wed Oct 26 15:57:51 2016
@@ -33,7 +33,7 @@
 <a class="jxr_linenumber" name="L25" href="#L25">25</a>  
 <a class="jxr_linenumber" name="L26" href="#L26">26</a>      @Override
 <a class="jxr_linenumber" name="L27" href="#L27">27</a>      <strong class="jxr_keyword">public</strong> RDFTermFactory createFactory() {
-<a class="jxr_linenumber" name="L28" href="#L28">28</a>          <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> JenaRDFTermFactory() ;
+<a class="jxr_linenumber" name="L28" href="#L28">28</a>          <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> JenaFactory() ;
 <a class="jxr_linenumber" name="L29" href="#L29">29</a>      }
 <a class="jxr_linenumber" name="L30" href="#L30">30</a>  
 <a class="jxr_linenumber" name="L31" href="#L31">31</a>  }

Modified: websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.html
==============================================================================
--- websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.html (original)
+++ websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.html Wed Oct 26 15:57:51 2016
@@ -26,60 +26,121 @@
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">package</strong> org.apache.commons.rdf.jena;
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> java.io.IOException;
-<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> java.nio.file.Files;
-<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> java.nio.file.Path;
-<a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> java.nio.file.StandardCopyOption;
-<a class="jxr_linenumber" name="L25" href="#L25">25</a>  
-<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.api.Graph ;
-<a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.api.RDFTermFactory ;
-<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">import</strong> org.apache.jena.riot.Lang ;
-<a class="jxr_linenumber" name="L29" href="#L29">29</a>  <strong class="jxr_keyword">import</strong> org.apache.jena.riot.RDFDataMgr ;
-<a class="jxr_linenumber" name="L30" href="#L30">30</a>  <strong class="jxr_keyword">import</strong> org.apache.jena.sparql.graph.GraphFactory ;
-<a class="jxr_linenumber" name="L31" href="#L31">31</a>  <strong class="jxr_keyword">import</strong> org.junit.After;
-<a class="jxr_linenumber" name="L32" href="#L32">32</a>  <strong class="jxr_keyword">import</strong> org.junit.Before;
-<a class="jxr_linenumber" name="L33" href="#L33">33</a>  <strong class="jxr_keyword">import</strong> org.junit.Test;
-<a class="jxr_linenumber" name="L34" href="#L34">34</a>  
-<a class="jxr_linenumber" name="L35" href="#L35">35</a>  <em class="jxr_javadoccomment">/** Adapt a Jena Graph after parsing data into it */</em>
-<a class="jxr_linenumber" name="L36" href="#L36">36</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.html">TestJenaGraphToCommonsRDFGraph</a> {
-<a class="jxr_linenumber" name="L37" href="#L37">37</a>      <strong class="jxr_keyword">private</strong> Path turtleFile;
-<a class="jxr_linenumber" name="L38" href="#L38">38</a>  
-<a class="jxr_linenumber" name="L39" href="#L39">39</a>      
-<a class="jxr_linenumber" name="L40" href="#L40">40</a>      @Before
-<a class="jxr_linenumber" name="L41" href="#L41">41</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> preparePath() <strong class="jxr_keyword">throws</strong> IOException {    	
-<a class="jxr_linenumber" name="L42" href="#L42">42</a>      	turtleFile = Files.createTempFile(<span class="jxr_string">"commonsrdf"</span>, <span class="jxr_string">"test.ttl"</span>);    	
-<a class="jxr_linenumber" name="L43" href="#L43">43</a>      	Files.copy(getClass().getResourceAsStream(<span class="jxr_string">"/D.ttl"</span>), turtleFile, StandardCopyOption.REPLACE_EXISTING);
-<a class="jxr_linenumber" name="L44" href="#L44">44</a>      }
-<a class="jxr_linenumber" name="L45" href="#L45">45</a>      
-<a class="jxr_linenumber" name="L46" href="#L46">46</a>      @After
-<a class="jxr_linenumber" name="L47" href="#L47">47</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> deletePath() <strong class="jxr_keyword">throws</strong> IOException {
-<a class="jxr_linenumber" name="L48" href="#L48">48</a>      	<strong class="jxr_keyword">if</strong> (turtleFile != <strong class="jxr_keyword">null</strong>) { 
-<a class="jxr_linenumber" name="L49" href="#L49">49</a>      		Files.deleteIfExists(turtleFile);
-<a class="jxr_linenumber" name="L50" href="#L50">50</a>      	}
-<a class="jxr_linenumber" name="L51" href="#L51">51</a>      }
-<a class="jxr_linenumber" name="L52" href="#L52">52</a>      
-<a class="jxr_linenumber" name="L53" href="#L53">53</a>      @Test
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> jenaToCommonsRDF() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="L55" href="#L55">55</a>          org.apache.jena.graph.Graph jGraph = GraphFactory.createGraphMem() ;        
-<a class="jxr_linenumber" name="L56" href="#L56">56</a>          RDFDataMgr.read(jGraph, turtleFile.toUri().toString()) ;
-<a class="jxr_linenumber" name="L57" href="#L57">57</a>          
-<a class="jxr_linenumber" name="L58" href="#L58">58</a>          <em class="jxr_comment">// "graph" is a CommonsRDF graph </em>
-<a class="jxr_linenumber" name="L59" href="#L59">59</a>          Graph graph = <strong class="jxr_keyword">new</strong> JenaRDFTermFactory().fromJena(jGraph) ;
-<a class="jxr_linenumber" name="L60" href="#L60">60</a>          
-<a class="jxr_linenumber" name="L61" href="#L61">61</a>          <em class="jxr_comment">// Add to CommonsRDF Graph</em>
-<a class="jxr_linenumber" name="L62" href="#L62">62</a>          RDFTermFactory rft = <strong class="jxr_keyword">new</strong> JenaRDFTermFactory() ;
-<a class="jxr_linenumber" name="L63" href="#L63">63</a>          graph.add(rft.createIRI(<span class="jxr_string">"http://example/s2"</span>),
-<a class="jxr_linenumber" name="L64" href="#L64">64</a>                    rft.createIRI(<span class="jxr_string">"http://example/p2"</span>),
-<a class="jxr_linenumber" name="L65" href="#L65">65</a>                    rft.createLiteral(<span class="jxr_string">"foo"</span>)) ;
-<a class="jxr_linenumber" name="L66" href="#L66">66</a>          System.out.println(<span class="jxr_string">"==== Write CommonsRDF graph\n"</span>) ;
-<a class="jxr_linenumber" name="L67" href="#L67">67</a>          graph.stream().forEach(System.out::println) ;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.Assert.assertEquals;
+<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.Assert.assertFalse;
+<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.Assert.assertTrue;
+<a class="jxr_linenumber" name="L24" href="#L24">24</a>  
+<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> java.io.IOException;
+<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> java.nio.file.Files;
+<a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">import</strong> java.nio.file.Path;
+<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">import</strong> java.nio.file.StandardCopyOption;
+<a class="jxr_linenumber" name="L29" href="#L29">29</a>  
+<a class="jxr_linenumber" name="L30" href="#L30">30</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.api.BlankNode;
+<a class="jxr_linenumber" name="L31" href="#L31">31</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.api.BlankNodeOrIRI;
+<a class="jxr_linenumber" name="L32" href="#L32">32</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.api.Graph ;
+<a class="jxr_linenumber" name="L33" href="#L33">33</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.api.RDFTerm;
+<a class="jxr_linenumber" name="L34" href="#L34">34</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.api.Triple;
+<a class="jxr_linenumber" name="L35" href="#L35">35</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.simple.Types;
+<a class="jxr_linenumber" name="L36" href="#L36">36</a>  <strong class="jxr_keyword">import</strong> org.apache.jena.riot.Lang;
+<a class="jxr_linenumber" name="L37" href="#L37">37</a>  <strong class="jxr_keyword">import</strong> org.apache.jena.riot.RDFDataMgr ;
+<a class="jxr_linenumber" name="L38" href="#L38">38</a>  <strong class="jxr_keyword">import</strong> org.apache.jena.sparql.graph.GraphFactory ;
+<a class="jxr_linenumber" name="L39" href="#L39">39</a>  <strong class="jxr_keyword">import</strong> org.junit.After;
+<a class="jxr_linenumber" name="L40" href="#L40">40</a>  <strong class="jxr_keyword">import</strong> org.junit.Before;
+<a class="jxr_linenumber" name="L41" href="#L41">41</a>  <strong class="jxr_keyword">import</strong> org.junit.Test;
+<a class="jxr_linenumber" name="L42" href="#L42">42</a>  
+<a class="jxr_linenumber" name="L43" href="#L43">43</a>  <em class="jxr_javadoccomment">/** Adapt a Jena Graph after parsing data into it */</em>
+<a class="jxr_linenumber" name="L44" href="#L44">44</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.html">TestJenaGraphToCommonsRDFGraph</a> {
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> DEBUG = false;
+<a class="jxr_linenumber" name="L46" href="#L46">46</a>  	<strong class="jxr_keyword">private</strong> Path turtleFile;
+<a class="jxr_linenumber" name="L47" href="#L47">47</a>  
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>      
+<a class="jxr_linenumber" name="L49" href="#L49">49</a>      @Before
+<a class="jxr_linenumber" name="L50" href="#L50">50</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> preparePath() <strong class="jxr_keyword">throws</strong> IOException {    	
+<a class="jxr_linenumber" name="L51" href="#L51">51</a>      	turtleFile = Files.createTempFile(<span class="jxr_string">"commonsrdf"</span>, <span class="jxr_string">"test.ttl"</span>);    	
+<a class="jxr_linenumber" name="L52" href="#L52">52</a>      	Files.copy(getClass().getResourceAsStream(<span class="jxr_string">"/D.ttl"</span>), turtleFile, StandardCopyOption.REPLACE_EXISTING);
+<a class="jxr_linenumber" name="L53" href="#L53">53</a>      }
+<a class="jxr_linenumber" name="L54" href="#L54">54</a>      
+<a class="jxr_linenumber" name="L55" href="#L55">55</a>      @After
+<a class="jxr_linenumber" name="L56" href="#L56">56</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> deletePath() <strong class="jxr_keyword">throws</strong> IOException {
+<a class="jxr_linenumber" name="L57" href="#L57">57</a>      	<strong class="jxr_keyword">if</strong> (turtleFile != <strong class="jxr_keyword">null</strong>) { 
+<a class="jxr_linenumber" name="L58" href="#L58">58</a>      		Files.deleteIfExists(turtleFile);
+<a class="jxr_linenumber" name="L59" href="#L59">59</a>      	}
+<a class="jxr_linenumber" name="L60" href="#L60">60</a>      }
+<a class="jxr_linenumber" name="L61" href="#L61">61</a>      
+<a class="jxr_linenumber" name="L62" href="#L62">62</a>      @Test
+<a class="jxr_linenumber" name="L63" href="#L63">63</a>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> jenaToCommonsRDF() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="L64" href="#L64">64</a>          org.apache.jena.graph.Graph jGraph = GraphFactory.createGraphMem() ;        
+<a class="jxr_linenumber" name="L65" href="#L65">65</a>          RDFDataMgr.read(jGraph, turtleFile.toUri().toString()) ;
+<a class="jxr_linenumber" name="L66" href="#L66">66</a>          
+<a class="jxr_linenumber" name="L67" href="#L67">67</a>          JenaFactory factory = <strong class="jxr_keyword">new</strong> JenaFactory() ;
 <a class="jxr_linenumber" name="L68" href="#L68">68</a>          
-<a class="jxr_linenumber" name="L69" href="#L69">69</a>          System.out.println(<span class="jxr_string">"\n==== Write Jena graph directly\n"</span>) ;
-<a class="jxr_linenumber" name="L70" href="#L70">70</a>          <em class="jxr_comment">// And its in the Jena graph</em>
-<a class="jxr_linenumber" name="L71" href="#L71">71</a>          RDFDataMgr.write(System.out, jGraph, Lang.TTL) ;
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>      }
-<a class="jxr_linenumber" name="L73" href="#L73">73</a>  }
-<a class="jxr_linenumber" name="L74" href="#L74">74</a>  
+<a class="jxr_linenumber" name="L69" href="#L69">69</a>          <em class="jxr_comment">// "graph" is a CommonsRDF graph </em>
+<a class="jxr_linenumber" name="L70" href="#L70">70</a>          Graph graph = factory.asGraph(jGraph) ;
+<a class="jxr_linenumber" name="L71" href="#L71">71</a>          
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>          
+<a class="jxr_linenumber" name="L73" href="#L73">73</a>          
+<a class="jxr_linenumber" name="L74" href="#L74">74</a>          <em class="jxr_comment">// The below check expected statements from D.ttl</em>
+<a class="jxr_linenumber" name="L75" href="#L75">75</a>          
+<a class="jxr_linenumber" name="L76" href="#L76">76</a>          JenaIRI p = factory.createIRI(<span class="jxr_string">"http://example.com/p"</span>);
+<a class="jxr_linenumber" name="L77" href="#L77">77</a>  		JenaIRI s = factory.createIRI(<span class="jxr_string">"http://example.com/s"</span>);
+<a class="jxr_linenumber" name="L78" href="#L78">78</a>  		JenaLiteral literal123 = factory.createLiteral(<span class="jxr_string">"123"</span>, Types.XSD_INTEGER);
+<a class="jxr_linenumber" name="L79" href="#L79">79</a>  		assertTrue(graph.contains(s, p, literal123));
+<a class="jxr_linenumber" name="L80" href="#L80">80</a>          
+<a class="jxr_linenumber" name="L81" href="#L81">81</a>          JenaIRI p1 = factory.createIRI(<span class="jxr_string">"http://example.com/p1"</span>);
+<a class="jxr_linenumber" name="L82" href="#L82">82</a>          <em class="jxr_comment">// Let's look up the BlankNode</em>
+<a class="jxr_linenumber" name="L83" href="#L83">83</a>  		BlankNodeOrIRI bnode1 = graph.stream(<strong class="jxr_keyword">null</strong>, p1, <strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L84" href="#L84">84</a>          		.findFirst().map(Triple::getSubject).get();
+<a class="jxr_linenumber" name="L85" href="#L85">85</a>          assertTrue(bnode1 instanceof BlankNode);
+<a class="jxr_linenumber" name="L86" href="#L86">86</a>          
+<a class="jxr_linenumber" name="L87" href="#L87">87</a>          <em class="jxr_comment">// Verify we can use BlankNode in query again</em>
+<a class="jxr_linenumber" name="L88" href="#L88">88</a>          RDFTerm obj = graph.stream(bnode1, p1, <strong class="jxr_keyword">null</strong>).findFirst().map(Triple::getObject).get();
+<a class="jxr_linenumber" name="L89" href="#L89">89</a>          
+<a class="jxr_linenumber" name="L90" href="#L90">90</a>          <em class="jxr_comment">// Let's look up also that nested blank node</em>
+<a class="jxr_linenumber" name="L91" href="#L91">91</a>          assertTrue(obj instanceof BlankNode);
+<a class="jxr_linenumber" name="L92" href="#L92">92</a>          BlankNode bnode2 = (BlankNode)obj;
+<a class="jxr_linenumber" name="L93" href="#L93">93</a>          
+<a class="jxr_linenumber" name="L94" href="#L94">94</a>          
+<a class="jxr_linenumber" name="L95" href="#L95">95</a>          
+<a class="jxr_linenumber" name="L96" href="#L96">96</a>          JenaIRI q = factory.createIRI(<span class="jxr_string">"http://example.com/q"</span>);
+<a class="jxr_linenumber" name="L97" href="#L97">97</a>          JenaLiteral literalR = factory.createLiteral(<span class="jxr_string">"r"</span>, <span class="jxr_string">"en"</span>);
+<a class="jxr_linenumber" name="L98" href="#L98">98</a>  		assertTrue(graph.contains(bnode2, q, literalR));
+<a class="jxr_linenumber" name="L99" href="#L99">99</a>          
+<a class="jxr_linenumber" name="L100" href="#L100">100</a> 
+<a class="jxr_linenumber" name="L101" href="#L101">101</a> 		<em class="jxr_comment">// Can we add the same triple again as s/p/o </em>
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> 		<em class="jxr_comment">// without affecting graph size?</em>
+<a class="jxr_linenumber" name="L103" href="#L103">103</a> 		<em class="jxr_comment">// Just to be evil we add a blanknode-iri-blanknode statement</em>
+<a class="jxr_linenumber" name="L104" href="#L104">104</a>         assertEquals(3, graph.size());
+<a class="jxr_linenumber" name="L105" href="#L105">105</a> 		graph.add(bnode1, p1, bnode2);
+<a class="jxr_linenumber" name="L106" href="#L106">106</a> 		assertEquals(3, graph.size());
+<a class="jxr_linenumber" name="L107" href="#L107">107</a>         
+<a class="jxr_linenumber" name="L108" href="#L108">108</a> 		<em class="jxr_comment">// Add the same Triple again</em>
+<a class="jxr_linenumber" name="L109" href="#L109">109</a> 		graph.stream(bnode2,<strong class="jxr_keyword">null</strong>,<strong class="jxr_keyword">null</strong>).findFirst().ifPresent(graph::add);
+<a class="jxr_linenumber" name="L110" href="#L110">110</a> 		assertEquals(3, graph.size());
+<a class="jxr_linenumber" name="L111" href="#L111">111</a> 		
+<a class="jxr_linenumber" name="L112" href="#L112">112</a> 		
+<a class="jxr_linenumber" name="L113" href="#L113">113</a>         <em class="jxr_comment">// Add to CommonsRDF Graph</em>
+<a class="jxr_linenumber" name="L114" href="#L114">114</a>         JenaIRI s2 = factory.createIRI(<span class="jxr_string">"http://example/s2"</span>);
+<a class="jxr_linenumber" name="L115" href="#L115">115</a> 		JenaIRI p2 = factory.createIRI(<span class="jxr_string">"http://example/p2"</span>);
+<a class="jxr_linenumber" name="L116" href="#L116">116</a> 		JenaLiteral foo = factory.createLiteral(<span class="jxr_string">"foo"</span>);
+<a class="jxr_linenumber" name="L117" href="#L117">117</a> 		graph.add(s2,
+<a class="jxr_linenumber" name="L118" href="#L118">118</a>         		  p2,
+<a class="jxr_linenumber" name="L119" href="#L119">119</a>         		  foo) ;
+<a class="jxr_linenumber" name="L120" href="#L120">120</a> 		assertEquals(4, graph.size());
+<a class="jxr_linenumber" name="L121" href="#L121">121</a> 		assertTrue(graph.contains(s2,p2,foo));
+<a class="jxr_linenumber" name="L122" href="#L122">122</a>         
+<a class="jxr_linenumber" name="L123" href="#L123">123</a>         <em class="jxr_comment">// Verify the corresponding Jena Nodes are in Jena graph</em>
+<a class="jxr_linenumber" name="L124" href="#L124">124</a>         assertTrue(jGraph.contains(s2.asJenaNode(), p2.asJenaNode(), foo.asJenaNode()));
+<a class="jxr_linenumber" name="L125" href="#L125">125</a>         
+<a class="jxr_linenumber" name="L126" href="#L126">126</a>         <strong class="jxr_keyword">if</strong> (DEBUG) {
+<a class="jxr_linenumber" name="L127" href="#L127">127</a> 	        System.out.println(<span class="jxr_string">"==== Write CommonsRDF graph\n"</span>) ;
+<a class="jxr_linenumber" name="L128" href="#L128">128</a> 	        graph.stream().forEach(System.out::println) ;        
+<a class="jxr_linenumber" name="L129" href="#L129">129</a> 	        <em class="jxr_comment">// And its in the Jena graph</em>
+<a class="jxr_linenumber" name="L130" href="#L130">130</a> 	        System.out.println(<span class="jxr_string">"\n==== Write Jena graph directly\n"</span>) ;
+<a class="jxr_linenumber" name="L131" href="#L131">131</a> 	        RDFDataMgr.write(System.out, jGraph, Lang.TTL) ;
+<a class="jxr_linenumber" name="L132" href="#L132">132</a>         }
+<a class="jxr_linenumber" name="L133" href="#L133">133</a>     }
+<a class="jxr_linenumber" name="L134" href="#L134">134</a> }
+<a class="jxr_linenumber" name="L135" href="#L135">135</a> 
 </pre>
 <hr/>
 <div id="footer">Copyright &#169; 2015&#x2013;2016 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>

Modified: websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/jena/TestRDFParserBuilder.html
==============================================================================
--- websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/jena/TestRDFParserBuilder.html (original)
+++ websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/jena/TestRDFParserBuilder.html Wed Oct 26 15:57:51 2016
@@ -62,7 +62,7 @@
 <a class="jxr_linenumber" name="L54" href="#L54">54</a>  
 <a class="jxr_linenumber" name="L55" href="#L55">55</a>  	@Test
 <a class="jxr_linenumber" name="L56" href="#L56">56</a>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> parseTurtle() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="L57" href="#L57">57</a>  		Graph g = <strong class="jxr_keyword">new</strong> JenaRDFTermFactory().createGraph();
+<a class="jxr_linenumber" name="L57" href="#L57">57</a>  		Graph g = <strong class="jxr_keyword">new</strong> JenaFactory().createGraph();
 <a class="jxr_linenumber" name="L58" href="#L58">58</a>  		Future&lt;ParseResult&gt; gFuture = <strong class="jxr_keyword">new</strong> JenaRDFParser().contentType(RDFSyntax.TURTLE).source(turtleFile)
 <a class="jxr_linenumber" name="L59" href="#L59">59</a>  				.target(g).parse();
 <a class="jxr_linenumber" name="L60" href="#L60">60</a>  		gFuture.get(5, TimeUnit.SECONDS);

Modified: websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/jena/TestRDFTermFactoryJena.html
==============================================================================
--- websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/jena/TestRDFTermFactoryJena.html (original)
+++ websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/jena/TestRDFTermFactoryJena.html Wed Oct 26 15:57:51 2016
@@ -33,7 +33,7 @@
 <a class="jxr_linenumber" name="L25" href="#L25">25</a>  	
 <a class="jxr_linenumber" name="L26" href="#L26">26</a>      @Override
 <a class="jxr_linenumber" name="L27" href="#L27">27</a>      <strong class="jxr_keyword">public</strong> RDFTermFactory createFactory() {
-<a class="jxr_linenumber" name="L28" href="#L28">28</a>          <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> JenaRDFTermFactory() ;
+<a class="jxr_linenumber" name="L28" href="#L28">28</a>          <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> JenaFactory() ;
 <a class="jxr_linenumber" name="L29" href="#L29">29</a>      }
 <a class="jxr_linenumber" name="L30" href="#L30">30</a>  
 <a class="jxr_linenumber" name="L31" href="#L31">31</a>  }

Modified: websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.html
==============================================================================
--- websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.html (original)
+++ websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.html Wed Oct 26 15:57:51 2016
@@ -6,30 +6,47 @@
 </head>
 <body>
 <div id="overview"><a href="../../../../../../testapidocs/org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.html">View Javadoc</a></div><pre>
-<a class="jxr_linenumber" name="L1" href="#L1">1</a>   <strong class="jxr_keyword">package</strong> org.apache.commons.rdf.jsonldjava;
-<a class="jxr_linenumber" name="L2" href="#L2">2</a>   
-<a class="jxr_linenumber" name="L3" href="#L3">3</a>   <strong class="jxr_keyword">import</strong> java.util.UUID;
-<a class="jxr_linenumber" name="L4" href="#L4">4</a>   
-<a class="jxr_linenumber" name="L5" href="#L5">5</a>   <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.api.AbstractBlankNodeTest;
-<a class="jxr_linenumber" name="L6" href="#L6">6</a>   <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.api.BlankNode;
-<a class="jxr_linenumber" name="L7" href="#L7">7</a>   
-<a class="jxr_linenumber" name="L8" href="#L8">8</a>   <strong class="jxr_keyword">import</strong> com.github.jsonldjava.core.RDFDataset;
-<a class="jxr_linenumber" name="L9" href="#L9">9</a>   
-<a class="jxr_linenumber" name="L10" href="#L10">10</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.html">JsonLdBlankNodeTest</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../../org/apache/commons/rdf/api/AbstractBlankNodeTest.html">AbstractBlankNodeTest</a> {
-<a class="jxr_linenumber" name="L11" href="#L11">11</a>  
-<a class="jxr_linenumber" name="L12" href="#L12">12</a>  	String fixedPrefix = <span class="jxr_string">"urn:uuid:d028ca89-8b2f-4e18-90a0-8959f955038d#"</span>;
-<a class="jxr_linenumber" name="L13" href="#L13">13</a>  	
-<a class="jxr_linenumber" name="L14" href="#L14">14</a>  	@Override
-<a class="jxr_linenumber" name="L15" href="#L15">15</a>  	<strong class="jxr_keyword">protected</strong> BlankNode getBlankNode() {
-<a class="jxr_linenumber" name="L16" href="#L16">16</a>  		<strong class="jxr_keyword">return</strong> getBlankNode(UUID.randomUUID().toString());
-<a class="jxr_linenumber" name="L17" href="#L17">17</a>  	}
-<a class="jxr_linenumber" name="L18" href="#L18">18</a>  
-<a class="jxr_linenumber" name="L19" href="#L19">19</a>  	@Override
-<a class="jxr_linenumber" name="L20" href="#L20">20</a>  	<strong class="jxr_keyword">protected</strong> BlankNode getBlankNode(String identifier) {
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> JsonLdBlankNodeImpl(<strong class="jxr_keyword">new</strong> RDFDataset.BlankNode(<span class="jxr_string">"_:"</span> + identifier), fixedPrefix);
-<a class="jxr_linenumber" name="L22" href="#L22">22</a>  	}
-<a class="jxr_linenumber" name="L23" href="#L23">23</a>  
-<a class="jxr_linenumber" name="L24" href="#L24">24</a>  }
+<a class="jxr_linenumber" name="L1" href="#L1">1</a>   <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L2" href="#L2">2</a>   <em class="jxr_javadoccomment"> * Licensed to the Apache Software Foundation (ASF) under one</em>
+<a class="jxr_linenumber" name="L3" href="#L3">3</a>   <em class="jxr_javadoccomment"> * or more contributor license agreements. See the NOTICE file</em>
+<a class="jxr_linenumber" name="L4" href="#L4">4</a>   <em class="jxr_javadoccomment"> * distributed with this work for additional information</em>
+<a class="jxr_linenumber" name="L5" href="#L5">5</a>   <em class="jxr_javadoccomment"> * regarding copyright ownership. The ASF licenses this file</em>
+<a class="jxr_linenumber" name="L6" href="#L6">6</a>   <em class="jxr_javadoccomment"> * to you under the Apache License, Version 2.0 (the</em>
+<a class="jxr_linenumber" name="L7" href="#L7">7</a>   <em class="jxr_javadoccomment"> * "License"); you may not use this file except in compliance</em>
+<a class="jxr_linenumber" name="L8" href="#L8">8</a>   <em class="jxr_javadoccomment"> * with the License.  You may obtain a copy of the License at</em>
+<a class="jxr_linenumber" name="L9" href="#L9">9</a>   <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L10" href="#L10">10</a>  <em class="jxr_javadoccomment"> *     <a href="http://www.apache.org/licenses/LICENSE-2." target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.</a>0</em>
+<a class="jxr_linenumber" name="L11" href="#L11">11</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L12" href="#L12">12</a>  <em class="jxr_javadoccomment"> * Unless required by applicable law or agreed to in writing, software</em>
+<a class="jxr_linenumber" name="L13" href="#L13">13</a>  <em class="jxr_javadoccomment"> * distributed under the License is distributed on an "AS IS" BASIS,</em>
+<a class="jxr_linenumber" name="L14" href="#L14">14</a>  <em class="jxr_javadoccomment"> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.</em>
+<a class="jxr_linenumber" name="L15" href="#L15">15</a>  <em class="jxr_javadoccomment"> * See the License for the specific language governing permissions and</em>
+<a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_javadoccomment"> * limitations under the License.</em>
+<a class="jxr_linenumber" name="L17" href="#L17">17</a>  <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L18" href="#L18">18</a>  <strong class="jxr_keyword">package</strong> org.apache.commons.rdf.jsonldjava;
+<a class="jxr_linenumber" name="L19" href="#L19">19</a>  
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> java.util.UUID;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  
+<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.api.AbstractBlankNodeTest;
+<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.api.BlankNode;
+<a class="jxr_linenumber" name="L24" href="#L24">24</a>  
+<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> com.github.jsonldjava.core.RDFDataset;
+<a class="jxr_linenumber" name="L26" href="#L26">26</a>  
+<a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.html">JsonLdBlankNodeTest</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../../org/apache/commons/rdf/api/AbstractBlankNodeTest.html">AbstractBlankNodeTest</a> {
+<a class="jxr_linenumber" name="L28" href="#L28">28</a>  
+<a class="jxr_linenumber" name="L29" href="#L29">29</a>  	String fixedPrefix = <span class="jxr_string">"urn:uuid:d028ca89-8b2f-4e18-90a0-8959f955038d#"</span>;
+<a class="jxr_linenumber" name="L30" href="#L30">30</a>  	
+<a class="jxr_linenumber" name="L31" href="#L31">31</a>  	@Override
+<a class="jxr_linenumber" name="L32" href="#L32">32</a>  	<strong class="jxr_keyword">protected</strong> BlankNode getBlankNode() {
+<a class="jxr_linenumber" name="L33" href="#L33">33</a>  		<strong class="jxr_keyword">return</strong> getBlankNode(UUID.randomUUID().toString());
+<a class="jxr_linenumber" name="L34" href="#L34">34</a>  	}
+<a class="jxr_linenumber" name="L35" href="#L35">35</a>  
+<a class="jxr_linenumber" name="L36" href="#L36">36</a>  	@Override
+<a class="jxr_linenumber" name="L37" href="#L37">37</a>  	<strong class="jxr_keyword">protected</strong> BlankNode getBlankNode(String identifier) {
+<a class="jxr_linenumber" name="L38" href="#L38">38</a>  		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> JsonLdBlankNodeImpl(<strong class="jxr_keyword">new</strong> RDFDataset.BlankNode(<span class="jxr_string">"_:"</span> + identifier), fixedPrefix);
+<a class="jxr_linenumber" name="L39" href="#L39">39</a>  	}
+<a class="jxr_linenumber" name="L40" href="#L40">40</a>  
+<a class="jxr_linenumber" name="L41" href="#L41">41</a>  }
 </pre>
 <hr/>
 <div id="footer">Copyright &#169; 2015&#x2013;2016 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>

Added: websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/jsonldjava/JsonLdFactoryTest.html
==============================================================================
--- websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/jsonldjava/JsonLdFactoryTest.html (added)
+++ websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/jsonldjava/JsonLdFactoryTest.html Wed Oct 26 15:57:51 2016
@@ -0,0 +1,67 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head><meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+<title>JsonLdFactoryTest xref</title>
+<link type="text/css" rel="stylesheet" href="../../../../../stylesheet.css" />
+</head>
+<body>
+<div id="overview"><a href="../../../../../../testapidocs/org/apache/commons/rdf/jsonldjava/JsonLdFactoryTest.html">View Javadoc</a></div><pre>
+<a class="jxr_linenumber" name="L1" href="#L1">1</a>   <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L2" href="#L2">2</a>   <em class="jxr_javadoccomment"> * Licensed to the Apache Software Foundation (ASF) under one</em>
+<a class="jxr_linenumber" name="L3" href="#L3">3</a>   <em class="jxr_javadoccomment"> * or more contributor license agreements. See the NOTICE file</em>
+<a class="jxr_linenumber" name="L4" href="#L4">4</a>   <em class="jxr_javadoccomment"> * distributed with this work for additional information</em>
+<a class="jxr_linenumber" name="L5" href="#L5">5</a>   <em class="jxr_javadoccomment"> * regarding copyright ownership. The ASF licenses this file</em>
+<a class="jxr_linenumber" name="L6" href="#L6">6</a>   <em class="jxr_javadoccomment"> * to you under the Apache License, Version 2.0 (the</em>
+<a class="jxr_linenumber" name="L7" href="#L7">7</a>   <em class="jxr_javadoccomment"> * "License"); you may not use this file except in compliance</em>
+<a class="jxr_linenumber" name="L8" href="#L8">8</a>   <em class="jxr_javadoccomment"> * with the License.  You may obtain a copy of the License at</em>
+<a class="jxr_linenumber" name="L9" href="#L9">9</a>   <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L10" href="#L10">10</a>  <em class="jxr_javadoccomment"> *     <a href="http://www.apache.org/licenses/LICENSE-2." target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.</a>0</em>
+<a class="jxr_linenumber" name="L11" href="#L11">11</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L12" href="#L12">12</a>  <em class="jxr_javadoccomment"> * Unless required by applicable law or agreed to in writing, software</em>
+<a class="jxr_linenumber" name="L13" href="#L13">13</a>  <em class="jxr_javadoccomment"> * distributed under the License is distributed on an "AS IS" BASIS,</em>
+<a class="jxr_linenumber" name="L14" href="#L14">14</a>  <em class="jxr_javadoccomment"> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.</em>
+<a class="jxr_linenumber" name="L15" href="#L15">15</a>  <em class="jxr_javadoccomment"> * See the License for the specific language governing permissions and</em>
+<a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_javadoccomment"> * limitations under the License.</em>
+<a class="jxr_linenumber" name="L17" href="#L17">17</a>  <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L18" href="#L18">18</a>  <strong class="jxr_keyword">package</strong> org.apache.commons.rdf.jsonldjava;
+<a class="jxr_linenumber" name="L19" href="#L19">19</a>  
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.api.AbstractRDFTermFactoryTest;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.rdf.api.RDFTermFactory;
+<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> org.junit.Ignore;
+<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> org.junit.Test;
+<a class="jxr_linenumber" name="L24" href="#L24">24</a>  
+<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/rdf/jsonldjava/JsonLdFactoryTest.html">JsonLdFactoryTest</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../../org/apache/commons/rdf/api/AbstractRDFTermFactoryTest.html">AbstractRDFTermFactoryTest</a> {
+<a class="jxr_linenumber" name="L26" href="#L26">26</a>  
+<a class="jxr_linenumber" name="L27" href="#L27">27</a>  	@Override
+<a class="jxr_linenumber" name="L28" href="#L28">28</a>  	<strong class="jxr_keyword">public</strong> RDFTermFactory createFactory() {
+<a class="jxr_linenumber" name="L29" href="#L29">29</a>  		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> JsonLdFactory();
+<a class="jxr_linenumber" name="L30" href="#L30">30</a>  	}
+<a class="jxr_linenumber" name="L31" href="#L31">31</a>  	
+<a class="jxr_linenumber" name="L32" href="#L32">32</a>  	<em class="jxr_comment">// TODO: Add support for checking for invalid lang/iri/blanknode IDs</em>
+<a class="jxr_linenumber" name="L33" href="#L33">33</a>  	
+<a class="jxr_linenumber" name="L34" href="#L34">34</a>  	@Ignore
+<a class="jxr_linenumber" name="L35" href="#L35">35</a>  	@Test
+<a class="jxr_linenumber" name="L36" href="#L36">36</a>  	@Override
+<a class="jxr_linenumber" name="L37" href="#L37">37</a>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testInvalidLiteralLang() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="L38" href="#L38">38</a>  		<strong class="jxr_keyword">super</strong>.testInvalidLiteralLang();
+<a class="jxr_linenumber" name="L39" href="#L39">39</a>  	}
+<a class="jxr_linenumber" name="L40" href="#L40">40</a>  	
+<a class="jxr_linenumber" name="L41" href="#L41">41</a>  	@Ignore
+<a class="jxr_linenumber" name="L42" href="#L42">42</a>  	@Test
+<a class="jxr_linenumber" name="L43" href="#L43">43</a>  	@Override
+<a class="jxr_linenumber" name="L44" href="#L44">44</a>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testInvalidIRI() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>  		<strong class="jxr_keyword">super</strong>.testInvalidIRI();
+<a class="jxr_linenumber" name="L46" href="#L46">46</a>  	}
+<a class="jxr_linenumber" name="L47" href="#L47">47</a>  	
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>  	@Ignore
+<a class="jxr_linenumber" name="L49" href="#L49">49</a>  	@Test
+<a class="jxr_linenumber" name="L50" href="#L50">50</a>  	@Override
+<a class="jxr_linenumber" name="L51" href="#L51">51</a>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testPossiblyInvalidBlankNode() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="L52" href="#L52">52</a>  		<strong class="jxr_keyword">super</strong>.testPossiblyInvalidBlankNode();
+<a class="jxr_linenumber" name="L53" href="#L53">53</a>  	}
+<a class="jxr_linenumber" name="L54" href="#L54">54</a>  }
+</pre>
+<hr/>
+<div id="footer">Copyright &#169; 2015&#x2013;2016 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>
+</body>
+</html>
\ No newline at end of file

Modified: websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/jsonldjava/JsonLdGraphTest.html
==============================================================================
--- websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/jsonldjava/JsonLdGraphTest.html (original)
+++ websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/jsonldjava/JsonLdGraphTest.html Wed Oct 26 15:57:51 2016
@@ -32,7 +32,7 @@
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
 <a class="jxr_linenumber" name="L25" href="#L25">25</a>  	@Override
 <a class="jxr_linenumber" name="L26" href="#L26">26</a>  	<strong class="jxr_keyword">public</strong> RDFTermFactory createFactory() {
-<a class="jxr_linenumber" name="L27" href="#L27">27</a>  		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> JsonLdRDFTermFactory();
+<a class="jxr_linenumber" name="L27" href="#L27">27</a>  		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> JsonLdFactory();
 <a class="jxr_linenumber" name="L28" href="#L28">28</a>  	}
 <a class="jxr_linenumber" name="L29" href="#L29">29</a>  	
 <a class="jxr_linenumber" name="L30" href="#L30">30</a>  

Modified: websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilderTest.html
==============================================================================
--- websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilderTest.html (original)
+++ websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilderTest.html Wed Oct 26 15:57:51 2016
@@ -47,7 +47,7 @@
 <a class="jxr_linenumber" name="L39" href="#L39">39</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/rdf/jsonldjava/JsonLdParserBuilderTest.html">JsonLdParserBuilderTest</a> {	
 <a class="jxr_linenumber" name="L40" href="#L40">40</a>  	<strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String TEST_JSONLD = <span class="jxr_string">"/test.jsonld"</span>;
 <a class="jxr_linenumber" name="L41" href="#L41">41</a>  	
-<a class="jxr_linenumber" name="L42" href="#L42">42</a>  	<strong class="jxr_keyword">static</strong> JsonLdRDFTermFactory factory = <strong class="jxr_keyword">new</strong> JsonLdRDFTermFactory();
+<a class="jxr_linenumber" name="L42" href="#L42">42</a>  	<strong class="jxr_keyword">static</strong> JsonLdFactory factory = <strong class="jxr_keyword">new</strong> JsonLdFactory();
 <a class="jxr_linenumber" name="L43" href="#L43">43</a>  	IRI test = factory.createIRI(<span class="jxr_string">"http://example.com/test"</span>);
 <a class="jxr_linenumber" name="L44" href="#L44">44</a>  	IRI Type = factory.createIRI(<span class="jxr_string">"http://example.com/Type"</span>);
 <a class="jxr_linenumber" name="L45" href="#L45">45</a>  	IRI type = factory.createIRI(<span class="jxr_string">"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"</span>);

Modified: websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/jsonldjava/package-frame.html
==============================================================================
--- websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/jsonldjava/package-frame.html (original)
+++ websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/jsonldjava/package-frame.html Wed Oct 26 15:57:51 2016
@@ -19,13 +19,13 @@
             	<a href="JsonLdBlankNodeTest.html" target="classFrame">JsonLdBlankNodeTest</a>
           	</li>
           	          	<li>
-            	<a href="JsonLdGraphTest.html" target="classFrame">JsonLdGraphTest</a>
+            	<a href="JsonLdFactoryTest.html" target="classFrame">JsonLdFactoryTest</a>
           	</li>
           	          	<li>
-            	<a href="JsonLdParserBuilderTest.html" target="classFrame">JsonLdParserBuilderTest</a>
+            	<a href="JsonLdGraphTest.html" target="classFrame">JsonLdGraphTest</a>
           	</li>
           	          	<li>
-            	<a href="JsonLdRDFTermFactoryTest.html" target="classFrame">JsonLdRDFTermFactoryTest</a>
+            	<a href="JsonLdParserBuilderTest.html" target="classFrame">JsonLdParserBuilderTest</a>
           	</li>
           	      	</ul>
 

Modified: websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/jsonldjava/package-summary.html
==============================================================================
--- websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/jsonldjava/package-summary.html (original)
+++ websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/jsonldjava/package-summary.html Wed Oct 26 15:57:51 2016
@@ -42,17 +42,17 @@
             	</tr>
 				            	<tr>
               		<td>
-                		<a href="JsonLdGraphTest.html" target="classFrame">JsonLdGraphTest</a>
+                		<a href="JsonLdFactoryTest.html" target="classFrame">JsonLdFactoryTest</a>
               		</td>
             	</tr>
 				            	<tr>
               		<td>
-                		<a href="JsonLdParserBuilderTest.html" target="classFrame">JsonLdParserBuilderTest</a>
+                		<a href="JsonLdGraphTest.html" target="classFrame">JsonLdGraphTest</a>
               		</td>
             	</tr>
 				            	<tr>
               		<td>
-                		<a href="JsonLdRDFTermFactoryTest.html" target="classFrame">JsonLdRDFTermFactoryTest</a>
+                		<a href="JsonLdParserBuilderTest.html" target="classFrame">JsonLdParserBuilderTest</a>
               		</td>
             	</tr>
 				        	</tbody>

Modified: websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/rdf4j/BlankNodeTest.html
==============================================================================
--- websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/rdf4j/BlankNodeTest.html (original)
+++ websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/rdf4j/BlankNodeTest.html Wed Oct 26 15:57:51 2016
@@ -30,7 +30,7 @@
 <a class="jxr_linenumber" name="L22" href="#L22">22</a>  
 <a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/rdf/rdf4j/BlankNodeTest.html">BlankNodeTest</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../../org/apache/commons/rdf/api/AbstractBlankNodeTest.html">AbstractBlankNodeTest</a> {
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
-<a class="jxr_linenumber" name="L25" href="#L25">25</a>  	RDF4JTermFactory factory = <strong class="jxr_keyword">new</strong> RDF4JTermFactory();
+<a class="jxr_linenumber" name="L25" href="#L25">25</a>  	RDF4JFactory factory = <strong class="jxr_keyword">new</strong> RDF4JFactory();
 <a class="jxr_linenumber" name="L26" href="#L26">26</a>  	
 <a class="jxr_linenumber" name="L27" href="#L27">27</a>  	@Override
 <a class="jxr_linenumber" name="L28" href="#L28">28</a>  	<strong class="jxr_keyword">protected</strong> BlankNode getBlankNode() {

Modified: websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/rdf4j/GraphTest.html
==============================================================================
--- websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/rdf4j/GraphTest.html (original)
+++ websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/rdf4j/GraphTest.html Wed Oct 26 15:57:51 2016
@@ -32,7 +32,7 @@
 <a class="jxr_linenumber" name="L24" href="#L24">24</a>  
 <a class="jxr_linenumber" name="L25" href="#L25">25</a>  	@Override
 <a class="jxr_linenumber" name="L26" href="#L26">26</a>  	<strong class="jxr_keyword">public</strong> RDFTermFactory createFactory() {
-<a class="jxr_linenumber" name="L27" href="#L27">27</a>  		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> RDF4JTermFactory();
+<a class="jxr_linenumber" name="L27" href="#L27">27</a>  		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> RDF4JFactory();
 <a class="jxr_linenumber" name="L28" href="#L28">28</a>  	}
 <a class="jxr_linenumber" name="L29" href="#L29">29</a>  
 <a class="jxr_linenumber" name="L30" href="#L30">30</a>  }

Modified: websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/rdf4j/MemoryGraphTest.html
==============================================================================
--- websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/rdf4j/MemoryGraphTest.html (original)
+++ websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/rdf4j/MemoryGraphTest.html Wed Oct 26 15:57:51 2016
@@ -43,7 +43,7 @@
 <a class="jxr_linenumber" name="L35" href="#L35">35</a>  
 <a class="jxr_linenumber" name="L36" href="#L36">36</a>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/rdf/rdf4j/MemoryGraphTest.html">MemoryStoreFactory</a> <strong class="jxr_keyword">implements</strong> RDFTermFactory {
 <a class="jxr_linenumber" name="L37" href="#L37">37</a>  
-<a class="jxr_linenumber" name="L38" href="#L38">38</a>  		RDF4JTermFactory rdf4jFactory = <strong class="jxr_keyword">new</strong> RDF4JTermFactory(<strong class="jxr_keyword">new</strong> MemValueFactory());
+<a class="jxr_linenumber" name="L38" href="#L38">38</a>  		RDF4JFactory rdf4jFactory = <strong class="jxr_keyword">new</strong> RDF4JFactory(<strong class="jxr_keyword">new</strong> MemValueFactory());
 <a class="jxr_linenumber" name="L39" href="#L39">39</a>  
 <a class="jxr_linenumber" name="L40" href="#L40">40</a>  		<strong class="jxr_keyword">public</strong> RDF4JBlankNode createBlankNode() {
 <a class="jxr_linenumber" name="L41" href="#L41">41</a>  			<strong class="jxr_keyword">return</strong> rdf4jFactory.createBlankNode();
@@ -85,7 +85,7 @@
 <a class="jxr_linenumber" name="L77" href="#L77">77</a>  			Sail sail = <strong class="jxr_keyword">new</strong> MemoryStore();
 <a class="jxr_linenumber" name="L78" href="#L78">78</a>  			Repository repository = <strong class="jxr_keyword">new</strong> SailRepository(sail);
 <a class="jxr_linenumber" name="L79" href="#L79">79</a>  			repository.initialize();
-<a class="jxr_linenumber" name="L80" href="#L80">80</a>  			<strong class="jxr_keyword">return</strong> rdf4jFactory.asRDFTermGraph(repository);
+<a class="jxr_linenumber" name="L80" href="#L80">80</a>  			<strong class="jxr_keyword">return</strong> rdf4jFactory.asGraph(repository);
 <a class="jxr_linenumber" name="L81" href="#L81">81</a>  		}
 <a class="jxr_linenumber" name="L82" href="#L82">82</a>  	}
 <a class="jxr_linenumber" name="L83" href="#L83">83</a>  

Modified: websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/rdf4j/NativeStoreGraphTest.html
==============================================================================
--- websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/rdf4j/NativeStoreGraphTest.html (original)
+++ websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/rdf4j/NativeStoreGraphTest.html Wed Oct 26 15:57:51 2016
@@ -59,13 +59,13 @@
 <a class="jxr_linenumber" name="L51" href="#L51">51</a>  
 <a class="jxr_linenumber" name="L52" href="#L52">52</a>  	<strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/commons/rdf/rdf4j/NativeStoreGraphTest.html">NativeStoreFactory</a> <strong class="jxr_keyword">implements</strong> RDFTermFactory {
 <a class="jxr_linenumber" name="L53" href="#L53">53</a>  
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>  		RDF4JTermFactory rdf4jFactory = <strong class="jxr_keyword">new</strong> RDF4JTermFactory(getRepository().getValueFactory());
+<a class="jxr_linenumber" name="L54" href="#L54">54</a>  		RDF4JFactory rdf4jFactory = <strong class="jxr_keyword">new</strong> RDF4JFactory(getRepository().getValueFactory());
 <a class="jxr_linenumber" name="L55" href="#L55">55</a>  
 <a class="jxr_linenumber" name="L56" href="#L56">56</a>  		@Override
 <a class="jxr_linenumber" name="L57" href="#L57">57</a>  		<strong class="jxr_keyword">public</strong> RDF4JGraph createGraph() {
 <a class="jxr_linenumber" name="L58" href="#L58">58</a>  			<em class="jxr_comment">// We re-use the repository connection, but use a different context every time</em>
 <a class="jxr_linenumber" name="L59" href="#L59">59</a>  			Set&lt;RDF4JBlankNode&gt; context = Collections.singleton(rdf4jFactory.createBlankNode());
-<a class="jxr_linenumber" name="L60" href="#L60">60</a>  			<strong class="jxr_keyword">return</strong> rdf4jFactory.asRDFTermGraph(getRepository(), context);
+<a class="jxr_linenumber" name="L60" href="#L60">60</a>  			<strong class="jxr_keyword">return</strong> rdf4jFactory.asGraph(getRepository(), context);
 <a class="jxr_linenumber" name="L61" href="#L61">61</a>  		}
 <a class="jxr_linenumber" name="L62" href="#L62">62</a>  
 <a class="jxr_linenumber" name="L63" href="#L63">63</a>  		<em class="jxr_comment">// Delegate methods </em>

Modified: websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/rdf4j/Rdf4JRDFTermFactoryTest.html
==============================================================================
--- websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/rdf4j/Rdf4JRDFTermFactoryTest.html (original)
+++ websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/rdf4j/Rdf4JRDFTermFactoryTest.html Wed Oct 26 15:57:51 2016
@@ -33,7 +33,7 @@
 <a class="jxr_linenumber" name="L25" href="#L25">25</a>  
 <a class="jxr_linenumber" name="L26" href="#L26">26</a>  	@Override
 <a class="jxr_linenumber" name="L27" href="#L27">27</a>  	<strong class="jxr_keyword">public</strong> RDFTermFactory createFactory() {
-<a class="jxr_linenumber" name="L28" href="#L28">28</a>  		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> RDF4JTermFactory();
+<a class="jxr_linenumber" name="L28" href="#L28">28</a>  		<strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> RDF4JFactory();
 <a class="jxr_linenumber" name="L29" href="#L29">29</a>  	}
 <a class="jxr_linenumber" name="L30" href="#L30">30</a>  	
 <a class="jxr_linenumber" name="L31" href="#L31">31</a>  	@Override

Modified: websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/simple/SimpleGraphTest.html
==============================================================================
--- websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/simple/SimpleGraphTest.html (original)
+++ websites/production/commonsrdf/content/xref-test/org/apache/commons/rdf/simple/SimpleGraphTest.html Wed Oct 26 15:57:51 2016
@@ -45,7 +45,7 @@
 <a class="jxr_linenumber" name="L37" href="#L37">37</a>      @Test
 <a class="jxr_linenumber" name="L38" href="#L38">38</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> graphToString() {
 <a class="jxr_linenumber" name="L39" href="#L39">39</a>          Assume.assumeNotNull(aliceName, companyName);
-<a class="jxr_linenumber" name="L40" href="#L40">40</a>          System.out.println(graph);
+<a class="jxr_linenumber" name="L40" href="#L40">40</a>          <em class="jxr_comment">//System.out.println(graph);</em>
 <a class="jxr_linenumber" name="L41" href="#L41">41</a>          assertTrue(graph
 <a class="jxr_linenumber" name="L42" href="#L42">42</a>                  .toString()
 <a class="jxr_linenumber" name="L43" href="#L43">43</a>                  .contains(

Modified: websites/production/commonsrdf/content/xref-test/overview-frame.html
==============================================================================
--- websites/production/commonsrdf/content/xref-test/overview-frame.html (original)
+++ websites/production/commonsrdf/content/xref-test/overview-frame.html Wed Oct 26 15:57:51 2016
@@ -19,6 +19,9 @@
 				<a href="org/apache/commons/rdf/api/package-frame.html" target="packageFrame">org.apache.commons.rdf.api</a>
 			</li>
 						<li>
+				<a href="org/apache/commons/rdf/integrationtests/package-frame.html" target="packageFrame">org.apache.commons.rdf.integrationtests</a>
+			</li>
+						<li>
 				<a href="org/apache/commons/rdf/jena/package-frame.html" target="packageFrame">org.apache.commons.rdf.jena</a>
 			</li>
 						<li>

Modified: websites/production/commonsrdf/content/xref-test/overview-summary.html
==============================================================================
--- websites/production/commonsrdf/content/xref-test/overview-summary.html (original)
+++ websites/production/commonsrdf/content/xref-test/overview-summary.html Wed Oct 26 15:57:51 2016
@@ -40,6 +40,11 @@
             	</tr>
 	          	            	<tr>
               		<td>
+                		<a href="org/apache/commons/rdf/integrationtests/package-summary.html">org.apache.commons.rdf.integrationtests</a>
+              		</td>
+            	</tr>
+	          	            	<tr>
+              		<td>
                 		<a href="org/apache/commons/rdf/jena/package-summary.html">org.apache.commons.rdf.jena</a>
               		</td>
             	</tr>

Modified: websites/production/commonsrdf/content/xref/allclasses-frame.html
==============================================================================
--- websites/production/commonsrdf/content/xref/allclasses-frame.html (original)
+++ websites/production/commonsrdf/content/xref/allclasses-frame.html Wed Oct 26 15:57:51 2016
@@ -99,6 +99,9 @@
 				<a href="org/apache/commons/rdf/jena/impl/JenaDatasetImpl.html" target="classFrame">JenaDatasetImpl</a>
 			</li>
 						<li>
+				<a href="org/apache/commons/rdf/jena/JenaFactory.html" target="classFrame">JenaFactory</a>
+			</li>
+						<li>
 				<a href="org/apache/commons/rdf/jena/JenaGeneralizedQuadLike.html" target="classFrame">JenaGeneralizedQuadLike</a>
 			</li>
 						<li>
@@ -144,9 +147,6 @@
 				<a href="org/apache/commons/rdf/jena/JenaRDFTerm.html" target="classFrame">JenaRDFTerm</a>
 			</li>
 						<li>
-				<a href="org/apache/commons/rdf/jena/JenaRDFTermFactory.html" target="classFrame">JenaRDFTermFactory</a>
-			</li>
-						<li>
 				<a href="org/apache/commons/rdf/jena/JenaTriple.html" target="classFrame">JenaTriple</a>
 			</li>
 						<li>
@@ -168,6 +168,9 @@
 				<a href="org/apache/commons/rdf/jsonldjava/JsonLdDataset.html" target="classFrame">JsonLdDatasetImpl</a>
 			</li>
 						<li>
+				<a href="org/apache/commons/rdf/jsonldjava/JsonLdFactory.html" target="classFrame">JsonLdFactory</a>
+			</li>
+						<li>
 				<a href="org/apache/commons/rdf/jsonldjava/JsonLdGraph.html" target="classFrame">JsonLdGraph</a>
 			</li>
 						<li>
@@ -204,9 +207,6 @@
 				<a href="org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.html" target="classFrame">JsonLdQuadLikeImpl</a>
 			</li>
 						<li>
-				<a href="org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.html" target="classFrame">JsonLdRDFTermFactory</a>
-			</li>
-						<li>
 				<a href="org/apache/commons/rdf/jsonldjava/JsonLdTerm.html" target="classFrame">JsonLdTerm</a>
 			</li>
 						<li>
@@ -237,7 +237,7 @@
 				<a href="org/apache/commons/rdf/rdf4j/impl/ModelGraphImpl.html" target="classFrame">ModelGraphImpl</a>
 			</li>
 						<li>
-				<a href="org/apache/commons/rdf/rdf4j/RDF4JTermFactory.html" target="classFrame">Option</a>
+				<a href="org/apache/commons/rdf/rdf4j/RDF4JFactory.html" target="classFrame">Option</a>
 			</li>
 						<li>
 				<a href="org/apache/commons/rdf/experimental/RDFParser.html" target="classFrame">ParseResult</a>
@@ -261,6 +261,9 @@
 				<a href="org/apache/commons/rdf/rdf4j/RDF4JDataset.html" target="classFrame">RDF4JDataset</a>
 			</li>
 						<li>
+				<a href="org/apache/commons/rdf/rdf4j/RDF4JFactory.html" target="classFrame">RDF4JFactory</a>
+			</li>
+						<li>
 				<a href="org/apache/commons/rdf/rdf4j/RDF4JGraph.html" target="classFrame">RDF4JGraph</a>
 			</li>
 						<li>
@@ -282,9 +285,6 @@
 				<a href="org/apache/commons/rdf/rdf4j/RDF4JTerm.html" target="classFrame">RDF4JTerm</a>
 			</li>
 						<li>
-				<a href="org/apache/commons/rdf/rdf4j/RDF4JTermFactory.html" target="classFrame">RDF4JTermFactory</a>
-			</li>
-						<li>
 				<a href="org/apache/commons/rdf/rdf4j/RDF4JTriple.html" target="classFrame">RDF4JTriple</a>
 			</li>
 						<li>