You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by gi...@apache.org on 2023/11/22 23:18:09 UTC
(jena-site) branch asf-staging updated: Staged site from markmail-has-left-the-building (054a477ceab9eb132b741ab12726d158ecf68c10)
This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/jena-site.git
The following commit(s) were added to refs/heads/asf-staging by this push:
new 7f91dbf21 Staged site from markmail-has-left-the-building (054a477ceab9eb132b741ab12726d158ecf68c10)
7f91dbf21 is described below
commit 7f91dbf219954f0e46454dc9723d73c66278e32b
Author: jenkins <bu...@apache.org>
AuthorDate: Wed Nov 22 23:18:06 2023 +0000
Staged site from markmail-has-left-the-building (054a477ceab9eb132b741ab12726d158ecf68c10)
---
content/documentation/archive/larq/index.html | 2 +-
content/documentation/index.xml | 2 +-
content/documentation/inference/index.html | 38 ++++-----
content/documentation/io/arp/arp_sax.html | 44 +++++-----
content/documentation/io/arp/arp_standalone.html | 40 ++++-----
content/documentation/io/json-ld-11.html | 2 +-
content/documentation/io/rdf-input.html | 2 +-
content/documentation/io/rdfxml-input.html | 16 ++--
content/documentation/io/rdfxml-output.html | 16 ++--
content/documentation/io/rdfxml_howto.html | 98 +++++++++++-----------
content/documentation/io/streaming-io.html | 16 ++--
content/documentation/jdbc/drivers.html | 2 +-
content/documentation/jdbc/index.html | 2 +-
content/documentation/notes/model-factory.html | 6 +-
content/documentation/notes/rdf-frames.html | 2 +-
content/documentation/notes/stream-manager.html | 4 +-
content/documentation/notes/typed-literals.html | 8 +-
content/documentation/ontology/index.html | 72 ++++++++--------
content/documentation/query/cmds.html | 4 +-
content/documentation/query/construct-quad.html | 4 +-
.../query/generate-json-from-sparql.html | 2 +-
.../query/parameterized-sparql-strings.html | 4 +-
content/documentation/query/writing_propfuncs.html | 26 +++---
content/documentation/rdf/index.html | 2 +-
content/download/index.html | 36 ++++----
content/help_and_support/index.html | 5 +-
content/index.json | 2 +-
content/index.xml | 2 +-
content/sitemap.xml | 64 +++++++-------
content/tutorials/rdf_api.html | 4 +-
content/tutorials/rdf_api_pt.html | 4 +-
content/tutorials/using_jena_with_eclipse.html | 3 +-
content/tutorials/using_jena_with_eclipse_pt.html | 2 +-
33 files changed, 267 insertions(+), 269 deletions(-)
diff --git a/content/documentation/archive/larq/index.html b/content/documentation/archive/larq/index.html
index f5135c1c1..e9b824217 100644
--- a/content/documentation/archive/larq/index.html
+++ b/content/documentation/archive/larq/index.html
@@ -325,7 +325,7 @@ for ( ; nIter.hasNext() ; )
<p>The <a href="http://lucene.apache.org/java/3_4_0/contributions.html#Lucene%20Document%20Converters">Lucene contributions page</a> lists some content converters.</p>
<h2 id="getting-help-and-getting-involved">Getting Help and Getting Involved</h2>
<p>If you have a problem with LARQ, make sure you read the <a href="../../help_and_support/index.html">Getting help with Jena</a> page and post a message on the <a href="mailto:users@jena.apache.org?s=%5BLARQ%5D">users@jena.apache.org</a> mailing list.
-You can also search the jena-users mailing list archives <a href="http://markmail.org/search/?q=larq+list%3Aorg.apache.jena.users">here</a>.</p>
+You can also search the jena-users mailing list archives <a href="https://lists.apache.org/list.html?users@jena.apache.org">here</a>.</p>
<p>If you use LARQ and you want to get involved, make sure you read the <a href="../../getting_involved/index.html">Getting Involved</a> page. You can help us making LARQ better by:</p>
<ul>
<li>improving this documentation, writing tutorials or blog posts about LARQ</li>
diff --git a/content/documentation/index.xml b/content/documentation/index.xml
index 8790ce877..b7934405a 100644
--- a/content/documentation/index.xml
+++ b/content/documentation/index.xml
@@ -1142,7 +1142,7 @@ Details of ARP, the Jena RDF/XML parser Quick Introduction The main I/O methods
<description>Legacy Documentation : may not be up-to-date
Original RDF/XML HowTo.
This is a guide to the RDF/XML legacy input subsystem of Jena, ARP.
-Advanced RDF/XML Input For access to these advanced features, first get an RDFReader object that is an instance of an ARP parser, by using the getReader() method on any Model. It is then configured using the [setProperty](/documentation/javadoc/jena/org/apache/jena/rdfxml/xmlinput0/JenaReader.html#setProperty(java.lang.String, java.lang.Object))(String, Object) method. This changes the properties for parsing RDF/XML. Many of the properties change the RDF parser, some change the XML parse [...]
+Advanced RDF/XML Input For access to these advanced features, first get an RDFReader object that is an instance of an ARP parser, by using the getReader() method on any Model. It is then configured using the [setProperty](/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdfxml/xmlinput0/JenaReader.html#setProperty(java.lang.String, java.lang.Object))(String, Object) method. This changes the properties for parsing RDF/XML. Many of the properties change the RDF parser, some [...]
</item>
<item>
diff --git a/content/documentation/inference/index.html b/content/documentation/inference/index.html
index c673efcfe..5a2e83e4f 100644
--- a/content/documentation/inference/index.html
+++ b/content/documentation/inference/index.html
@@ -301,7 +301,7 @@
engine</em>, please forgive us. </p>
<p>The overall structure of the inference machinery is illustrated below. </p>
<p class="centered"><img src="reasoner-overview.png" width="544" height="305" alt="Overall structure of inference machinery"></p>
-<p>Applications normally access the inference machinery by using the <a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/ModelFactory.html"><code>ModelFactory</code></a>
+<p>Applications normally access the inference machinery by using the <a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/ModelFactory.html"><code>ModelFactory</code></a>
to associate a data set with some reasoner to create a new Model. Queries to
the created model will return not only those statements that were present in
the original data but also additional statements than can be derived from the
@@ -359,12 +359,12 @@
<h3 id="reasonerAPI">Generic reasoner API</h3>
<h4 id="finding-a-reasoner">Finding a reasoner</h4>
<p>For each type of reasoner there is a factory class (which conforms to the interface
- <code><a href="/documentation/javadoc/jena/org/apache/jena/reasoner/ReasonerFactory.html">ReasonerFactory</a></code>)
+ <code><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/reasoner/ReasonerFactory.html">ReasonerFactory</a></code>)
an instance of which can be used to create instances of the associated
- <code><a href="/documentation/javadoc/jena/org/apache/jena/reasoner/Reasoner.html">Reasoner</a></code>.
+ <code><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/reasoner/Reasoner.html">Reasoner</a></code>.
The factory instances can be located by going directly to a known factory class
and using the static <code>theInstance</code>() method or by retrieval from
- a global <code><a href="/documentation/javadoc/jena/org/apache/jena/reasoner/ReasonerRegistry.html">ReasonerRegistry</a></code>
+ a global <code><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/reasoner/ReasonerRegistry.html">ReasonerRegistry</a></code>
which stores factory instances indexed by URI assigned to the reasoner. </p>
<p>In addition, there are convenience methods on the <code>ReasonerRegistry</code>
for locating a prebuilt instance of each of the main reasoners (<code>getTransitiveReasoner</code>,
@@ -391,7 +391,7 @@
method to set a single configuration parameter, <code>Reasoner.setParameter</code>.
The parameter being set is identified by the corresponding configuration property.</p>
<p>For the built in reasoners the available configuration parameters are described
- below and are predefined in the <code><a href="/documentation/javadoc/jena/org/apache/jena/vocabulary/ReasonerVocabulary.html">ReasonerVocabulary</a></code>
+ below and are predefined in the <code><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/vocabulary/ReasonerVocabulary.html">ReasonerVocabulary</a></code>
class.</p>
<p>The parameter value can normally be a String or a structured value. For example,
to set a boolean value one can use the strings "true" or "false",
@@ -409,7 +409,7 @@
a set schema data, use the <code>Reasoner.bindSchema</code> method which returns
a new, specialized, reasoner.</p>
<p>To bind the reasoner to the final data set to create an inference model see
- the <a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/ModelFactory.html"><code>ModelFactory</code></a>
+ the <a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/ModelFactory.html"><code>ModelFactory</code></a>
methods, particularly <code>ModelFactory.createInfModel</code>. </p>
<h4 id="accessing-inferences">Accessing inferences</h4>
<p>Finally, having created an inference model, any API operations which access
@@ -607,21 +607,21 @@ if (validity.isValid()) {
aliases for those relations which can be queried this way. For the built in
reasoners this functionality is available for <code>rdfs:subClassOf</code> and
<code>rdfs:subPropertyOf</code> and the direct aliases for these are defined
- in <a href="/documentation/javadoc/jena/org/apache/jena/vocabulary/ReasonerVocabulary.html"><code>ReasonerVocabulary</code></a>.</p>
+ in <a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/vocabulary/ReasonerVocabulary.html"><code>ReasonerVocabulary</code></a>.</p>
<p>Typically the easiest way to work with such indirect and direct relations is
to use the <a href="../ontology/index.html">Ontology API</a> which hides the
grubby details of these property aliases.</p>
<h4 id="derivations">Derivations</h4>
<p>It is sometimes useful to be able to trace where an inferred statement was
generated from. This is achieved using the <code>InfModel.getDerivation(Statement)</code>
- method. This returns a iterator over a set <a href="/documentation/javadoc/jena/org/apache/jena/reasoner/Derivation.html"><code>Derivation</code></a>
+ method. This returns a iterator over a set <a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/reasoner/Derivation.html"><code>Derivation</code></a>
objects through which a brief description of the source of the derivation can
be obtained. Typically understanding this involves tracing the sources for other
statements which were used in this derivation and the <code>Derivation.PrintTrace</code>
method is used to do this recursively.</p>
<p>The general form of the Derivation objects is quite abstract but in the case
of the rule-based reasoners they have a more detailed internal structure that
- can be accessed - see <code><a href="/documentation/javadoc/jena/org/apache/jena/reasoner/rulesys/RuleDerivation.html">RuleDerivation</a></code>.</p>
+ can be accessed - see <code><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/reasoner/rulesys/RuleDerivation.html">RuleDerivation</a></code>.</p>
<p>Derivation information is rather expensive to compute and store. For this reason,
it is not recorded by default and <code>InfModel.serDerivationLogging(true)</code>
must be used to enable derivations to be recorded. This should be called before
@@ -1208,7 +1208,7 @@ configuration still leaves something to be desired and will the subject of futur
<p>[<a href="#owl">OWL Index</a>] [<a href="#index">Main Index</a>]</p>
<h3 id="OWLconfiguration">OWL Configuration</h3>
<p>This reasoner is accessed using <code>ModelFactory.createOntologyModel</code>
- with the prebuilt <a href="/documentation/javadoc/jena/org/apache/jena/ontology/OntModelSpec.html"><code>OntModelSpec</code></a>
+ with the prebuilt <a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/ontology/OntModelSpec.html"><code>OntModelSpec</code></a>
<code>OWL_MEM_RULE_INF</code> or manually via <code>ReasonerRegistry.getOWLReasoner()</code>.</p>
<p>There are no OWL-specific configuration parameters though the reasoner supports
the standard control parameters:</p>
@@ -1445,7 +1445,7 @@ class B = cardinality(P,1)</pre>
tabled datalog engine - they can be run separately or the forward engine can
be used to prime the backward engine which in turn will be used to answer queries.</p>
<p>The various engine configurations are all accessible through a single parameterized
- reasoner <code><a href="/documentation/javadoc/jena/org/apache/jena/reasoner/rulesys/GenericRuleReasoner.html">GenericRuleReasoner</a></code>.
+ reasoner <code><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/reasoner/rulesys/GenericRuleReasoner.html">GenericRuleReasoner</a></code>.
At a minimum a <code>GenericRuleReasoner</code> requires a ruleset to define
its behaviour. A <code>GenericRuleReasoner</code> instance with a ruleset can
be used like any of the other reasoners described above - that is it can be
@@ -1456,9 +1456,9 @@ class B = cardinality(P,1)</pre>
for the RDFS and OWL implementations but is easily extensible.</p>
<p>[<a href="#rules">Rule Index</a>] [<a href="#index">Main Index</a>]</p>
<h3 id="RULEsyntax">Rule syntax and structure</h3>
-<p>A rule for the rule-based reasoner is defined by a Java <code><a href="/documentation/javadoc/jena/org/apache/jena/reasoner/rulesys/Rule.html">Rule</a></code>
+<p>A rule for the rule-based reasoner is defined by a Java <code><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/reasoner/rulesys/Rule.html">Rule</a></code>
object with a list of body terms (premises), a list of head terms (conclusions)
- and an optional name and optional direction. Each term or <a href="/documentation/javadoc/jena/org/apache/jena/reasoner/rulesys/ClauseEntry.html"><code>ClauseEntry</code></a>
+ and an optional name and optional direction. Each term or <a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/reasoner/rulesys/ClauseEntry.html"><code>ClauseEntry</code></a>
is either a triple pattern, an extended triple pattern or a call to a builtin
primitive. A rule set is simply a List of Rules.</p>
<p>For convenience a rather simple parser is included with Rule which allows rules
@@ -1496,7 +1496,7 @@ or number // e.g. 42 or 25.5</pre></p>
multiple triples and allows a rule to collect those triples together in one
place.</p>
<p>To keep rules readable qname syntax is supported for URI refs. The set of known
- prefixes is those registered with the <code><a href="/documentation/javadoc/jena/org/apache/jena/util/PrintUtil.html">PrintUtil</a></code>
+ prefixes is those registered with the <code><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/util/PrintUtil.html">PrintUtil</a></code>
object. This initially knows about rdf, rdfs, owl, xsd and a test namespace
eg, but more mappings can be registered in java code. In addition it is possible to
define additional prefix mappings in the rule file, see below. </p>
@@ -2218,18 +2218,18 @@ InfModel inf = ModelFactory.createInfModel(reasoner, data);
rule syntax so long as it can be compiled into Rule objects.</p>
<h4 id="builtins">Builtins</h4>
<p>Second, the set of procedural builtins can be extended. A builtin should implement
- the <a href="/documentation/javadoc/jena/org/apache/jena/reasoner/rulesys/Builtin.html"><code>Builtin</code></a>
- interface. The easiest way to achieve this is by subclassing <code><a href="/documentation/javadoc/jena/org/apache/jena/reasoner/rulesys/builtins/BaseBuiltin.html">BaseBuiltin</a></code>
+ the <a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/reasoner/rulesys/Builtin.html"><code>Builtin</code></a>
+ interface. The easiest way to achieve this is by subclassing <code><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/reasoner/rulesys/builtins/BaseBuiltin.html">BaseBuiltin</a></code>
and defining a name (<code>getName</code>), the number of arguments expected
(<code>getArgLength</code>) and one or both of <code>bodyCall</code> and <code>headAction</code>.
The <code>bodyCall</code> method is used when the builtin is invoked in the
body of a rule clause and should return true or false according to whether the
test passes. In both cases the arguments may be variables or bound values and
- the supplied <code><a href="/documentation/javadoc/jena/org/apache/jena/reasoner/rulesys/RuleContext.html">RuleContext</a></code>
+ the supplied <code><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/reasoner/rulesys/RuleContext.html">RuleContext</a></code>
object can be used to dereference bound variables and to bind new variables.
</p>
<p>Once the Builtin has been defined then an instance of it needs to be registered
- with <a href="/documentation/javadoc/jena/org/apache/jena/reasoner/rulesys/BuiltinRegistry.html"><code>BuiltinRegistry</code></a>
+ with <a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/reasoner/rulesys/BuiltinRegistry.html"><code>BuiltinRegistry</code></a>
for it to be seen by the rule parser and interpreters.</p>
<p>The easiest way to experiment with this is to look at the examples in the builtins
directory. </p>
@@ -2238,7 +2238,7 @@ InfModel inf = ModelFactory.createInfModel(reasoner, data);
hooks over the data at the time the inference graph is <i>prepared</i>. These
procedural hooks can be used to perform tests or translations which are slow
or inconvenient to express in rule form. See <code>GenericRuleReasoner.addPreprocessingHook</code>
- and the <a href="/documentation/javadoc/jena/org/apache/jena/reasoner/rulesys/RulePreprocessHook.html"><code>RulePreprocessHook</code></a>
+ and the <a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/reasoner/rulesys/RulePreprocessHook.html"><code>RulePreprocessHook</code></a>
class for more details.</p>
<p>[<a href="#index">Index</a>]</p>
<h2 id="extensions">Extending the inference support</h2>
diff --git a/content/documentation/io/arp/arp_sax.html b/content/documentation/io/arp/arp_sax.html
index 6483caef2..c858a10ee 100644
--- a/content/documentation/io/arp/arp_sax.html
+++ b/content/documentation/io/arp/arp_sax.html
@@ -214,21 +214,21 @@ Jena Model.</p>
<h2 id="1-overview">1. Overview</h2>
<p>To read an arbitrary SAX source as triples to be added into a Jena
model, it is not possible to use a
-<code>Model.</code><a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html#read(java.io.InputStream,%20java.lang.String)"><code>read</code></a>()
+<code>Model.</code><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Model.html#read(java.io.InputStream,%20java.lang.String)"><code>read</code></a>()
operation. Instead, you construct a SAX event handler of class
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/SAX2Model.html"><code>SAX2Model</code></a>,
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/SAX2Model.html"><code>SAX2Model</code></a>,
using the
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/SAX2Model.html#create(java.lang.String,%20org.apache.jena.rdf.model.Model)"><code>create</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/SAX2Model.html#create(java.lang.String,%20org.apache.jena.rdf.model.Model)"><code>create</code></a>
method, install these as the handler on your SAX event source, and
then stream the SAX events. It is possible to have fine-grained
control over the SAX events, for instance, by inserting or deleting
events, before passing them to the
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/SAX2Model.html"><code>SAX2Model</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/SAX2Model.html"><code>SAX2Model</code></a>
handler.</p>
<h2 id="sample-code">Sample Code</h2>
<p>This code uses the Xerces parser as a SAX event stream, and adds
the triple to a
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html"><code>Model</code></a> using
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Model.html"><code>Model</code></a> using
default options.</p>
<pre><code>// Use your own SAX source.
XMLReader saxParser = new SAXParser();
@@ -261,10 +261,10 @@ try {
</code></pre>
<h2 id="initializing-sax-event-source">Initializing SAX event source</h2>
<p>If your SAX event source is a subclass of <code>XMLReader</code>, then the
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/SAX2RDF.html#installHandlers(org.xml.sax.XMLReader,%20org.apache.jena.rdf.arp.XMLHandler)">installHandlers</a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/SAX2RDF.html#installHandlers(org.xml.sax.XMLReader,%20org.apache.jena.rdf.arp.XMLHandler)">installHandlers</a>
static method can be used as shown in the sample. Otherwise, you
have to do it yourself. The
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/SAX2RDF.html#installHandlers(org.xml.sax.XMLReader,%20org.apache.jena.rdf.arp.XMLHandler)"><code>installHandlers</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/SAX2RDF.html#installHandlers(org.xml.sax.XMLReader,%20org.apache.jena.rdf.arp.XMLHandler)"><code>installHandlers</code></a>
code is like this:</p>
<pre><code>static public void installHandlers(XMLReader rdr, XMLHandler sax2rdf)
throws SAXException
@@ -285,22 +285,22 @@ throws SAXException
<p>For some other SAX source, the exact code will differ, but the
required operations are as above.</p>
<h2 id="error-handler">Error Handler</h2>
-<p>The <a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/SAX2Model.html">SAX2Model</a>
+<p>The <a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/SAX2Model.html">SAX2Model</a>
handler supports the
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFReader.html#setErrorHandler(org.apache.jena.rdf.model.RDFErrorHandler)">setErrorHandler</a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/RDFReader.html#setErrorHandler(org.apache.jena.rdf.model.RDFErrorHandler)">setErrorHandler</a>
method, from the Jena
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFReader.html">RDFReader</a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/RDFReader.html">RDFReader</a>
interface. This is used in the same way as that method to control
error reporting.</p>
<p>A specific fatal error, new in Jena 2.3, is ERR_INTERRUPTED, which
indicates that the current Thread received an interrupt. This
allows long jobs to be aborted on user request.</p>
<h2 id="options">Options</h2>
-<p>The <a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/SAX2Model.html"><code>SAX2Model</code></a>
+<p>The <a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/SAX2Model.html"><code>SAX2Model</code></a>
handler supports the
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFReader.html#setProperty(java.lang.String,%20java.lang.Object)"><code>setProperty</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/RDFReader.html#setProperty(java.lang.String,%20java.lang.Object)"><code>setProperty</code></a>
method, from the Jena
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFReader.html"><code>RDFReader</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/RDFReader.html"><code>RDFReader</code></a>
interface. This is used in nearly the same way to have fine grain
control over ARPs behaviour, particularly over error reporting, see
the <a href="iohowto.html#arp_properties">I/O howto</a>. Setting SAX or
@@ -311,12 +311,12 @@ necessary to ensure that ARP knows the correct value for <code>xml:lang</code>
and desirable that it knows the correct mappings of namespace
prefixes.</p>
<p>There is a second version of the
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/SAX2Model.html#create(java.lang.String,%20org.apache.jena.rdf.model.Model,%20java.lang.String)"><code>create</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/SAX2Model.html#create(java.lang.String,%20org.apache.jena.rdf.model.Model,%20java.lang.String)"><code>create</code></a>
method, which allows specification of the <code>xml:lang</code> value from the
outer context. If this is inappropriate it is possible, but hard
work, to synthesis an appropriate SAX event.</p>
<p>For the namespaces prefixes, it is possible to call the
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/SAX2RDF.html#startPrefixMapping(java.lang.String,%20java.lang.String)"><code>startPrefixMapping</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/SAX2RDF.html#startPrefixMapping(java.lang.String,%20java.lang.String)"><code>startPrefixMapping</code></a>
SAX event, before passing the other SAX events, to declare each
namespace, one by one. Failure to do this is permitted, but, for
instance, a Jena Model will then not know the (advisory) namespace
@@ -326,18 +326,18 @@ events, but nothing untoward is likely if such code is omitted.</p>
<p>As with ARP, it is possible to use this functionality, without
using other Jena features, in particular, without using a Jena
Model. Instead of using the class SAX2Model, you use its superclass
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/SAX2RDF.html">SAX2RDF</a>. The
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/SAX2RDF.html#create(java.lang.String)">create</a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/SAX2RDF.html">SAX2RDF</a>. The
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/SAX2RDF.html#create(java.lang.String)">create</a>
method on this class does not provide any means of specifying what
to do with the triples. Instead, the class implements the
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/SAX2RDF.html">ARPConfig</a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/SAX2RDF.html">ARPConfig</a>
interface, which permits the setting of handlers and parser
options, as described in the documentation for using
<a href="standalone.html">ARP without Jena</a>.</p>
<p>Thus you need to:</p>
<ol>
<li>Create a SAX2RDF using
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/SAX2RDF.html#create(java.lang.String)">SAX2RDF.create()</a></li>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/SAX2RDF.html#create(java.lang.String)">SAX2RDF.create()</a></li>
<li>Attach your StatementHandler and SAXErrorHandler and optionally
your NamespaceHandler and ExtendedHandler to the SAX2RDF instance.</li>
<li>Install the SAX2RDF instance as the SAX handler on your SAX
@@ -349,19 +349,19 @@ source.</li>
suggest using Java 1.4.2_04 or greater for this functionality.
This issue has no impact on any other Jena functionality.</p>
<h3 id="using-a-dom-as-input-to-jena">Using a DOM as Input to Jena</h3>
-<p>The <a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/DOM2Model.html"><code>DOM2Model</code></a>
+<p>The <a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/DOM2Model.html"><code>DOM2Model</code></a>
subclass of SAX2Model, allows the parsing of a DOM using ARP. The
procedure to follow is:</p>
<ul>
<li>Construct a <code>DOM2Model</code>, using a factory method such as
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/DOM2Model.html#createD2M(java.lang.String,%20org.apache.jena.rdf.model.Model)"><code>createD2M</code></a>,
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/DOM2Model.html#createD2M(java.lang.String,%20org.apache.jena.rdf.model.Model)"><code>createD2M</code></a>,
specifying the xml:base of the document to be loaded, the Model to
load into, optionally the xml:lang value (particularly useful if
using a DOM Node from within a Document).</li>
<li>Set any properties, error handlers etc. on the <code>DOM2Model</code>
object.</li>
<li>The DOM is parsed simply by calling the
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/DOM2Model.html#load(org.w3c.dom.Node)"><code>load(Node)</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/DOM2Model.html#load(org.w3c.dom.Node)"><code>load(Node)</code></a>
method.</li>
</ul>
<h3 id="using-a-dom-as-input-to-arp">Using a DOM as Input to ARP</h3>
diff --git a/content/documentation/io/arp/arp_standalone.html b/content/documentation/io/arp/arp_standalone.html
index 9f20ebb01..46c2dfd48 100644
--- a/content/documentation/io/arp/arp_standalone.html
+++ b/content/documentation/io/arp/arp_standalone.html
@@ -206,24 +206,24 @@ standalone.</p>
<p>To load an RDF file:</p>
<ol>
<li>Create an
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARP.html#ARP()">ARP</a> instance.</li>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/ARP.html#ARP()">ARP</a> instance.</li>
<li>Set parse options, particularly error detection control, using
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPConfig.html#getOptions()">getOptions</a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/ARPConfig.html#getOptions()">getOptions</a>
or
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPConfig.html#setOptionsWith(org.apache.jena.rdf.arp.ARPOptions)">setOptionsWith</a>.</li>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/ARPConfig.html#setOptionsWith(org.apache.jena.rdf.arp.ARPOptions)">setOptionsWith</a>.</li>
<li>Set its handlers, by calling the
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPConfig.html#getHandlers()">getHandlers</a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/ARPConfig.html#getHandlers()">getHandlers</a>
or
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPConfig.html#setHandlersWith(org.apache.jena.rdf.arp.ARPHandlers)">setHandlersWith</a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/ARPConfig.html#setHandlersWith(org.apache.jena.rdf.arp.ARPHandlers)">setHandlersWith</a>
methods, and then.
<ul>
<li>Setting the
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPHandlers.html#setStatementHandler(org.apache.jena.rdf.arp.StatementHandler)">statement handler</a>.</li>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/ARPHandlers.html#setStatementHandler(org.apache.jena.rdf.arp.StatementHandler)">statement handler</a>.</li>
<li>Optionally setting the other handlers.</li>
</ul>
</li>
<li>Call a
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARP.html#load(java.io.InputStream,%20java.lang.String)">load</a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/ARP.html#load(java.io.InputStream,%20java.lang.String)">load</a>
method</li>
</ol>
<p>Xerces is used for parsing the XML. The SAXEvents generated by
@@ -288,20 +288,20 @@ catch (SAXException ss) {
</ul>
<p>User code is needed to respond to any of these events of interest.
This is written by implementing any of the relevant interfaces:
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/StatementHandler.html">StatementHandler</a>,
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/StatementHandler.html">StatementHandler</a>,
org.xml.sax.ErrorHandler,
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/NamespaceHandler.html">NamespaceHandler</a>,
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/NamespaceHandler.html">NamespaceHandler</a>,
and
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/ExtendedHandler.html">ExtendedHandler</a>.</p>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/ExtendedHandler.html">ExtendedHandler</a>.</p>
<p>An individual handler is set by calling the
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPConfig.html#getHandlers()">getHandlers</a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/ARPConfig.html#getHandlers()">getHandlers</a>
method on the ARP instance. This returns an encapsulation of all
the handlers being used. A specific handler is set by calling the
appropriate set…Handler method on that object, e.g.
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPHandlers.html#setStatementHandler(org.apache.jena.rdf.arp.StatementHandler)">setStatementHandler</a>.</p>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/ARPHandlers.html#setStatementHandler(org.apache.jena.rdf.arp.StatementHandler)">setStatementHandler</a>.</p>
<p>All the handlers can be copied from one ARP instance to another by
using the
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPConfig.html#setHandlersWith(org.apache.jena.rdf.arp.ARPHandlers)">setHandlersWith</a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/ARPConfig.html#setHandlersWith(org.apache.jena.rdf.arp.ARPHandlers)">setHandlersWith</a>
method:</p>
<pre><code> ARP from, to;
// initialize from and to
@@ -311,7 +311,7 @@ method:</p>
</code></pre>
<p>The error handler reports both XML and RDF errors, the former
detected by Xerces. See
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPHandlers.html#setErrorHandler(org.xml.sax.ErrorHandler)">ARPHandlers.setErrorHandler</a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/ARPHandlers.html#setErrorHandler(org.xml.sax.ErrorHandler)">ARPHandlers.setErrorHandler</a>
for details of how to distinguish between them.</p>
<h2 id="configuring-arp">Configuring ARP</h2>
<p>ARP can be configured to treat most error conditions as warnings or
@@ -323,9 +323,9 @@ whole file as RDF anyway, or to scan the file looking for embedded
<code><rdf:RDF></code> elements.</p>
<p>As with the handlers, there is an options object that encapsulates
these settings. It can be accessed using
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPConfig.html#getOptions()"><code>getOptions</code></a>,
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/ARPConfig.html#getOptions()"><code>getOptions</code></a>,
and then individual settings can be made using the methods in
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPOptions.html"><code>ARPOptions</code></a>.</p>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/ARPOptions.html"><code>ARPOptions</code></a>.</p>
<p>It is also possible to copy all the option settings from one ARP
instance to another:</p>
<pre><code> ARP from, to;
@@ -344,8 +344,8 @@ the Jena <code>RDFReader</code> interface.</p>
non-Xerces parser, or from an in-memory XML source, such as a DOM
tree.</p>
<p>Instead of an ARP instance, you create an instance of
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/SAX2RDF.html">SAX2RDF</a> using
-the <a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/SAX2RDF.html#newInstance(java.lang.String)">newInstance</a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/SAX2RDF.html">SAX2RDF</a> using
+the <a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/SAX2RDF.html#newInstance(java.lang.String)">newInstance</a>
method. This can be configured just like an ARP instance, following
the initialization section of the <a href="#sample">sample code</a>.</p>
<p>This is used like a SAX2Model instance as
@@ -353,9 +353,9 @@ the initialization section of the <a href="#sample">sample code</a>.</p>
<h2 id="memory-usage">Memory usage</h2>
<p>For very large files, ARP does not use any additional memory except
when either the
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/ExtendedHandler.html#discardNodesWithNodeID()">ExtendedHandler.discardNodesWithNodeID</a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/ExtendedHandler.html#discardNodesWithNodeID()">ExtendedHandler.discardNodesWithNodeID</a>
returns false or when the
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/arp/AResource.html#setUserData(java.lang.Object)">AResource.setUserData</a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/arp/AResource.html#setUserData(java.lang.Object)">AResource.setUserData</a>
method has been used. In these cases ARP needs to remember the
<code>rdf:nodeID</code> usage through the file life time.</p>
diff --git a/content/documentation/io/json-ld-11.html b/content/documentation/io/json-ld-11.html
index bd63aa2a3..4f97e0494 100644
--- a/content/documentation/io/json-ld-11.html
+++ b/content/documentation/io/json-ld-11.html
@@ -212,7 +212,7 @@ licensed under the
<p>The file extension for JSONLD 1.1 is <code>.jsonld11</code>.</p>
<p>If not reading from a file with this file extension, the application needs to
force the language choice to be JSON-LD 1.1 with
-<a href="https://jena.apache.org/documentation/javadoc/arq/org/apache/jena/riot/RDFParser.html"><code>RDFParser</code></a>
+<a href="https://jena.apache.org/documentation/javadoc/arq/org.apache.jena.arq/org/apache/jena/riot/RDFParser.html"><code>RDFParser</code></a>
using <code>forceLang(Lang.JSONLD11)</code>:</p>
<pre tabindex="0"><code>RDFParser.source(...)
.forceLang(Lang.JSONLD11)
diff --git a/content/documentation/io/rdf-input.html b/content/documentation/io/rdf-input.html
index 7b3ec39d0..42d4b114d 100644
--- a/content/documentation/io/rdf-input.html
+++ b/content/documentation/io/rdf-input.html
@@ -375,7 +375,7 @@ model.read("data.ttl") ;
<h3 id="using-rdfparser">Example 3 : Using RDFParser</h3>
<p>Detailed control over the setup of the parsing process is provided by
<code>RDFParser</code> which provides a builder pattern. It has many options - see
-<a href="/documentation/javadoc/arq/org/apache/jena/riot/RDFParser.html">the javadoc for all details</a>.</p>
+<a href="/documentation/javadoc/arq/org.apache.jena.arq/org/apache/jena/riot/RDFParser.html">the javadoc for all details</a>.</p>
<p>For example, to read Trig data, and set the error handler specially,</p>
<pre><code> Dataset dataset;
// The parsers will do the necessary character set conversion.
diff --git a/content/documentation/io/rdfxml-input.html b/content/documentation/io/rdfxml-input.html
index 29954a4ba..207a6b861 100644
--- a/content/documentation/io/rdfxml-input.html
+++ b/content/documentation/io/rdfxml-input.html
@@ -197,9 +197,9 @@
<h2 id="advanced-rdfxml-input">Advanced RDF/XML Input</h2>
<p>For access to these advanced features, first get an <code>RDFReader</code>
object that is an instance of an ARP parser, by using the
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFReaderF.html#getReader()"><code>getReader</code></a><code>()</code>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/RDFReaderF.html#getReader()"><code>getReader</code></a><code>()</code>
method on any <code>Model</code>. It is then configured using the
-[<code>setProperty</code>](/documentation/javadoc/jena/org/apache/jena/rdfxml/xmlinput0/JenaReader.html#setProperty(java.lang.String, java.lang.Object))<code>(String, Object)</code>
+[<code>setProperty</code>](/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdfxml/xmlinput0/JenaReader.html#setProperty(java.lang.String, java.lang.Object))<code>(String, Object)</code>
method. This changes the properties for parsing RDF/XML. Many of
the properties change the RDF parser, some change the XML parser.
(The Jena RDF/XML parser, ARP, implements the
@@ -207,7 +207,7 @@ the properties change the RDF parser, some change the XML parser.
over a <a href="http://xml.apache.org/xerces2-j/index.html">Xerces2-J</a> XML
parser). However, changing the features and properties of the XML
parser is not likely to be useful, but was easy to implement.</p>
-<p>[<code>setProperty</code>](/documentation/javadoc/jena/org/apache/jena/rdfxml/xmlinput0/JenaReader.html#setProperty(java.lang.String, java.lang.Object))<code>(String, Object)</code>
+<p>[<code>setProperty</code>](/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdfxml/xmlinput0/JenaReader.html#setProperty(java.lang.String, java.lang.Object))<code>(String, Object)</code>
can be used to set and get:</p>
<ul>
<li>ARP properties
@@ -250,21 +250,21 @@ property.</p>
</tr>
<tr>
<td><code>error-mode</code></td>
-<td><a href="/documentation/javadoc/jena/org/apache/jena/rdfxml/xmlinput0/ARPOptions.html#setDefaultErrorMode()"><code>ARPOptions.setDefaultErrorMode()</code></a> <br /><a href="/documentation/javadoc/jena/org/apache/jena/rdfxml/xmlinput0/ARPOptions.html#setLaxErrorMode()"><code>ARPOptions.setLaxErrorMode()</code></a><br /><a href="/documentation/javadoc/jena/org/apache/jena/rdfxml0/xmlinput/ARPOptions.html#setStrictErrorMode()"><code>ARPOptions.setStrictErrorMode()</code></a><br /><a hr [...]
+<td><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdfxml/xmlinput0/ARPOptions.html#setDefaultErrorMode()"><code>ARPOptions.setDefaultErrorMode()</code></a> <br /><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdfxml/xmlinput0/ARPOptions.html#setLaxErrorMode()"><code>ARPOptions.setLaxErrorMode()</code></a><br /><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdfxml0/xmlinput/ARPOptions.html#setStrictErrorMode [...]
<td><code>String</code></td>
<td><code>default</code><br /><code>lax</code><br /><code>strict</code><br /><code>strict-ignore</code><br /><code>strict-warning</code><br /><code>strict-error</code><br /><code>strict-fatal</code></td>
</tr>
<tr>
<td><code>embedding</code></td>
-<td><a href="/documentation/javadoc/jena/org/apache/jena/rdfxml0/xmlinput/ARPOptions.html#setEmbedding(boolean)"><code>ARPOptions.setEmbedding(boolean)</code></a> <br />This sets ARP to look for RDF embedded within an enclosing XML document.</td>
+<td><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdfxml0/xmlinput/ARPOptions.html#setEmbedding(boolean)"><code>ARPOptions.setEmbedding(boolean)</code></a> <br />This sets ARP to look for RDF embedded within an enclosing XML document.</td>
<td><code>String</code> or <code>Boolean</code></td>
<td><code>true</code><br /><code>false</code></td>
</tr>
<tr>
<td><code>ERR_<XXX></code> <br /><code>WARN_<XXX></code><br /><code>IGN_<XXX></code></td>
-<td>See <a href="/documentation/javadoc/jena/org/apache/jena/rdfxml0/xmlinput/ARPErrorNumbers.html"><code>ARPErrorNumbers</code></a> for a complete list of the error conditions detected. Setting one of these properties is equivalent to the method <a href="/documentation/javadoc/jena/org/apache/jena/rdfxml0/xmlinput/ARPOptions.html#setErrorMode(int,%20int)"><code>ARPOptions.setErrorMode(int, int)</code></a>. Thus fine-grained control over the behaviour in response to specific error condit [...]
+<td>See <a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdfxml0/xmlinput/ARPErrorNumbers.html"><code>ARPErrorNumbers</code></a> for a complete list of the error conditions detected. Setting one of these properties is equivalent to the method <a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdfxml0/xmlinput/ARPOptions.html#setErrorMode(int,%20int)"><code>ARPOptions.setErrorMode(int, int)</code></a>. Thus fine-grained control over the beha [...]
<td><code>String</code> or <code>Integer</code></td>
-<td><a href="/documentation/javadoc/jena/org/apache/jena/rdfxml0/xmlinput/ARPErrorNumbers.html#EM_IGNORE"><code>EM_IGNORE</code></a><br /><a href="/documentation/javadoc/jena/org/apache/jena/rdfxml0/xmlinput/ARPErrorNumbers.html#EM_WARNING"><code>EM_WARNING</code></a><br /><a href="/documentation/javadoc/jena/org/apache/jena/rdfxml0/xmlinput/ARPErrorNumbers.html#EM_ERROR"><code>EM_ERROR</code></a><br /><a href="/documentation/javadoc/jena/org/apache/jena/rdfxml0/xmlinput/ARPErrorNumbers. [...]
+<td><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdfxml0/xmlinput/ARPErrorNumbers.html#EM_IGNORE"><code>EM_IGNORE</code></a><br /><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdfxml0/xmlinput/ARPErrorNumbers.html#EM_WARNING"><code>EM_WARNING</code></a><br /><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdfxml0/xmlinput/ARPErrorNumbers.html#EM_ERROR"><code>EM_ERROR</code></a><br /><a href="/documentation [...]
</tr>
</tbody>
</table>
@@ -315,7 +315,7 @@ allow <code>"daml:collection"</code>, the following works:</p>
…
</code></pre>
<p>This is because in strict mode
-<a href="/documentation/javadoc/jena/org/apache/jena/rdfxml0/xmlinput/ARPErrorNumbers.html#IGN_DAML_COLLECTION"><code>IGN_DAML_COLLECTION</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdfxml0/xmlinput/ARPErrorNumbers.html#IGN_DAML_COLLECTION"><code>IGN_DAML_COLLECTION</code></a>
is treated as an error, and so the second call to <code>setProperty</code>
overwrites the effect of the first.</p>
<p>The IRI rules and resolver can be set on a per-reader basis:</p>
diff --git a/content/documentation/io/rdfxml-output.html b/content/documentation/io/rdfxml-output.html
index 99b1b129d..4c4039dad 100644
--- a/content/documentation/io/rdfxml-output.html
+++ b/content/documentation/io/rdfxml-output.html
@@ -294,22 +294,22 @@ fragment IDs from [http://www.w3.org/TR/rdf-syntax-grammar](http://www.w3.org/TR
indicating grammar rules that will not be used. Rules that can be blocked are:
<ul>
<li><a href="http://www.w3.org/TR/rdf-syntax-grammar#section-Reification">section-Reification</a>
-(<a href="/documentation/javadoc/jena/org/apache/jena/vocabulary/RDFSyntax.html#sectionReification"><code>RDFSyntax.sectionReification</code></a>)</li>
+(<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/vocabulary/RDFSyntax.html#sectionReification"><code>RDFSyntax.sectionReification</code></a>)</li>
<li><a href="http://www.w3.org/TR/rdf-syntax-grammar#section-List-Expand">section-List-Expand</a>
-(<a href="/documentation/javadoc/jena/org/apache/jena/vocabulary/RDFSyntax.html#sectionListExpand"><code>RDFSyntax.sectionListExpand</code></a>)</li>
+(<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/vocabulary/RDFSyntax.html#sectionListExpand"><code>RDFSyntax.sectionListExpand</code></a>)</li>
<li><a href="http://www.w3.org/TR/rdf-syntax-grammar#parseTypeLiteralPropertyElt">parseTypeLiteralPropertyElt</a>
-(<a href="/documentation/javadoc/jena/org/apache/jena/vocabulary/RDFSyntax.html#parseTypeLiteralPropertyElt"><code>RDFSyntax.parseTypeLiteralPropertyElt</code></a>)</li>
+(<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/vocabulary/RDFSyntax.html#parseTypeLiteralPropertyElt"><code>RDFSyntax.parseTypeLiteralPropertyElt</code></a>)</li>
<li><a href="http://www.w3.org/TR/rdf-syntax-grammar#parseTypeResourcePropertyElt">parseTypeResourcePropertyElt</a>
-(<a href="/documentation/javadoc/jena/org/apache/jena/vocabulary/RDFSyntax.html#parseTypeLiteralPropertyElt"><code>RDFSyntax.parseTypeLiteralPropertyElt</code></a>)</li>
+(<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/vocabulary/RDFSyntax.html#parseTypeLiteralPropertyElt"><code>RDFSyntax.parseTypeLiteralPropertyElt</code></a>)</li>
<li><a href="http://www.w3.org/TR/rdf-syntax-grammar#parseTypeCollectionPropertyElt">parseTypeCollectionPropertyElt</a>
-(<a href="/documentation/javadoc/jena/org/apache/jena/vocabulary/RDFSyntax.html#parseTypeCollectionPropertyElt"><code>RDFSyntax.parseTypeCollectionPropertyElt</code></a>)</li>
+(<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/vocabulary/RDFSyntax.html#parseTypeCollectionPropertyElt"><code>RDFSyntax.parseTypeCollectionPropertyElt</code></a>)</li>
<li><a href="http://www.w3.org/TR/rdf-syntax-grammar#idAttr">idAttr</a>
-(<a href="/documentation/javadoc/jena/org/apache/jena/vocabulary/RDFSyntax.html#idAttr"><code>RDFSyntax.idAttr</code></a>)</li>
+(<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/vocabulary/RDFSyntax.html#idAttr"><code>RDFSyntax.idAttr</code></a>)</li>
<li><a href="http://www.w3.org/TR/rdf-syntax-grammar#propertyAttr">propertyAttr</a>
-(<a href="/documentation/javadoc/jena/org/apache/jena/vocabulary/RDFSyntax.html#propertyAttr"><code>RDFSyntax.propertyAttr</code></a>)</li>
+(<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/vocabulary/RDFSyntax.html#propertyAttr"><code>RDFSyntax.propertyAttr</code></a>)</li>
</ul>
<p>In addition <code>"daml:collection"</code>
-(<a href="/documentation/javadoc/jena/org/apache/jena/vocabulary/DAML_OIL.html#collection"><code>DAML_OIL.collection</code></a>)
+(<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/vocabulary/DAML_OIL.html#collection"><code>DAML_OIL.collection</code></a>)
can be blocked. Blocking
<a href="http://www.w3.org/TR/rdf-syntax-grammar#idAttr">idAttr</a> also
blocks
diff --git a/content/documentation/io/rdfxml_howto.html b/content/documentation/io/rdfxml_howto.html
index 5ffef02db..02e99981f 100644
--- a/content/documentation/io/rdfxml_howto.html
+++ b/content/documentation/io/rdfxml_howto.html
@@ -220,20 +220,20 @@ advanced features within the RDF/XML I/O subsystem.</p>
<p>The main I/O methods in Jena use <code>InputStream</code>s and <code>OutputStream</code>s.
This is import to correctly handle character sets.</p>
<p>These methods are found on the
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html"><code>Model</code></a> interface.
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Model.html"><code>Model</code></a> interface.
These are:</p>
<ul>
-<li><a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html"><code>Model</code></a> [<code>read</code>](/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html#read(java.io.InputStream, java.lang.String))<code>(java.io.InputStream in, java.lang.String base)</code>
+<li><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Model.html"><code>Model</code></a> [<code>read</code>](/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Model.html#read(java.io.InputStream, java.lang.String))<code>(java.io.InputStream in, java.lang.String base)</code>
<br />Add statements from an RDF/XML serialization</li>
-<li><a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html"><code>Model</code></a> [<code>read</code>](/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html#read(java.io.InputStream, java.lang.String, java.lang.String))<code>(java.io.InputStream in, java.lang.String base, java.lang.String lang)</code>
+<li><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Model.html"><code>Model</code></a> [<code>read</code>](/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Model.html#read(java.io.InputStream, java.lang.String, java.lang.String))<code>(java.io.InputStream in, java.lang.String base, java.lang.String lang)</code>
<br /> Add RDF statements represented in language <code>lang</code> to the model.</li>
-<li><a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html"><code>Model</code></a> <a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html#read(java.lang.String)"><code>read</code></a><code>(java.lang.String url)</code>
+<li><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Model.html"><code>Model</code></a> <a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Model.html#read(java.lang.String)"><code>read</code></a><code>(java.lang.String url)</code>
<br />Add the RDF statements from an XML document.</li>
-<li><a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html"><code>Model</code></a> <a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html#write(java.io.OutputStream)"><code>write</code></a><code>(java.io.OutputStream out)</code>
+<li><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Model.html"><code>Model</code></a> <a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Model.html#write(java.io.OutputStream)"><code>write</code></a><code>(java.io.OutputStream out)</code>
<br /> Write the model as an XML document.</li>
-<li><a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html"><code>Model</code></a> [<code>write</code>](/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html#write(java.io.OutputStream, java.lang.String))<code>(java.io.OutputStream out, java.lang.String lang)</code>
+<li><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Model.html"><code>Model</code></a> [<code>write</code>](/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Model.html#write(java.io.OutputStream, java.lang.String))<code>(java.io.OutputStream out, java.lang.String lang)</code>
<br />Write a serialized representation of a model in a specified language.</li>
-<li><a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html"><code>Model</code></a> [<code>write</code>](/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html#write(java.io.OutputStream, java.lang.String, java.lang.String))<code>(java.io.OutputStream out, java.lang.String lang, java.lang.String base)</code>
+<li><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Model.html"><code>Model</code></a> [<code>write</code>](/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Model.html#write(java.io.OutputStream, java.lang.String, java.lang.String))<code>(java.io.OutputStream out, java.lang.String lang, java.lang.String base)</code>
<br />Write a serialized representation of a model in a specified language.</li>
</ul>
<p>The built-in languages are <code>"RDF/XML"</code>, <code>"RDF/XML-ABBREV"</code> as well as
@@ -244,9 +244,9 @@ applications, they are useful, see <a href="#reader-writer">below</a>; and
there is every intention to continue to support them. The RDF/XML
parser now checks to see if the <code>Model.read(Reader …)</code> calls
are being abused, and issues
-<a href="/documentation/javadoc/jena/org/apache/jena/rdfxml/xmlinput/ARPErrorNumbers.html#ERR_ENCODING_MISMATCH"><code>ERR_ENCODING_MISMATCH</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdfxml/xmlinput/ARPErrorNumbers.html#ERR_ENCODING_MISMATCH"><code>ERR_ENCODING_MISMATCH</code></a>
and
-<a href="/documentation/javadoc/jena/org/apache/jena/rdfxml/xmlinput/ARPErrorNumbers.html#WARN_ENCODING_MISMATCH"><code>WARN_ENCODING_MISMATCH</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdfxml/xmlinput/ARPErrorNumbers.html#WARN_ENCODING_MISMATCH"><code>WARN_ENCODING_MISMATCH</code></a>
errors. Most incorrect usage of <code>Reader</code>s for RDF/XML input will
result in such errors. Most incorrect usage of <code>Writer</code>s for RDF/XML
output will produce correct XML by using an appropriate XML
@@ -340,15 +340,15 @@ These do not need to be encoded and decoded so a character encoding
does not need to be specified. Other examples are when an advanced
user explicitly wishes to correctly control the encoding.</p>
<ul>
-<li><a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html"><code>Model</code></a> [<code>read</code>](/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html#read(java.io.Reader, java.lang.String))<code>(java.io.Reader reader, java.lang.String base)</code>
+<li><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Model.html"><code>Model</code></a> [<code>read</code>](/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Model.html#read(java.io.Reader, java.lang.String))<code>(java.io.Reader reader, java.lang.String base)</code>
<br />Using this method is often a mistake.</li>
-<li><a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html"><code>Model</code></a> [<code>read</code>](/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html#read(java.io.Reader, java.lang.String, java.lang.String))<code>(java.io.Reader reader, java.lang.String base, java.lang.String lang)</code>
+<li><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Model.html"><code>Model</code></a> [<code>read</code>](/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Model.html#read(java.io.Reader, java.lang.String, java.lang.String))<code>(java.io.Reader reader, java.lang.String base, java.lang.String lang)</code>
<br />Using this method is often a mistake.</li>
-<li><a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html"><code>Model</code></a> <a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html#write(java.io.Writer)"><code>write</code></a><code>(java.io.Writer writer)</code>
+<li><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Model.html"><code>Model</code></a> <a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Model.html#write(java.io.Writer)"><code>write</code></a><code>(java.io.Writer writer)</code>
<br />Caution! Write the model as an XML document.</li>
-<li><a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html"><code>Model</code></a> [<code>write</code>](/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html#write(java.io.Writer, java.lang.String))<code>(java.io.Writer writer, java.lang.String lang)</code>
+<li><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Model.html"><code>Model</code></a> [<code>write</code>](/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Model.html#write(java.io.Writer, java.lang.String))<code>(java.io.Writer writer, java.lang.String lang)</code>
<br /> Caution! Write a serialized representation of a model in a specified language.</li>
-<li><a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html"><code>Model</code></a> [<code>write</code>](/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html#write(java.io.Writer, java.lang.String, java.lang.String))<code>(java.io.Writer writer, java.lang.String lang, java.lang.String base)</code>
+<li><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Model.html"><code>Model</code></a> [<code>write</code>](/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Model.html#write(java.io.Writer, java.lang.String, java.lang.String))<code>(java.io.Writer writer, java.lang.String lang, java.lang.String base)</code>
<br /> Caution! Write a serialized representation of a model in a specified language.</li>
</ul>
<p>Incorrect use of these <code>read(Reader, …)</code> methods results in
@@ -382,32 +382,32 @@ However, to configure it, it is necessary to access an <code>RDFReader</code> or
above.</p>
<p>The four vital calls in the <code>Model</code> interface are:</p>
<ul>
-<li><a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFReader.html"><code>RDFReader</code></a>
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFReaderF.html#getReader()"><code>getReader</code></a><code>()</code>
+<li><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/RDFReader.html"><code>RDFReader</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/RDFReaderF.html#getReader()"><code>getReader</code></a><code>()</code>
<br />Return an RDFReader instance for the default serialization language.</li>
-<li><a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFReader.html"><code>RDFReader</code></a>
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFReaderF.html#getReader(java.lang.String)"><code>getReader</code></a><code>(java.lang.String lang)</code>
+<li><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/RDFReader.html"><code>RDFReader</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/RDFReaderF.html#getReader(java.lang.String)"><code>getReader</code></a><code>(java.lang.String lang)</code>
<br />Return an RDFReader instance for the specified serialization language.</li>
-<li><a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFReader.html"><code>RDFReader</code></a>
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFWriterF.html#getWriter()"><code>getWriter</code></a><code>()</code>
+<li><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/RDFReader.html"><code>RDFReader</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/RDFWriterF.html#getWriter()"><code>getWriter</code></a><code>()</code>
<br />Return an RDFWriter instance for the default serialization language.</li>
-<li><a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFReader.html"><code>RDFReader</code></a>
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFWriterF.html#getWriter(java.lang.String)"><code>getWriter</code></a><code>(java.lang.String lang)</code>
+<li><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/RDFReader.html"><code>RDFReader</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/RDFWriterF.html#getWriter(java.lang.String)"><code>getWriter</code></a><code>(java.lang.String lang)</code>
<br />An RDFWriter instance for the specified serialization language.</li>
</ul>
<p>Each of these calls returns an <code>RDFReader</code> or <code>RDFWriter</code> that can be
used to read or write any <code>Model</code> (not just the one which created
it). As well as the necessary
-[<code>read</code>](/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFReader.html#read(org.apache.jena.rdf.model.Model, java.io.InputStream, java.lang.String))
+[<code>read</code>](/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/RDFReader.html#read(org.apache.jena.rdf.model.Model, java.io.InputStream, java.lang.String))
and
-[<code>write</code>](/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFWriter.html#write(org.apache.jena.rdf.model.Model, java.io.OutputStream, java.lang.String))
+[<code>write</code>](/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/RDFWriter.html#write(org.apache.jena.rdf.model.Model, java.io.OutputStream, java.lang.String))
methods, these interfaces provide:</p>
<ul>
-<li><a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFErrorHandler.html"><code>RDFErrorHandler</code></a>
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFReader.html#setErrorHandler(org.apache.jena.rdf.model.RDFErrorHandler)"><code>setErrorHandler</code></a><code>(</code> <a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFErrorHandler.html">RDFErrorHandler</a> <code>errHandler )</code>
+<li><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/RDFErrorHandler.html"><code>RDFErrorHandler</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/RDFReader.html#setErrorHandler(org.apache.jena.rdf.model.RDFErrorHandler)"><code>setErrorHandler</code></a><code>(</code> <a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/RDFErrorHandler.html">RDFErrorHandler</a> <code>errHandler )</code>
<br />Set an error handler for the reader</li>
<li><code>java.lang.Object</code>
-[<code>setProperty</code>](/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFReader.html#setProperty(java.lang.String, java.lang.Object))<code>(java.lang.String propName, java.lang.Object propValue)</code>
+[<code>setProperty</code>](/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/RDFReader.html#setProperty(java.lang.String, java.lang.Object))<code>(java.lang.String propName, java.lang.Object propValue)</code>
<br />Set the value of a reader property.</li>
</ul>
<p>Setting properties, or the error handler, on an <code>RDFReader</code> or an
@@ -449,15 +449,15 @@ prove easier.</p>
<code>RDFReader</code> and the <code>RDFWriter</code>. N3 has options on the <code>RDFWriter</code>. These
options are detailed below. For RDF/XML they are also found in the
JavaDoc for
-<code>JenaReader.</code>[<code>setProperty</code>](/documentation/javadoc/jena/org/apache/jena/rdfxml/xmlinput/JenaReader.html#setProperty(java.lang.String, java.lang.Object))<code>(String, Object)</code>
+<code>JenaReader.</code>[<code>setProperty</code>](/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdfxml/xmlinput/JenaReader.html#setProperty(java.lang.String, java.lang.Object))<code>(String, Object)</code>
and
-<code>RDFXMLWriterI.</code>[<code>setProperty</code>](/documentation/javadoc/jena/org/apache/jena/xmloutput/RDFXMLWriterI.html#setProperty(java.lang.String, java.lang.Object))<code>(String, Object)</code>.</p>
+<code>RDFXMLWriterI.</code>[<code>setProperty</code>](/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/xmloutput/RDFXMLWriterI.html#setProperty(java.lang.String, java.lang.Object))<code>(String, Object)</code>.</p>
<h2 id="advanced-rdfxml-input">Advanced RDF/XML Input</h2>
<p>For access to these advanced features, first get an <code>RDFReader</code>
object that is an instance of an ARP parser, by using the
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFReaderF.html#getReader()"><code>getReader</code></a><code>()</code>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/RDFReaderF.html#getReader()"><code>getReader</code></a><code>()</code>
method on any <code>Model</code>. It is then configured using the
-[<code>setProperty</code>](/documentation/javadoc/jena/org/apache/jena/rdfxml/xmlinput/JenaReader.html#setProperty(java.lang.String, java.lang.Object))<code>(String, Object)</code>
+[<code>setProperty</code>](/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdfxml/xmlinput/JenaReader.html#setProperty(java.lang.String, java.lang.Object))<code>(String, Object)</code>
method. This changes the properties for parsing RDF/XML. Many of
the properties change the RDF parser, some change the XML parser.
(The Jena RDF/XML parser, ARP, implements the
@@ -465,7 +465,7 @@ the properties change the RDF parser, some change the XML parser.
over a <a href="http://xml.apache.org/xerces2-j/index.html">Xerces2-J</a> XML
parser). However, changing the features and properties of the XML
parser is not likely to be useful, but was easy to implement.</p>
-<p>[<code>setProperty</code>](/documentation/javadoc/jena/org/apache/jena/rdfxml/xmlinput/JenaReader.html#setProperty(java.lang.String, java.lang.Object))<code>(String, Object)</code>
+<p>[<code>setProperty</code>](/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdfxml/xmlinput/JenaReader.html#setProperty(java.lang.String, java.lang.Object))<code>(String, Object)</code>
can be used to set and get:</p>
<ul>
<li>ARP properties
@@ -508,21 +508,21 @@ property.</p>
</tr>
<tr>
<td><code>error-mode</code></td>
-<td><a href="/documentation/javadoc/jena/org/apache/jena/rdfxml/xmlinput/ARPOptions.html#setDefaultErrorMode()"><code>ARPOptions.setDefaultErrorMode()</code></a> <br /><a href="/documentation/javadoc/jena/org/apache/jena/rdfxml/xmlinput/ARPOptions.html#setLaxErrorMode()"><code>ARPOptions.setLaxErrorMode()</code></a><br /><a href="/documentation/javadoc/jena/org/apache/jena/rdfxml/xmlinput/ARPOptions.html#setStrictErrorMode()"><code>ARPOptions.setStrictErrorMode()</code></a><br /><a href= [...]
+<td><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdfxml/xmlinput/ARPOptions.html#setDefaultErrorMode()"><code>ARPOptions.setDefaultErrorMode()</code></a> <br /><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdfxml/xmlinput/ARPOptions.html#setLaxErrorMode()"><code>ARPOptions.setLaxErrorMode()</code></a><br /><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdfxml/xmlinput/ARPOptions.html#setStrictErrorMode()" [...]
<td><code>String</code></td>
<td><code>default</code><br /><code>lax</code><br /><code>strict</code><br /><code>strict-ignore</code><br /><code>strict-warning</code><br /><code>strict-error</code><br /><code>strict-fatal</code></td>
</tr>
<tr>
<td><code>embedding</code></td>
-<td><a href="/documentation/javadoc/jena/org/apache/jena/rdfxml/xmlinput/ARPOptions.html#setEmbedding(boolean)"><code>ARPOptions.setEmbedding(boolean)</code></a> <br />This sets ARP to look for RDF embedded within an enclosing XML document.</td>
+<td><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdfxml/xmlinput/ARPOptions.html#setEmbedding(boolean)"><code>ARPOptions.setEmbedding(boolean)</code></a> <br />This sets ARP to look for RDF embedded within an enclosing XML document.</td>
<td><code>String</code> or <code>Boolean</code></td>
<td><code>true</code><br /><code>false</code></td>
</tr>
<tr>
<td><code>ERR_<XXX></code> <br /><code>WARN_<XXX></code><br /><code>IGN_<XXX></code></td>
-<td>See <a href="/documentation/javadoc/jena/org/apache/jena/rdfxml/xmlinput/ARPErrorNumbers.html"><code>ARPErrorNumbers</code></a> for a complete list of the error conditions detected. Setting one of these properties is equivalent to the method <a href="/documentation/javadoc/jena/org/apache/jena/rdfxml/xmlinput/ARPOptions.html#setErrorMode(int,%20int)"><code>ARPOptions.setErrorMode(int, int)</code></a>. Thus fine-grained control over the behaviour in response to specific error conditio [...]
+<td>See <a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdfxml/xmlinput/ARPErrorNumbers.html"><code>ARPErrorNumbers</code></a> for a complete list of the error conditions detected. Setting one of these properties is equivalent to the method <a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdfxml/xmlinput/ARPOptions.html#setErrorMode(int,%20int)"><code>ARPOptions.setErrorMode(int, int)</code></a>. Thus fine-grained control over the behavi [...]
<td><code>String</code> or <code>Integer</code></td>
-<td><a href="/documentation/javadoc/jena/org/apache/jena/rdfxml/xmlinput/ARPErrorNumbers.html#EM_IGNORE"><code>EM_IGNORE</code></a><br /><a href="/documentation/javadoc/jena/org/apache/jena/rdfxml/xmlinput/ARPErrorNumbers.html#EM_WARNING"><code>EM_WARNING</code></a><br /><a href="/documentation/javadoc/jena/org/apache/jena/rdfxml/xmlinput/ARPErrorNumbers.html#EM_ERROR"><code>EM_ERROR</code></a><br /><a href="/documentation/javadoc/jena/org/apache/jena/rdfxml/xmlinput/ARPErrorNumbers.html [...]
+<td><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdfxml/xmlinput/ARPErrorNumbers.html#EM_IGNORE"><code>EM_IGNORE</code></a><br /><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdfxml/xmlinput/ARPErrorNumbers.html#EM_WARNING"><code>EM_WARNING</code></a><br /><a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdfxml/xmlinput/ARPErrorNumbers.html#EM_ERROR"><code>EM_ERROR</code></a><br /><a href="/documentation/ja [...]
</tr>
</tbody>
</table>
@@ -556,7 +556,7 @@ allow <code>"daml:collection"</code>, the following works:</p>
…
</code></pre>
<p>This is because in strict mode
-<a href="/documentation/javadoc/jena/org/apache/jena/rdfxml/xmlinput/ARPErrorNumbers.html#IGN_DAML_COLLECTION"><code>IGN_DAML_COLLECTION</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdfxml/xmlinput/ARPErrorNumbers.html#IGN_DAML_COLLECTION"><code>IGN_DAML_COLLECTION</code></a>
is treated as an error, and so the second call to <code>setProperty</code>
overwrites the effect of the first.</p>
<p>The IRI rules and resolver can be set on a per-reader basis:</p>
@@ -579,7 +579,7 @@ in.close();
<h3 id="interrupting-arp">Interrupting ARP</h3>
<p>ARP can be interrupted using the <code>Thread.interrupt()</code> method. This
causes an
-<a href="/documentation/javadoc/jena/org/apache/jena/rdfxml/xmlinput/ARPErrorNumbers.html#ERR_INTERRUPTED"><code>ERR_INTERRUPTED</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdfxml/xmlinput/ARPErrorNumbers.html#ERR_INTERRUPTED"><code>ERR_INTERRUPTED</code></a>
error during the parse, which is usually treated as a fatal error.</p>
<p>Here is an illustrative code sample:</p>
<pre><code>ARP a = new ARP();
@@ -610,11 +610,11 @@ equivalent output. <code>RDF/XML-ABBREV</code> is slower, but should produce
more readable XML.</p>
<p>For access to advanced features, first get an RDFWriter object, of
the appropriate language, by using
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFWriterF.html#getWriter(java.lang.String)"><code>getWriter</code></a><code>("RDF/XML")</code>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/RDFWriterF.html#getWriter(java.lang.String)"><code>getWriter</code></a><code>("RDF/XML")</code>
or
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFWriterF.html#getWriter(java.lang.String)"><code>getWriter</code></a><code>("RDF/XML-ABBREV")</code>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/RDFWriterF.html#getWriter(java.lang.String)"><code>getWriter</code></a><code>("RDF/XML-ABBREV")</code>
on any <code>Model</code>. It is then configured using the
-[<code>setProperty</code>](/documentation/javadoc/jena/org/apache/jena/rdfxml/xmlinput/JenaReader.html#setProperty(java.lang.String, java.lang.Object))<code>(String, Object)</code>
+[<code>setProperty</code>](/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdfxml/xmlinput/JenaReader.html#setProperty(java.lang.String, java.lang.Object))<code>(String, Object)</code>
method. This changes the properties for writing RDF/XML.</p>
<h3 id="properties-to-control-rdfxml-output">Properties to Control RDF/XML Output</h3>
<table>
@@ -710,22 +710,22 @@ fragment IDs from [http://www.w3.org/TR/rdf-syntax-grammar](http://www.w3.org/TR
indicating grammar rules that will not be used. Rules that can be blocked are:
<ul>
<li><a href="http://www.w3.org/TR/rdf-syntax-grammar#section-Reification">section-Reification</a>
-(<a href="/documentation/javadoc/jena/org/apache/jena/vocabulary/RDFSyntax.html#sectionReification"><code>RDFSyntax.sectionReification</code></a>)</li>
+(<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/vocabulary/RDFSyntax.html#sectionReification"><code>RDFSyntax.sectionReification</code></a>)</li>
<li><a href="http://www.w3.org/TR/rdf-syntax-grammar#section-List-Expand">section-List-Expand</a>
-(<a href="/documentation/javadoc/jena/org/apache/jena/vocabulary/RDFSyntax.html#sectionListExpand"><code>RDFSyntax.sectionListExpand</code></a>)</li>
+(<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/vocabulary/RDFSyntax.html#sectionListExpand"><code>RDFSyntax.sectionListExpand</code></a>)</li>
<li><a href="http://www.w3.org/TR/rdf-syntax-grammar#parseTypeLiteralPropertyElt">parseTypeLiteralPropertyElt</a>
-(<a href="/documentation/javadoc/jena/org/apache/jena/vocabulary/RDFSyntax.html#parseTypeLiteralPropertyElt"><code>RDFSyntax.parseTypeLiteralPropertyElt</code></a>)</li>
+(<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/vocabulary/RDFSyntax.html#parseTypeLiteralPropertyElt"><code>RDFSyntax.parseTypeLiteralPropertyElt</code></a>)</li>
<li><a href="http://www.w3.org/TR/rdf-syntax-grammar#parseTypeResourcePropertyElt">parseTypeResourcePropertyElt</a>
-(<a href="/documentation/javadoc/jena/org/apache/jena/vocabulary/RDFSyntax.html#parseTypeLiteralPropertyElt"><code>RDFSyntax.parseTypeLiteralPropertyElt</code></a>)</li>
+(<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/vocabulary/RDFSyntax.html#parseTypeLiteralPropertyElt"><code>RDFSyntax.parseTypeLiteralPropertyElt</code></a>)</li>
<li><a href="http://www.w3.org/TR/rdf-syntax-grammar#parseTypeCollectionPropertyElt">parseTypeCollectionPropertyElt</a>
-(<a href="/documentation/javadoc/jena/org/apache/jena/vocabulary/RDFSyntax.html#parseTypeCollectionPropertyElt"><code>RDFSyntax.parseTypeCollectionPropertyElt</code></a>)</li>
+(<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/vocabulary/RDFSyntax.html#parseTypeCollectionPropertyElt"><code>RDFSyntax.parseTypeCollectionPropertyElt</code></a>)</li>
<li><a href="http://www.w3.org/TR/rdf-syntax-grammar#idAttr">idAttr</a>
-(<a href="/documentation/javadoc/jena/org/apache/jena/vocabulary/RDFSyntax.html#idAttr"><code>RDFSyntax.idAttr</code></a>)</li>
+(<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/vocabulary/RDFSyntax.html#idAttr"><code>RDFSyntax.idAttr</code></a>)</li>
<li><a href="http://www.w3.org/TR/rdf-syntax-grammar#propertyAttr">propertyAttr</a>
-(<a href="/documentation/javadoc/jena/org/apache/jena/vocabulary/RDFSyntax.html#propertyAttr"><code>RDFSyntax.propertyAttr</code></a>)</li>
+(<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/vocabulary/RDFSyntax.html#propertyAttr"><code>RDFSyntax.propertyAttr</code></a>)</li>
</ul>
<p>In addition <code>"daml:collection"</code>
-(<a href="/documentation/javadoc/jena/org/apache/jena/vocabulary/DAML_OIL.html#collection"><code>DAML_OIL.collection</code></a>)
+(<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/vocabulary/DAML_OIL.html#collection"><code>DAML_OIL.collection</code></a>)
can be blocked. Blocking
<a href="http://www.w3.org/TR/rdf-syntax-grammar#idAttr">idAttr</a> also
blocks
diff --git a/content/documentation/io/streaming-io.html b/content/documentation/io/streaming-io.html
index 11b02fe24..729660139 100644
--- a/content/documentation/io/streaming-io.html
+++ b/content/documentation/io/streaming-io.html
@@ -208,7 +208,7 @@ Graph graph = RDFParser.source(input).lang(Lang.NQ).toGraph();
</code></pre>
<h2 id="streamrdf">StreamRDF</h2>
<p>The central abstraction is
-<a href="/documentation/javadoc/arq/org/apache/jena/riot/system/StreamRDF.html"><code>StreamRDF</code></a>
+<a href="/documentation/javadoc/arq/org.apache.jena.arq/org/apache/jena/riot/system/StreamRDF.html"><code>StreamRDF</code></a>
which is an interface for streamed RDF data. It covers triples and quads,
and also parser events for prefix settings and base URI declarations.</p>
<pre><code>public interface StreamRDF {
@@ -233,16 +233,16 @@ and also parser events for prefix settings and base URI declarations.</p>
</code></pre>
<p>There are utilities to help:</p>
<ul>
-<li><a href="/documentation/javadoc/arq/org/apache/jena/riot/system/StreamRDFLib.html"><code>StreamRDFLib</code></a> – create <code>StreamRDF</code> objects</li>
-<li><a href="/documentation/javadoc/arq/org/apache/jena/riot/system/StreamRDFOps.html"><code>StreamRDFOps</code></a> – helpers for sending RDF data to <code>StreamRDF</code> objects</li>
+<li><a href="/documentation/javadoc/arq/org.apache.jena.arq/org/apache/jena/riot/system/StreamRDFLib.html"><code>StreamRDFLib</code></a> – create <code>StreamRDF</code> objects</li>
+<li><a href="/documentation/javadoc/arq/org.apache.jena.arq/org/apache/jena/riot/system/StreamRDFOps.html"><code>StreamRDFOps</code></a> – helpers for sending RDF data to <code>StreamRDF</code> objects</li>
</ul>
<h2 id="reading-data">Reading data</h2>
<p>All parsers of RDF syntaxes provided by RIOT are streaming with the
exception of JSON-LD. A JSON object can have members in any order so the
parser may need the whole top-level object in order to have the information
needed for parsing.</p>
-<p>The <a href="/documentation/javadoc/arq/org/apache/jena/riot/RDFDataMgr.html#parse%28org.apache.jena.riot.system.StreamRDF%2C%20java.io.InputStream%2C%20org.apache.jena.riot.Lang%29"><code>parse</code> functions</a>
-of <a href="/documentation/javadoc/arq/org/apache/jena/riot/RDFDataMgr.html">RDFDataMgr</a>
+<p>The <a href="/documentation/javadoc/arq/org.apache.jena.arq/org/apache/jena/riot/RDFDataMgr.html#parse%28org.apache.jena.riot.system.StreamRDF%2C%20java.io.InputStream%2C%20org.apache.jena.riot.Lang%29"><code>parse</code> functions</a>
+of <a href="/documentation/javadoc/arq/org.apache.jena.arq/org/apache/jena/riot/RDFDataMgr.html">RDFDataMgr</a>
directs the output of the parser to a <code>StreamRDF</code>. For example:</p>
<pre><code>StreamRDF destination = ...
RDFDataMgr.parse(destination, "http://example/data.ttl") ;
@@ -259,7 +259,7 @@ syntax for RDF lists.</p>
that is necessarily “less pretty”.
See <a href="rdf-output.html#streamed-block-formats">“Streamed Block Formats”</a>
for details.</p>
-<p>The <a href="/documentation/javadoc/arq/org/apache/jena/riot/system/StreamRDFWriter.html"><code>StreamRDFWriter</code></a>
+<p>The <a href="/documentation/javadoc/arq/org.apache.jena.arq/org/apache/jena/riot/system/StreamRDFWriter.html"><code>StreamRDFWriter</code></a>
class has functions that write graphs and datasets
using a streaming writer and also provides for the creation of
an <code>StreamRDF</code> backed by a stream-based writer</p>
@@ -274,8 +274,8 @@ StreamRDFOps.graphToStream(model.getGraph(), writer) ;
<table>
<thead>
<tr>
-<th><a href="/documentation/javadoc/arq/org/apache/jena/riot/RDFFormat.html">RDFFormat</a></th>
-<th><a href="/documentation/javadoc/arq/org/apache/jena/riot/Lang.html">Lang</a> shortcut</th>
+<th><a href="/documentation/javadoc/arq/org.apache.jena.arq/org/apache/jena/riot/RDFFormat.html">RDFFormat</a></th>
+<th><a href="/documentation/javadoc/arq/org.apache.jena.arq/org/apache/jena/riot/Lang.html">Lang</a> shortcut</th>
</tr>
</thead>
<tbody>
diff --git a/content/documentation/jdbc/drivers.html b/content/documentation/jdbc/drivers.html
index be4c5e0ce..631b571fc 100644
--- a/content/documentation/jdbc/drivers.html
+++ b/content/documentation/jdbc/drivers.html
@@ -327,7 +327,7 @@ via the SPARQL protocol:</p>
<p>All of these may be specified multiple times to specify multiple graph URIs for each.</p>
<p>Then you have the <code>select-results-type</code> and <code>model-results-type</code> which are used to set the MIME
type you’d prefer to have the driver retrieve SPARQL results from the remote endpoints in. If used
-you must set them to formats that ARQ supports, the ARQ <a href="/documentation/javadoc/arq/org/apache/jena/riot/WebContent.html">WebContent</a>
+you must set them to formats that ARQ supports, the ARQ <a href="/documentation/javadoc/arq/org.apache.jena.arq/org/apache/jena/riot/WebContent.html">WebContent</a>
class has constants for the various supported formats.</p>
<h4 id="authentication">Authentication</h4>
<p>There is also comprehensive support for authentication using this driver, the standard JDBC <code>user</code>
diff --git a/content/documentation/jdbc/index.html b/content/documentation/jdbc/index.html
index 25a7c83b0..ada7eb563 100644
--- a/content/documentation/jdbc/index.html
+++ b/content/documentation/jdbc/index.html
@@ -252,7 +252,7 @@ sniffing may not be accurate for the entire result set so can still result in er
<p>The second alternative we refer to as low compatibility and is designed for users who are using the driver
directly and are fully aware that they are writing SPARQL queries and getting SPARQL results. In this mode
we make no effort to type columns in a friendly way instead typing them as <code>Types.JAVA_OBJECT</code> with the Java
-type <code>Node</code> (i.e. the Jena <a href="/documentation/javadoc/jena/org/apache/jena/graph/Node.html">Node</a> class).</p>
+type <code>Node</code> (i.e. the Jena <a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/graph/Node.html">Node</a> class).</p>
<p>Regardless of how you configure to do column typing the core library does it best to allow you to marshal values
into strong types. For example even if using default compatibility and your columns are typed as strings
from a JDBC perspective you can still call <code>getLong("column")</code> and if there is a valid conversion the
diff --git a/content/documentation/notes/model-factory.html b/content/documentation/notes/model-factory.html
index a0acd723b..b6ae61e60 100644
--- a/content/documentation/notes/model-factory.html
+++ b/content/documentation/notes/model-factory.html
@@ -252,7 +252,7 @@ allow the reasoner to digest them before working on the model.</p>
</ul>
<p>From where do you fetch your reasoners? From the
<em>reasoner registry</em>, the class
-<a href="/documentation/javadoc/jena/org/apache/jena/reasoner/ReasonerRegistry.html">ReasonerRegistry</a>.
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/reasoner/ReasonerRegistry.html">ReasonerRegistry</a>.
This allows reasoners to be looked up by name, but also provides
some predefined access methods for well-know reasoners:</p>
<ul>
@@ -282,7 +282,7 @@ in-memory and presents OWL ontologies.</p>
<li>
<p><code>createOntologyModel(OntModelSpec spec, Model base)</code> Creates an
ontology model according the
-<a href="/documentation/javadoc/jena/org/apache/jena/ontology/OntModelSpec.html">OntModelSpec</a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/ontology/OntModelSpec.html">OntModelSpec</a>
<code>spec</code> which presents the ontology of <code>base</code>.</p>
</li>
<li>
@@ -387,7 +387,7 @@ returns that model.</p>
<p>There are other methods, for removing models, additional control
over create <em>vs</em> open, closing the maker, and looking names up; for
those consult the
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/ModelMaker.html">ModelMaker JavaDoc</a>.</p>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/ModelMaker.html">ModelMaker JavaDoc</a>.</p>
<h2 id="miscellany">Miscellany</h2>
<p>Finally, <code>ModelFactory</code> contains a collection of methods for some
special cases not conveniently dealt with elsewhere.</p>
diff --git a/content/documentation/notes/rdf-frames.html b/content/documentation/notes/rdf-frames.html
index 5e1747c78..6ed845159 100644
--- a/content/documentation/notes/rdf-frames.html
+++ b/content/documentation/notes/rdf-frames.html
@@ -371,7 +371,7 @@ converse for properties:</p>
OntProperty.listDeclaringClasses( boolean direct );
</code></pre>
<p>All of the above API methods return a Jena
-<a href="/documentation/javadoc/jena/org/apache/jena/util/iterator/ExtendedIterator.html"><code>ExtendedIterator</code></a>.</p>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/util/iterator/ExtendedIterator.html"><code>ExtendedIterator</code></a>.</p>
<p><strong>Note a change from the Jena 2.1 interface:</strong> the optional Boolean
parameter on <code>listDeclaredProperties</code> has changed name from <code>all</code>
(Jena 2.1 and earlier) to <code>direct</code> (Jena 2.2 and later). The
diff --git a/content/documentation/notes/stream-manager.html b/content/documentation/notes/stream-manager.html
index c8e06f1c7..c43442632 100644
--- a/content/documentation/notes/stream-manager.html
+++ b/content/documentation/notes/stream-manager.html
@@ -272,8 +272,8 @@ logger.location-manager.level = ALL
<h3 id="see-also">See also</h3>
<p>Javadoc:</p>
<ul>
-<li><a href="/documentation/javadoc/arq/org/apache/jena/riot/system/stream/StreamManager.html">StreamManager</a></li>
-<li><a href="/documentation/javadoc/arq/org/apache/jena/riot/system/stream/LocationMapper.html">LocationMapper</a></li>
+<li><a href="/documentation/javadoc/arq/org.apache.jena.arq/org/apache/jena/riot/system/stream/StreamManager.html">StreamManager</a></li>
+<li><a href="/documentation/javadoc/arq/org.apache.jena.arq/org/apache/jena/riot/system/stream/LocationMapper.html">LocationMapper</a></li>
</ul>
</article>
diff --git a/content/documentation/notes/typed-literals.html b/content/documentation/notes/typed-literals.html
index 9281a7bab..185c37578 100644
--- a/content/documentation/notes/typed-literals.html
+++ b/content/documentation/notes/typed-literals.html
@@ -244,7 +244,7 @@ typed literals whose datatype is the special type
<h2 id="basic-api-operations">Basic API operations</h2>
<p>Jena will correctly parse typed literals within RDF/XML, NTriple
and Turtle source files. The same Java object,
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/Literal.html"><code>Literal</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Literal.html"><code>Literal</code></a>
will represent “plain” and “typed” literals. Literal now supports
some new methods:</p>
<ul>
@@ -311,7 +311,7 @@ made it impossible to cache literals in a hash table.</p>
<h2 id="how-datatypes-are-represented">How datatypes are represented</h2>
<p>Datatypes for typed literals are represented by instances of the
interface
-<a href="/documentation/javadoc/jena/org/apache/jena/datatypes/RDFDatatype.html"><code>org.apache.jena.datatypes.RDFDatatype</code></a>.
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/datatypes/RDFDatatype.html"><code>org.apache.jena.datatypes.RDFDatatype</code></a>.
Instances of this interface can be used to parse and serialized
typed data, test for equality and test if a typed or lexical value
is a legal value for this datatype.</p>
@@ -360,7 +360,7 @@ base64Binary date time dateTime duration gDay gMonth gYear
gYearMonth gMonthDay
</code></pre>
<p>These are all available as static member variables from
-<a href="/documentation/javadoc/jena/org/apache/jena/datatypes/xsd/XSDDatatype.html"><code>org.apache.jena.datatypes.xsd.XSDDatatype</code></a>.</p>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/datatypes/xsd/XSDDatatype.html"><code>org.apache.jena.datatypes.xsd.XSDDatatype</code></a>.</p>
<p>Of these types, the following are registered as the default type to
use to represent certain Java classes:</p>
<table>
@@ -460,7 +460,7 @@ Over 12 value of 12 is illegal
standard for how to map the datatype URI to a datatype definition.</p>
<p>Within Jena2 we allow new datatypes to be created and registered by
using the
-<a href="/documentation/javadoc/jena/org/apache/jena/datatypes/TypeMapper.html"><code>TypeMapper</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/datatypes/TypeMapper.html"><code>TypeMapper</code></a>
class.</p>
<p>The easiest way to define a new RDFDatatype is to subclass
BaseDatatype and define implementations for parse, unparse and
diff --git a/content/documentation/ontology/index.html b/content/documentation/ontology/index.html
index a006e4dde..df82d48c9 100644
--- a/content/documentation/ontology/index.html
+++ b/content/documentation/ontology/index.html
@@ -454,17 +454,17 @@ permitted constructs and the names of the classes and properties.</p>
profile it is <code>null</code> since RDFS does not define object properties.</p>
<p>The profile is bound to an <em>ontology model</em>, which is an extended
version of Jena’s
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html"><code>Model</code></a> class.
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Model.html"><code>Model</code></a> class.
The base <code>Model</code> allows access to the statements in a collection of
RDF data.
-<a href="/documentation/javadoc/jena/org/apache/jena/ontology/OntModel.html"><code>OntModel</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/ontology/OntModel.html"><code>OntModel</code></a>
extends this by adding support for the kinds of constructs expected to
be in an ontology: classes (in a class hierarchy), properties (in a
property hierarchy) and individuals.</p>
<p>When you’re working with an
ontology in Jena, all of the state information remains encoded as
RDF triples (accessed as Jena
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/Statement.html"><code>Statement</code>s</a>) stored in the RDF
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Statement.html"><code>Statement</code>s</a>) stored in the RDF
model. The ontology API
doesn’t change the RDF representation of ontologies. What it does
do is add a set of convenience classes and methods that make it
@@ -599,7 +599,7 @@ API throughout the rest of this document.</p>
<p>An ontology model is an extension of the Jena RDF model,
providing extra capabilities for handling ontologies. Ontology
models are created through the Jena
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/ModelFactory.html"><code>ModelFactory</code></a>.
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/ModelFactory.html"><code>ModelFactory</code></a>.
The simplest way to create an ontology model is as follows:</p>
<pre><code>OntModel m = ModelFactory.createOntologyModel();
</code></pre>
@@ -655,14 +655,14 @@ various language profiles are:</p>
</tbody>
</table>
<p>These URI’s are used to look-up the language profile from the
-<a href="/documentation/javadoc/jena/org/apache/jena/ontology/ProfileRegistry.html"><code>ProfileRegistry</code></a>.
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/ontology/ProfileRegistry.html"><code>ProfileRegistry</code></a>.
The profile registry contains public constant declarations so
that you do not have to remember these URI’s. Please note that the
URI’s denoting OWL Lite and OWL DL are not officially sanctioned by
the OWL standard.</p>
<p>Beyond these basic choices, the complexities of configuring an
ontology model are wrapped up in a recipe object called
-<a href="/documentation/javadoc/jena/org/apache/jena/ontology/OntModelSpec.html"><code>OntModelSpec</code></a>.
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/ontology/OntModelSpec.html"><code>OntModelSpec</code></a>.
This specification allows complete control over the configuration
choices for the ontology model, including the language profile in
use, the reasoner, and the means of handling compound documents. A
@@ -779,7 +779,7 @@ number of common recipes are pre-declared as constants in
<p>For details of reasoner capabilities, please see the
<a href="../inference">inference documentation</a> and the Javadoc
for
-<a href="/documentation/javadoc/jena/org/apache/jena/ontology/OntModelSpec.html">OntModelSpec</a>.
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/ontology/OntModelSpec.html">OntModelSpec</a>.
See also further discussion <a href="#inference-intro">below</a>.</p>
<p><strong>Note:</strong> it is primarily the choice of reasoner, rather than the
choice of language profile, which determines which entailments are
@@ -937,7 +937,7 @@ a simple interface that allows different kinds of model storage
on demand. For the database case, this may include passing the
database user-name and password and other connection parameters.
New model makers can be created with the
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/ModelFactory.html"><code>ModelFactory</code></a>.</p>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/ModelFactory.html"><code>ModelFactory</code></a>.</p>
<p>There are two cases in which we may want to create storage for
models on-demand. The first is when creating the <code>OntModel</code> for the
first time. Some variants of <code>createOntologyModel</code> will allocate
@@ -960,7 +960,7 @@ programming interface (<code>Model</code>) with a simple, manageable internal
data structure (<code>Graph</code>). Hence some potential confusion in that
Figure 4, above, refers to a structure containing graphs, but we
use a
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/ModelMaker.html"><code>ModelMaker</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/ModelMaker.html"><code>ModelMaker</code></a>
to generate new stores. The document manager extracts the
appropriate graph from the containing model. Except in cases where
you are extending Jena’s internal structures, you should think of
@@ -987,7 +987,7 @@ fail just because it temporarily does not have Internet access, or
because a previously published ontology has been moved.
To alleviate these commonly
experienced problems, we can use Jena’s
-<a href="/documentation/javadoc/jena/org/apache/jena/util/FileManager.html"><code>FileManager</code></a> to
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/util/FileManager.html"><code>FileManager</code></a> to
manage local indirections, so that an attempt to import a
document from a given published URL means that a local copy of the
document is loaded instead. This may be a file on the local disk, or simply a
@@ -1020,7 +1020,7 @@ side-effect, this mechanism also means that ontologies may be named
with any legal URI (not necessarily resolvable) – so long as the
<code>altURL</code> is itself resolvable.</p>
<p>See the notes on
-<a href="/documentation/javadoc/jena/org/apache/jena/util/FileManager.html"><code>FileManager</code></a> for details of additional options.</p>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/util/FileManager.html"><code>FileManager</code></a> for details of additional options.</p>
<p>In the following example, we use the <code>DocumentManager</code> API to declare that the ESWC
ontology is replicated locally on disk. We then load it using
the normal URL. Assume that the constant <code>JENA</code> has been
@@ -1061,14 +1061,14 @@ by calling <code>clearCache()</code>.</p>
<h2 id="the-generic-ontology-type-ontresource">The generic ontology type: OntResource</h2>
<p>All of the classes in the ontology API that represent ontology
values have
-<a href="/documentation/javadoc/jena/org/apache/jena/ontology/OntResource.html"><code>OntResource</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/ontology/OntResource.html"><code>OntResource</code></a>
as a common super-class. This makes <code>OntResource</code> a good place to
put shared functionality for all such classes, and makes a handy
common return value for general methods. The Java interface
<code>OntResource</code> extends Jena’s RDF
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/Resource.html"><code>Resource</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Resource.html"><code>Resource</code></a>
interface, so any general method that accepts a resource or an
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFNode.html"><code>RDFNode</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/RDFNode.html"><code>RDFNode</code></a>
will also accept an <code>OntResource</code>, and consequently, any other
ontology value.</p>
<p>Some of the common attributes of ontology resources that are
@@ -1238,7 +1238,7 @@ returned.</p>
<h2 id="ontology-classes-and-basic-class-expressions">Ontology classes and basic class expressions</h2>
<p>Classes are the basic building blocks of an ontology. A simple
class is represented in Jena by an
-<a href="/documentation/javadoc/jena/org/apache/jena/ontology/OntClass.html">OntClass</a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/ontology/OntClass.html">OntClass</a>
object. As <a href="#rdf-polymorphism">mentioned above</a>, an ontology class
is a facet of an RDF resource. One way, therefore, to get an
ontology class is to convert a plain RDF resource into
@@ -1370,11 +1370,11 @@ of Java classes that allow you to conveniently manipulate the
properties represented in an ontology model.</p>
<p>A property in an ontology model is an extension of the core Jena
API class
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/Property.html"><code>Property</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Property.html"><code>Property</code></a>
and allows access to the additional information that can be
asserted about properties in an ontology language. The common API
super-class for representing ontology properties in Java is
-<a href="/documentation/javadoc/jena/org/apache/jena/ontology/OntProperty.html"><code>OntProperty</code></a>.
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/ontology/OntProperty.html"><code>OntProperty</code></a>.
Again, using the pattern of add, set, get, list, has, and remove
methods, we can access the following attributes of an
<code>OntProperty</code>:</p>
@@ -1465,10 +1465,10 @@ perform more efficient reasoning over ontologies. OWL also adds an
entailments, and so is useful when annotating ontology documents,
for example.</p>
<p>In Jena, the Java interfaces
-<a href="/documentation/javadoc/jena/org/apache/jena/ontology/ObjectProperty.html"><code>ObjectProperty</code></a>,
-<a href="/documentation/javadoc/jena/org/apache/jena/ontology/DatatypeProperty.html"><code>DatatypeProperty</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/ontology/ObjectProperty.html"><code>ObjectProperty</code></a>,
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/ontology/DatatypeProperty.html"><code>DatatypeProperty</code></a>
and
-<a href="/documentation/javadoc/jena/org/apache/jena/ontology/AnnotationProperty.html"><code>AnnotationProperty</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/ontology/AnnotationProperty.html"><code>AnnotationProperty</code></a>
are sub-types of <code>OntProperty</code>. However, they do not have any
behaviours (methods) particular to themselves. Their existence
allows the more complex sub-types of ObjectProperty – transitive
@@ -1486,7 +1486,7 @@ property, and individual <code>:jane</code> has <code>father :jim</code> and
equivalent to stating that the property has a maximum cardinality
of one.</p>
<p>Being a functional property is represented through the
-<a href="/documentation/javadoc/jena/org/apache/jena/ontology/FunctionalProperty.html"><code>FunctionalProperty</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/ontology/FunctionalProperty.html"><code>FunctionalProperty</code></a>
facet of an ontology property object. If a property is declared
functional (test using the <code>isFunctional()</code> method), then the
method <code>asFunctionalProperty()</code> conveniently returns the functional property
@@ -1497,13 +1497,13 @@ parameter to the <code>createObjectProperty()</code> method on <code>OntModel</c
<h3 id="other-property-types">Other property types</h3>
<p>There are several additional sub-types of ObjectProperty that
represent additional capabilities of ontology properties. A
-<a href="/documentation/javadoc/jena/org/apache/jena/ontology/TransitiveProperty.html"><code>TransitiveProperty</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/ontology/TransitiveProperty.html"><code>TransitiveProperty</code></a>
means that if p is transitive, and we know <code>:a p :b</code> and also
<code>b p :c</code>, we can infer that <code>:a p :c</code>. A
-<a href="/documentation/javadoc/jena/org/apache/jena/ontology/SymmetricProperty.html"><code>SymmetricProperty</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/ontology/SymmetricProperty.html"><code>SymmetricProperty</code></a>
means that if p is symmetric, and we know <code>:a p :b</code>, we can infer
<code>:b p :a</code>. An
-<a href="/documentation/javadoc/jena/org/apache/jena/ontology/InverseFunctionalProperty.html"><code>InverseFunctionalProperty</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/ontology/InverseFunctionalProperty.html"><code>InverseFunctionalProperty</code></a>
means that for any given range element, the domain value is unique.</p>
<p>Given that all properties are <code>RDFNode</code> objects, and therefore
support the <code>as()</code> method, you can use <code>as()</code> to change from an
@@ -1548,7 +1548,7 @@ expression: <em>restrictions</em> and <em>Boolean expressions</em>. We’ll
each in turn.</p>
<h3 id="restriction-class-expressions">Restriction class expressions</h3>
<p>A
-<a href="/documentation/javadoc/jena/org/apache/jena/ontology/Restriction.html">restriction</a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/ontology/Restriction.html">restriction</a>
defines a class by reference to one of the properties of the
individuals that comprise the members of the class, and then
placing some constraint on that property. For example, in a simple
@@ -1755,9 +1755,9 @@ is even more compact:</p>
<p>Although lists are defined in the generic RDF model in Jena, they
are extensively used by the ontology API so we mention them here.
Full details of the methods defined are in the
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFList.html"><code>RDFList</code> javadoc</a>.</p>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/RDFList.html"><code>RDFList</code> javadoc</a>.</p>
<p>Various means of constructing lists are defined in
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html"><code>Model</code></a>, as
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Model.html"><code>Model</code></a>, as
variants on <code>createList</code>. For example, we can construct a list of
three classes as follows:</p>
<pre><code>OntModel m = ModelFactory.createOntModel();
@@ -1782,7 +1782,7 @@ in the list is not considered significant.</p>
<p>Finally, a resource which is a cell in a list sequence will accept
<code>.as( RDFList.class )</code></p>
<p>Once the list has been created or obtained from the model,
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFList.html"><code>RDFList</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/RDFList.html"><code>RDFList</code></a>
methods may be used to access members of the list, iterate over the
list, and so forth. For example:</p>
<pre><code>System.out.println( "List has " + myRDFList.size() + " members:" );
@@ -1850,7 +1850,7 @@ IntersectionClass ukIndustrialConf =
</code></pre>
<p>Union and intersection class expressions are very similar, so
Jena defines a common super-class
-<a href="/documentation/javadoc/jena/org/apache/jena/ontology/BooleanClassDescription.html"><code>BooleanClassDescription</code></a>.
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/ontology/BooleanClassDescription.html"><code>BooleanClassDescription</code></a>.
This class provides access to the <em>operands</em> to the expression. In
the intersection example above, the operands are the two restrictions. The
<code>BooleanClassDescription</code> class allows us to set the operands
@@ -1865,7 +1865,7 @@ class. Recall that a class is a set of individuals. Often, we want
to define the members of the class <em>implicitly</em>: for example, “the class
of UK conferences”. Sometimes it is convenient to define a class
<em>explicitly</em>, by stating the individuals the class contains. An
-<a href="/documentation/javadoc/jena/org/apache/jena/ontology/EnumeratedClass.html">enumerated class</a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/ontology/EnumeratedClass.html">enumerated class</a>
is exactly the class whose members are the given individuals. For
example, we know that the class of PrimaryColours contains exactly
red, green and blue, and no others.</p>
@@ -1900,7 +1900,7 @@ for (Iterator i = UKCountries.listOneOf(); i.hasNext(); ) {
</code></pre>
<p>An OWL <code>DataRange</code> is similar to an enumerated class, except that the members
of the <code>DataRange</code> are literal values, such as integers, dates or strings. See the
-<a href="/documentation/javadoc/jena/org/apache/jena/ontology/DataRange.html"><code>DataRange</code> javadoc</a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/ontology/DataRange.html"><code>DataRange</code> javadoc</a>
for more details.</p>
<h3 id="listing-classes">Listing classes</h3>
<p>In many applications, we need to inspect the set of classes
@@ -1929,7 +1929,7 @@ get a list of named hierarchy root classes, i.e. the named classes
that lie closest to the top of the hierarchy (alternatively: the
shallowest fringe of the hierarchy consisting solely of named
classes), use the
-<a href="/documentation/javadoc/jena/org/apache/jena/ontology/OntTools.html">OntTools</a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/ontology/OntTools.html">OntTools</a>
method <code>namedHierarchyRoots()</code>.</p>
<p>You should also note that it is important to close the iterators
returned from the <code>list...</code> methods, particularly when the underlying
@@ -1955,7 +1955,7 @@ declarations. In OWL Lite and DL, the language terms and the
instance data that the application is working with are kept
separate, by definition of the language. Jena therefore supports a
simple notion of an
-<a href="/documentation/javadoc/jena/org/apache/jena/ontology/Individual.html"><code>Individual</code></a>,
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/ontology/Individual.html"><code>Individual</code></a>,
which is essentially an alias for <code>Resource</code>. While <code>Individual</code>s
are largely synonymous with <code>Resource</code>s, they do provide an
programming interface that is consistent with the other Java
@@ -2001,7 +2001,7 @@ the <em>base URI</em> of the document containing the ontology. The base
URI may be stated in the document through an <code>xml:base</code> declaration
in the XML preamble. The base URI can also be specified when
reading the document via Jena’s Model API (see the <code>read()</code> methods
-on <a href="/documentation/javadoc/jena/org/apache/jena/ontology/OntModel.html"><code>OntModel</code></a>
+on <a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/ontology/OntModel.html"><code>OntModel</code></a>
for reference).</p>
<p>We can attach various meta-data statements to this object to
indicate attributes of the ontology as a whole. The Java object
@@ -2039,7 +2039,7 @@ contains common meta-data properties, such as comment, label and
version information.</p>
<p>In the Jena API, the ontology’s metadata properties can be accessed
through the
-<a href="/documentation/javadoc/jena/org/apache/jena/ontology/Ontology.html"><code>Ontology</code></a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/ontology/Ontology.html"><code>Ontology</code></a>
interface. Suppose we wish to know the list of URI’s that the
ontology imports. First we must obtain the resource representing the
ontology itself:</p>
@@ -2132,7 +2132,7 @@ capabilities are supported, and what the implications for
performance are.</p>
<p>The reasoner attached to an ontology model, if any, is specified
through the
-<a href="/documentation/javadoc/jena/org/apache/jena/ontology/OntModelSpec.html"><code>OntModelSpec</code></a>.
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/ontology/OntModelSpec.html"><code>OntModelSpec</code></a>.
The methods <code>setReasoner()</code> and <code>setReasonerFactory()</code> on the model
spec are used to specify a reasoner. The setReasoner variant is
intended for use on a specification which will only be used to
diff --git a/content/documentation/query/cmds.html b/content/documentation/query/cmds.html
index 01a5f5ea7..82e41ed09 100644
--- a/content/documentation/query/cmds.html
+++ b/content/documentation/query/cmds.html
@@ -248,7 +248,7 @@ wrappers just set the query language.</p>
<li><code>arq.sparql</code> : wrapper for SPARQL queries</li>
<li><code>arq.arq</code> : wrapper for ARQ queries</li>
</ul>
-<p>Running <code>arq.query --help</code>prints the usage message. The main
+<p>Running <code>arq.query --help</code> prints the usage message. The main
arguments are:</p>
<ul>
<li><code>--query FILE</code> : The file with the query to execute</li>
@@ -278,7 +278,7 @@ is broken. Please report this.</p>
print the SPARQL algebra for the query in
<a href="../notes/sse.html">SSE format</a>.</p>
<h3 id="arquparse"><code>arq.uparse</code></h3>
-<p>Parse a SPARQL update print it out.</p>
+<p>Parse a SPARQL update and print it out.</p>
<p><code>arq.uparse</code> will parse the update, print it out again (with line
numbers by default) and then parse the serialized update again. If
your update has a syntax error, a message is printed but no update is
diff --git a/content/documentation/query/construct-quad.html b/content/documentation/query/construct-quad.html
index c827ed2b7..a806d730b 100644
--- a/content/documentation/query/construct-quad.html
+++ b/content/documentation/query/construct-quad.html
@@ -280,7 +280,7 @@ and no complex graph patterns are allowed in the short form). The keyword
<p><code>DatasetClause</code>, <code>WhereClause</code>, <code>SolutionModifier</code>, <code>TriplesTemplate</code>, <code>VarOrIri</code>,
<code>TriplesSameSubject</code> are as for the <a href="http://www.w3.org/TR/sparql11-query/#grammar">SPARQL 1.1 Grammar</a></p>
<h2 id="programming-api">Programming API</h2>
-<p>ARQ provides 2 additional methods in <a href="/documentation/javadoc/arq/org/apache/jena/query/QueryExecution.html">QueryExecution</a> for Construct Quad.</p>
+<p>ARQ provides 2 additional methods in <a href="/documentation/javadoc/arq/org.apache.jena.arq/org/apache/jena/query/QueryExecution.html">QueryExecution</a> for Construct Quad.</p>
<pre><code>Iterator<Quad> QueryExecution.execConstructQuads() // allow duplication
Dataset QueryExecution.execConstructDataset() // no duplication
</code></pre>
@@ -313,7 +313,7 @@ Iterator<Triple> triples = qexec.execConstructTriples();
<p>Jena <a href="/documentation/fuseki2/index.html">Fuseki</a> is also empowered with Construct Quad query as a built-in
function. No more additional configuration is required to switch it on.
Because
-<a href="/documentation/javadoc/arq/org/apache/jena/sparql/engine/http/QueryEngineHTTP.html">QueryEngineHTTP</a>
+<a href="/documentation/javadoc/arq/org.apache.jena.arq/org/apache/jena/sparql/engine/http/QueryEngineHTTP.html">QueryEngineHTTP</a>
is just an implementation of QueryExecution, there’s not much difference
for the client users to manipulate the programming API described in the
previous sections, e.g.</p>
diff --git a/content/documentation/query/generate-json-from-sparql.html b/content/documentation/query/generate-json-from-sparql.html
index 1e91e8ba5..359ea2935 100644
--- a/content/documentation/query/generate-json-from-sparql.html
+++ b/content/documentation/query/generate-json-from-sparql.html
@@ -298,7 +298,7 @@ key/value pair pattern, which could produce the following output for the query a
<p><code>DatasetClause</code>, <code>WhereClause</code>, <code>SolutionModifier</code>, <code>String</code>, <code>Var</code>, ‘RDFLiteral’,
<code>NumericLiteral</code>, and ‘BooleanLiteral’ are as for the <a href="http://www.w3.org/TR/sparql11-query/#grammar">SPARQL 1.1 Grammar</a></p>
<h2 id="programming-api">Programming API</h2>
-<p>ARQ provides 2 additional methods in <a href="/documentation/javadoc/arq/org/apache/jena/query/QueryExecution.html">QueryExecution</a> for JSON.</p>
+<p>ARQ provides 2 additional methods in <a href="/documentation/javadoc/arq/org.apache.jena.arq/org/apache/jena/query/QueryExecution.html">QueryExecution</a> for JSON.</p>
<pre><code>Iterator<JsonObject> QueryExecution.execJsonItems()
JsonArray QueryExecution.execJson()
</code></pre>
diff --git a/content/documentation/query/parameterized-sparql-strings.html b/content/documentation/query/parameterized-sparql-strings.html
index 52b0ae3e2..e09a2e33a 100644
--- a/content/documentation/query/parameterized-sparql-strings.html
+++ b/content/documentation/query/parameterized-sparql-strings.html
@@ -222,7 +222,7 @@ the query with constants and to add prefix and base declarations. A
the <code>asQuery()</code> and <code>asUpdate()</code> methods assuming the command an
instance represents is actually valid as a query/update.</p>
<h2 id="building-parameterised-commands">Building parameterised commands</h2>
-<p>A <a href="/documentation/javadoc/arq/org/apache/jena/query/ParameterizedSparqlString.html">ParameterizedSparqlString</a> is created as follows:</p>
+<p>A <a href="/documentation/javadoc/arq/org.apache.jena.arq/org/apache/jena/query/ParameterizedSparqlString.html">ParameterizedSparqlString</a> is created as follows:</p>
<pre><code>ParameterizedSparqlString pss = new ParameterizedSparqlString();
</code></pre>
<p>There are also constructor overloads that take in an initial command text, parameter values, namespace prefixes etc.
@@ -263,7 +263,7 @@ injection is detected an <code>ARQException</code> will be thrown.</p>
<li>Using JDBC style positional parameters</li>
<li>Appending values directly to the command text being built</li>
</ul>
-<p>See the <a href="/documentation/javadoc/arq/org/apache/jena/query/ParameterizedSparqlString.html">ParameterizedSparqlString</a> javadocs for a comprehensive reference of available methods for setting values,
+<p>See the <a href="/documentation/javadoc/arq/org.apache.jena.arq/org/apache/jena/query/ParameterizedSparqlString.html">ParameterizedSparqlString</a> javadocs for a comprehensive reference of available methods for setting values,
the following sections shows some basic examples of this.</p>
<h4 id="variable-parameters">Variable Parameters</h4>
<p>Any SPARQL variable in the command text may have a value injected to it, injecting a value replaces all usages of
diff --git a/content/documentation/query/writing_propfuncs.html b/content/documentation/query/writing_propfuncs.html
index 9b3caca71..9b546461d 100644
--- a/content/documentation/query/writing_propfuncs.html
+++ b/content/documentation/query/writing_propfuncs.html
@@ -184,7 +184,7 @@
<p><strong>ARQ - Writing Property Functions</strong></p>
<p>See also <a href="writing_functions.html">Writing Filter Functions</a>.</p>
<p>Applications can add SPARQL property functions to the query engine. This is done by first implementing the
-<a href="/documentation/javadoc/arq/org/apache/jena/sparql/pfunction/PropertyFunction.html"><code>PropertyFunction</code></a>
+<a href="/documentation/javadoc/arq/org.apache.jena.arq/org/apache/jena/sparql/pfunction/PropertyFunction.html"><code>PropertyFunction</code></a>
interface, and then either registering that function or using the fake <code>java:</code> URI scheme to dynamically
load the function.</p>
<p><strong>Writing SPARQL Property Functions</strong></p>
@@ -192,7 +192,7 @@ load the function.</p>
that allows a URI to name a function in the query processor. A key difference is that Property Functions may
generate new bindings.</p>
<p>Just like
-<a href="/documentation/javadoc/arq/org/apache/jena/sparql/function/Function.html">org.apache.jena.sparql.function.Function</a>
+<a href="/documentation/javadoc/arq/org.apache.jena.arq/org/apache/jena/sparql/function/Function.html">org.apache.jena.sparql.function.Function</a>
there are various utility classes provided to simplify the creation of a Property Function. The selection of
one depends on the ‘style’ of the desired built-in. For example, <code>PFuncSimple</code> is expected to be the predicate
of triple patterns <code>?such ex:as ?this</code>, where neither argument is an <code>rdf:list</code>, and either may be a variable.
@@ -217,18 +217,18 @@ Alternatively, <code>PFuncAssignToObject</code> assumes that the subject will be
</code></pre>
<p>The choice of extension point determines the function signature that the developer will need to implement, and
primarily determines whether some of the arguments will be
-<a href="/documentation/javadoc/jena/org/apache/jena/graph/Node.html"><code>org.apache.jena.graph.Node</code></a>s or
-<a href="/documentation/javadoc/arq/org/apache/jena/sparql/pfunction/PropFuncArg.html"><code>org.apache.jena.sparql.pfunction.PropFuncArg</code></a>s.
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/graph/Node.html"><code>org.apache.jena.graph.Node</code></a>s or
+<a href="/documentation/javadoc/arq/org.apache.jena.arq/org/apache/jena/sparql/pfunction/PropFuncArg.html"><code>org.apache.jena.sparql.pfunction.PropFuncArg</code></a>s.
In the latter case, the programmer can determine whether the argument is a list as well as how many
arguments it consists of.</p>
<p><strong>Registration</strong></p>
<p>Every property function is associated with a particular
-<a href="/documentation/javadoc/arq/org/apache/jena/sparql/util/Context.html"><code>org.apache.jena.sparql.util.Context</code></a>.
+<a href="/documentation/javadoc/arq/org.apache.jena.arq/org/apache/jena/sparql/util/Context.html"><code>org.apache.jena.sparql.util.Context</code></a>.
This allows you to limit the availability of the function to be global or associated with a particular dataset.
For example, a custom Property Function may expose an index which only has meaning with respect to some set
of data.</p>
<p>Assuming you have an implementation of
-<a href="/documentation/javadoc/arq/org/apache/jena/sparql/pfunction/PropertyFunctionFactory.html"><code>org.apache.jena.sparql.pfunction.PropertyFunctionFactory</code></a>
+<a href="/documentation/javadoc/arq/org.apache.jena.arq/org/apache/jena/sparql/pfunction/PropertyFunctionFactory.html"><code>org.apache.jena.sparql.pfunction.PropertyFunctionFactory</code></a>
(shown later), you can register a function as follows:</p>
<pre><code>final PropertyFunctionRegistry reg = PropertyFunctionRegistry.chooseRegistry(ARQ.getContext());
reg.put("urn:ex:fn#example", new ExamplePropertyFunctionFactory());
@@ -241,7 +241,7 @@ reg.put("urn:ex:fn#example", new ExamplePropertyFunctionFactory());
PropertyFunctionRegistry.set(ds.getContext(), reg);
</code></pre>
<p>Note that
-<a href="/documentation/javadoc/arq/org/apache/jena/sparql/pfunction/PropertyFunctionRegistry.html"><code>org.apache.jena.sparql.pfunction.PropertyFunctionRegistry</code></a>
+<a href="/documentation/javadoc/arq/org.apache.jena.arq/org/apache/jena/sparql/pfunction/PropertyFunctionRegistry.html"><code>org.apache.jena.sparql.pfunction.PropertyFunctionRegistry</code></a>
has other <code>put</code> methods that allow registration by passing a <code>Class</code> object, as well.</p>
<p><strong>Implementation</strong></p>
<p>The implementation of a Property Function is actually quite straight forward once one is aware of the tools
@@ -276,14 +276,14 @@ no valid solutions to return, then an empty solution may be presented.</p>
easy to support typical use cases.</p>
<p>Of particular note:</p>
<ul>
-<li><a href="/documentation/javadoc/arq/org/apache/jena/sparql/engine/iterator/QueryIterNullIterator.html"><code>QueryIterNullIterator</code></a> - to indicate that there are no valid solutions/bindings for the given values</li>
-<li><a href="/documentation/javadoc/arq/org/apache/jena/sparql/engine/iterator/QueryIterSingleton.html"><code>QueryIterSingleton</code></a> - to provide a single solution/binding for the given values</li>
-<li><a href="/documentation/javadoc/arq/org/apache/jena/sparql/engine/iterator/QueryIterPlainWrapper.html"><code>QueryIterPlainWrapper</code></a> - to provide multiple solutions/bindings for the given values</li>
+<li><a href="/documentation/javadoc/arq/org.apache.jena.arq/org/apache/jena/sparql/engine/iterator/QueryIterNullIterator.html"><code>QueryIterNullIterator</code></a> - to indicate that there are no valid solutions/bindings for the given values</li>
+<li><a href="/documentation/javadoc/arq/org.apache.jena.arq/org/apache/jena/sparql/engine/iterator/QueryIterSingleton.html"><code>QueryIterSingleton</code></a> - to provide a single solution/binding for the given values</li>
+<li><a href="/documentation/javadoc/arq/org.apache.jena.arq/org/apache/jena/sparql/engine/iterator/QueryIterPlainWrapper.html"><code>QueryIterPlainWrapper</code></a> - to provide multiple solutions/bindings for the given values</li>
</ul>
<p>The second two cases require instances of <code>Binding</code> objects which can be obtained through static methods of
-<a href="/documentation/javadoc/arq/org/apache/jena/sparql/engine/binding/BindingFactory.html"><code>BindingFactory</code></a>.
-Creation of <code>Binding</code> objects will also require references to <a href="/documentation/javadoc/arq/org/apache/jena/sparql/core/Var.html"><code>Var</code></a>
-and <a href="/documentation/javadoc/jena/org/apache/jena/graph/NodeFactory.html"><code>NodeFactory</code></a></p>
+<a href="/documentation/javadoc/arq/org.apache.jena.arq/org/apache/jena/sparql/engine/binding/BindingFactory.html"><code>BindingFactory</code></a>.
+Creation of <code>Binding</code> objects will also require references to <a href="/documentation/javadoc/arq/org.apache.jena.arq/org/apache/jena/sparql/core/Var.html"><code>Var</code></a>
+and <a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/graph/NodeFactory.html"><code>NodeFactory</code></a></p>
<p>Note that it can make a lot of sense to generate the <code>Iterator<Binding></code> for <code>QueryIterPlainWrapper</code> by means of
Jena’s <code>ExtendedIterator</code>. This can allow domain-specific value to be easily mapped to <code>Binding</code> objects in
a lazy fashion.</p>
diff --git a/content/documentation/rdf/index.html b/content/documentation/rdf/index.html
index 7968c6fa0..78bb4be12 100644
--- a/content/documentation/rdf/index.html
+++ b/content/documentation/rdf/index.html
@@ -313,7 +313,7 @@ are defined by RDF or Turtle: authors of RDF content should ensure that all pref
are defined before use.</p>
<p><strong>Note</strong></p>
<p>Jena does not treat namespaces in a special way. A <code>Model</code> will remember any prefixes defined
-in the input RDF (see the <a href="/documentation/javadoc/jena/org/apache/jena/shared/PrefixMapping.html"><code>PrefixMapping</code></a>
+in the input RDF (see the <a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/shared/PrefixMapping.html"><code>PrefixMapping</code></a>
interface; all Jena <code>Model</code> objects extend <code>PrefixMapping</code>), and the output writers which
serialize a model to XML or Turtle will normally attempt to use prefixes to abbreviate URI’s.
However internally, a <code>Resource</code> URI is not separated into a namespace and local-name pair.
diff --git a/content/download/index.html b/content/download/index.html
index 2c1e2df43..f4bf53f6e 100644
--- a/content/download/index.html
+++ b/content/download/index.html
@@ -205,9 +205,9 @@
</thead>
<tbody>
<tr>
-<td><a href="[preferred]jena/source/jena-4.9.0-source-release.zip">jena-4.9.0-source-release.zip</a></td>
-<td style="text-align:center"><a href="https://downloads.apache.org/jena/source/jena-4.9.0-source-release.zip.sha512">SHA512</a></td>
-<td style="text-align:center"><a href="https://downloads.apache.org/jena/source/jena-4.9.0-source-release.zip.asc">PGP</a></td>
+<td><a href="[preferred]jena/source/jena-4.10.0-source-release.zip">jena-4.10.0-source-release.zip</a></td>
+<td style="text-align:center"><a href="https://downloads.apache.org/jena/source/jena-4.10.0-source-release.zip.sha512">SHA512</a></td>
+<td style="text-align:center"><a href="https://downloads.apache.org/jena/source/jena-4.10.0-source-release.zip.asc">PGP</a></td>
</tr>
</tbody>
</table>
@@ -223,14 +223,14 @@
</thead>
<tbody>
<tr>
-<td><a href="[preferred]jena/binaries/apache-jena-fuseki-4.9.0.tar.gz">apache-jena-fuseki-4.9.0.tar.gz</a></td>
-<td style="text-align:center"><a href="https://downloads.apache.org/jena/binaries/apache-jena-fuseki-4.9.0.tar.gz.sha512">SHA512</a></td>
-<td style="text-align:center"><a href="https://downloads.apache.org/jena/binaries/apache-jena-fuseki-4.9.0.tar.gz.asc">PGP</a></td>
+<td><a href="[preferred]jena/binaries/apache-jena-fuseki-4.10.0.tar.gz">apache-jena-fuseki-4.10.0.tar.gz</a></td>
+<td style="text-align:center"><a href="https://downloads.apache.org/jena/binaries/apache-jena-fuseki-4.10.0.tar.gz.sha512">SHA512</a></td>
+<td style="text-align:center"><a href="https://downloads.apache.org/jena/binaries/apache-jena-fuseki-4.10.0.tar.gz.asc">PGP</a></td>
</tr>
<tr>
-<td><a href="[preferred]jena/binaries/apache-jena-fuseki-4.9.0.zip">apache-jena-fuseki-4.9.0.zip</a></td>
-<td style="text-align:center"><a href="https://downloads.apache.org/jena/binaries/apache-jena-fuseki-4.9.0.zip.sha512">SHA512</a></td>
-<td style="text-align:center"><a href="https://downloads.apache.org/jena/binaries/apache-jena-fuseki-4.9.0.zip.asc">PGP</a></td>
+<td><a href="[preferred]jena/binaries/apache-jena-fuseki-4.10.0.zip">apache-jena-fuseki-4.10.0.zip</a></td>
+<td style="text-align:center"><a href="https://downloads.apache.org/jena/binaries/apache-jena-fuseki-4.10.0.zip.sha512">SHA512</a></td>
+<td style="text-align:center"><a href="https://downloads.apache.org/jena/binaries/apache-jena-fuseki-4.10.0.zip.asc">PGP</a></td>
</tr>
</tbody>
</table>
@@ -246,14 +246,14 @@ The binary distribution of libraries contains the APIs, SPARQL engine, the TDB n
</thead>
<tbody>
<tr>
-<td><a href="[preferred]jena/binaries/apache-jena-4.9.0.tar.gz">apache-jena-4.9.0.tar.gz</a></td>
-<td style="text-align:center"><a href="https://downloads.apache.org/jena/binaries/apache-jena-4.9.0.tar.gz.sha512">SHA512</a></td>
-<td style="text-align:center"><a href="https://downloads.apache.org/jena/binaries/apache-jena-4.9.0.tar.gz.asc">PGP</a></td>
+<td><a href="[preferred]jena/binaries/apache-jena-4.10.0.tar.gz">apache-jena-4.10.0.tar.gz</a></td>
+<td style="text-align:center"><a href="https://downloads.apache.org/jena/binaries/apache-jena-4.10.0.tar.gz.sha512">SHA512</a></td>
+<td style="text-align:center"><a href="https://downloads.apache.org/jena/binaries/apache-jena-4.10.0.tar.gz.asc">PGP</a></td>
</tr>
<tr>
-<td><a href="[preferred]jena/binaries/apache-jena-4.9.0.zip">apache-jena-4.9.0.zip</a></td>
-<td style="text-align:center"><a href="https://downloads.apache.org/jena/binaries/apache-jena-4.9.0.zip.sha512">SHA512</a></td>
-<td style="text-align:center"><a href="https://downloads.apache.org/jena/binaries/apache-jena-4.9.0.zip.asc">PGP</a></td>
+<td><a href="[preferred]jena/binaries/apache-jena-4.10.0.zip">apache-jena-4.10.0.zip</a></td>
+<td style="text-align:center"><a href="https://downloads.apache.org/jena/binaries/apache-jena-4.10.0.zip.sha512">SHA512</a></td>
+<td style="text-align:center"><a href="https://downloads.apache.org/jena/binaries/apache-jena-4.10.0.zip.asc">PGP</a></td>
</tr>
</tbody>
</table>
@@ -269,9 +269,9 @@ The binary distribution of Fuseki as a WAR file:
</thead>
<tbody>
<tr>
-<td><a href="[preferred]jena/binaries/jena-fuseki-war-4.9.0.war">jena-fuseki-war-4.9.0.war</a></td>
-<td style="text-align:center"><a href="https://downloads.apache.org/jena/binaries/jena-fuseki-war-4.9.0.war.sha512">SHA512</a></td>
-<td style="text-align:center"><a href="https://downloads.apache.org/jena/binaries/jena-fuseki-war-4.9.0.war.asc">PGP</a></td>
+<td><a href="[preferred]jena/binaries/jena-fuseki-war-4.10.0.war">jena-fuseki-war-4.10.0.war</a></td>
+<td style="text-align:center"><a href="https://downloads.apache.org/jena/binaries/jena-fuseki-war-4.10.0.war.sha512">SHA512</a></td>
+<td style="text-align:center"><a href="https://downloads.apache.org/jena/binaries/jena-fuseki-war-4.10.0.war.asc">PGP</a></td>
</tr>
</tbody>
</table>
diff --git a/content/help_and_support/index.html b/content/help_and_support/index.html
index 14ffe102b..7a6de1247 100644
--- a/content/help_and_support/index.html
+++ b/content/help_and_support/index.html
@@ -185,8 +185,7 @@ list, please send an email to: <a href="mailto:users-subscribe@jena.apache.org">
to subscribe with. This list is a good place to ask for advice on developing Jena-based
applications, or solving a problem with using Jena. <em>Please see below for notes
on asking good questions</em>. The list is archived at
-<a href="https://lists.apache.org/list.html?users@jena.apache.org">lists.apache.org</a>
-or externally at <a href="https://jena.markmail.org/search/">jena.markmail.org</a></p>
+<a href="https://lists.apache.org/list.html?users@jena.apache.org">lists.apache.org</a>.</p>
<p>The <em>developers</em> list is <code>dev@jena.apache.org</code>. To join this
list, please send an email to: <a href="mailto:dev-subscribe@jena.apache.org">
<code>dev-subscribe@jena.apache.org</code></a> from the email account you want
@@ -221,7 +220,7 @@ is often enough for you to figure out the problem yourself, which is always sati
</li>
<li>
<p><strong>Don’t re-post your question</strong> after only a few hours. People are busy, and may be in a different timezone
-to you. If you’re not sure if your question made it to the list, <a href="https://jena.markmail.org/search/?q=-list%3Aorg.apache.incubator.jena-commits">look in the archive</a>.</p>
+to you. If you’re not sure if your question made it to the list, <a href="https://lists.apache.org/list.html?users@jena.apache.org">look in the archive</a>.</p>
</li>
<li>
<p><strong>Adding lots of exclamation marks</strong> or other punctuation will <strong>not</strong> move your question up the queue. Quite the
diff --git a/content/index.json b/content/index.json
index e9242cab7..fa1c86ce8 100644
--- a/content/index.json
+++ b/content/index.json
@@ -1 +1 @@
-[{"categories":null,"contents":"This page is historical \u0026ldquo;for information only\u0026rdquo; - there is no Apache release of Eyeball and the code has not been updated for Jena3.\nThe original source code is available. So you\u0026rsquo;ve got Eyeball installed and you\u0026rsquo;ve run it on one of your files, and Eyeball doesn\u0026rsquo;t like it. You\u0026rsquo;re not sure why, or what to do about it. Here\u0026rsquo;s what\u0026rsquo;s going on.\nEyeball inspects your model a [...]
\ No newline at end of file
+[{"categories":null,"contents":"This page is historical \u0026ldquo;for information only\u0026rdquo; - there is no Apache release of Eyeball and the code has not been updated for Jena3.\nThe original source code is available. So you\u0026rsquo;ve got Eyeball installed and you\u0026rsquo;ve run it on one of your files, and Eyeball doesn\u0026rsquo;t like it. You\u0026rsquo;re not sure why, or what to do about it. Here\u0026rsquo;s what\u0026rsquo;s going on.\nEyeball inspects your model a [...]
\ No newline at end of file
diff --git a/content/index.xml b/content/index.xml
index df8c97704..f93cc85c0 100644
--- a/content/index.xml
+++ b/content/index.xml
@@ -1246,7 +1246,7 @@ Details of ARP, the Jena RDF/XML parser Quick Introduction The main I/O methods
<description>Legacy Documentation : may not be up-to-date
Original RDF/XML HowTo.
This is a guide to the RDF/XML legacy input subsystem of Jena, ARP.
-Advanced RDF/XML Input For access to these advanced features, first get an RDFReader object that is an instance of an ARP parser, by using the getReader() method on any Model. It is then configured using the [setProperty](/documentation/javadoc/jena/org/apache/jena/rdfxml/xmlinput0/JenaReader.html#setProperty(java.lang.String, java.lang.Object))(String, Object) method. This changes the properties for parsing RDF/XML. Many of the properties change the RDF parser, some change the XML parse [...]
+Advanced RDF/XML Input For access to these advanced features, first get an RDFReader object that is an instance of an ARP parser, by using the getReader() method on any Model. It is then configured using the [setProperty](/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdfxml/xmlinput0/JenaReader.html#setProperty(java.lang.String, java.lang.Object))(String, Object) method. This changes the properties for parsing RDF/XML. Many of the properties change the RDF parser, some [...]
</item>
<item>
diff --git a/content/sitemap.xml b/content/sitemap.xml
index ef4e05f29..8d6bb4afe 100644
--- a/content/sitemap.xml
+++ b/content/sitemap.xml
@@ -15,7 +15,7 @@
<lastmod>2020-02-28T13:09:12+01:00</lastmod>
</url><url>
<loc>https://jena.apache.org/tutorials/rdf_api.html</loc>
- <lastmod>2023-10-19T10:49:49+02:00</lastmod>
+ <lastmod>2023-10-30T12:01:30+00:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/</loc>
<lastmod>2021-07-21T19:48:13+01:00</lastmod>
@@ -51,7 +51,7 @@
<lastmod>2020-02-28T13:09:12+01:00</lastmod>
</url><url>
<loc>https://jena.apache.org/download/</loc>
- <lastmod>2023-07-08T22:28:51+01:00</lastmod>
+ <lastmod>2023-10-30T13:51:53+00:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/archive/sdb/</loc>
<lastmod>2022-11-09T14:16:56+00:00</lastmod>
@@ -87,10 +87,10 @@
<lastmod>2020-02-28T13:09:12+01:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/query/cmds.html</loc>
- <lastmod>2020-05-11T15:00:20+01:00</lastmod>
+ <lastmod>2023-08-02T11:36:58-04:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/query/construct-quad.html</loc>
- <lastmod>2021-11-15T19:40:46+00:00</lastmod>
+ <lastmod>2023-10-30T12:01:30+00:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/query/custom_aggregates.html</loc>
<lastmod>2021-11-15T19:40:46+00:00</lastmod>
@@ -108,7 +108,7 @@
<lastmod>2020-02-28T13:09:12+01:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/query/generate-json-from-sparql.html</loc>
- <lastmod>2020-04-29T21:07:12+01:00</lastmod>
+ <lastmod>2023-10-30T12:01:30+00:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/query/architecture.html</loc>
<lastmod>2021-11-05T08:11:46+00:00</lastmod>
@@ -150,7 +150,7 @@
<lastmod>2020-05-01T11:11:56+12:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/query/writing_propfuncs.html</loc>
- <lastmod>2021-12-09T12:42:21-05:00</lastmod>
+ <lastmod>2023-10-30T12:01:30+00:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/query/support.html</loc>
<lastmod>2020-02-28T13:09:12+01:00</lastmod>
@@ -177,7 +177,7 @@
<lastmod>2020-02-28T13:09:12+01:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/notes/model-factory.html</loc>
- <lastmod>2021-11-05T08:11:46+00:00</lastmod>
+ <lastmod>2023-10-30T12:01:30+00:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/archive/csv/</loc>
<lastmod>2021-11-05T11:40:17+00:00</lastmod>
@@ -201,10 +201,10 @@
<lastmod>2023-04-09T15:11:22+02:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation.html</loc>
- <lastmod>2023-10-30T13:42:11+00:00</lastmod>
+ <lastmod>2023-11-23T00:10:28+01:00</lastmod>
</url><url>
<loc>https://jena.apache.org/download.html</loc>
- <lastmod>2023-07-08T22:28:51+01:00</lastmod>
+ <lastmod>2023-10-30T13:51:53+00:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/notes/event-handler-howto.html</loc>
<lastmod>2023-06-06T21:08:29+02:00</lastmod>
@@ -276,7 +276,7 @@
<lastmod>2021-12-27T19:32:13+00:00</lastmod>
</url><url>
<loc>https://jena.apache.org/help_and_support/</loc>
- <lastmod>2023-04-05T21:19:02+02:00</lastmod>
+ <lastmod>2023-11-23T00:10:28+01:00</lastmod>
</url><url>
<loc>https://jena.apache.org/getting_involved/</loc>
<lastmod>2023-04-10T10:11:44+01:00</lastmod>
@@ -291,7 +291,7 @@
<lastmod>2023-02-05T18:59:30+01:00</lastmod>
</url><url>
<loc>https://jena.apache.org/help_and_support.html</loc>
- <lastmod>2023-04-05T21:19:02+02:00</lastmod>
+ <lastmod>2023-11-23T00:10:28+01:00</lastmod>
</url><url>
<loc>https://jena.apache.org/</loc>
<lastmod>2023-02-05T18:59:30+01:00</lastmod>
@@ -333,10 +333,10 @@
<lastmod>2023-10-30T13:42:11+00:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/jdbc/drivers.html</loc>
- <lastmod>2020-04-29T21:07:12+01:00</lastmod>
+ <lastmod>2023-10-30T12:01:30+00:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/ontology/</loc>
- <lastmod>2022-09-18T23:51:18+12:00</lastmod>
+ <lastmod>2023-10-30T12:01:30+00:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/permissions/</loc>
<lastmod>2020-02-28T13:09:12+01:00</lastmod>
@@ -360,13 +360,13 @@
<lastmod>2023-03-21T21:30:23+00:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/io/rdfxml_howto.html</loc>
- <lastmod>2023-03-21T21:30:23+00:00</lastmod>
+ <lastmod>2023-10-30T12:01:30+00:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/io/rdfxml-input.html</loc>
- <lastmod>2023-03-21T21:30:23+00:00</lastmod>
+ <lastmod>2023-10-30T12:01:30+00:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/io/rdfxml-output.html</loc>
- <lastmod>2023-03-21T21:30:23+00:00</lastmod>
+ <lastmod>2023-10-30T12:01:30+00:00</lastmod>
</url><url>
<loc>https://jena.apache.org/about_jena/roadmap.html</loc>
<lastmod>2023-04-10T10:11:44+01:00</lastmod>
@@ -390,7 +390,7 @@
<lastmod>2023-04-10T10:11:44+01:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/archive/larq/</loc>
- <lastmod>2020-06-28T16:59:07+01:00</lastmod>
+ <lastmod>2023-11-23T00:10:28+01:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/archive/hadoop/artifacts.html</loc>
<lastmod>2021-11-05T11:40:17+00:00</lastmod>
@@ -405,10 +405,10 @@
<lastmod>2020-02-28T13:09:12+01:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/query/parameterized-sparql-strings.html</loc>
- <lastmod>2020-05-01T11:11:56+12:00</lastmod>
+ <lastmod>2023-10-30T12:01:30+00:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/notes/rdf-frames.html</loc>
- <lastmod>2023-01-04T17:37:16-05:00</lastmod>
+ <lastmod>2023-10-30T12:01:30+00:00</lastmod>
</url><url>
<loc>https://jena.apache.org/tutorials/sparql_results.html</loc>
<lastmod>2020-02-28T13:09:12+01:00</lastmod>
@@ -435,13 +435,13 @@
<lastmod>2023-03-21T21:30:23+00:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/io/json-ld-11.html</loc>
- <lastmod>2022-05-04T22:17:27+01:00</lastmod>
+ <lastmod>2023-10-30T12:01:30+00:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/io/rdf-input.html</loc>
- <lastmod>2023-01-07T10:20:20+01:00</lastmod>
+ <lastmod>2023-10-30T12:01:30+00:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/inference/</loc>
- <lastmod>2023-02-05T18:59:30+01:00</lastmod>
+ <lastmod>2023-10-30T12:01:30+00:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/notes/reification.html</loc>
<lastmod>2023-08-15T14:34:21+01:00</lastmod>
@@ -459,7 +459,7 @@
<lastmod>2022-11-16T11:52:14+01:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/io/arp/arp_sax.html</loc>
- <lastmod>2023-03-21T21:30:23+00:00</lastmod>
+ <lastmod>2023-10-30T12:01:30+00:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/tools/schemagen-maven.html</loc>
<lastmod>2020-04-29T21:07:12+01:00</lastmod>
@@ -651,13 +651,13 @@
<lastmod>2022-01-12T17:24:53+00:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/rdf/</loc>
- <lastmod>2022-12-25T22:53:55+01:00</lastmod>
+ <lastmod>2023-10-30T12:01:30+00:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/notes/datasetgraph.html</loc>
<lastmod>2020-05-01T11:11:56+12:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/notes/stream-manager.html</loc>
- <lastmod>2020-06-29T18:06:08+01:00</lastmod>
+ <lastmod>2023-10-30T12:01:30+00:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/ontology/toc-test.html</loc>
<lastmod>2020-02-28T13:09:12+01:00</lastmod>
@@ -690,28 +690,28 @@
<lastmod>2020-02-28T13:09:12+01:00</lastmod>
</url><url>
<loc>https://jena.apache.org/tutorials.html</loc>
- <lastmod>2023-10-19T10:49:49+02:00</lastmod>
+ <lastmod>2023-11-23T00:10:28+01:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/txn/txn.html</loc>
<lastmod>2021-03-26T16:47:58+00:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/notes/typed-literals.html</loc>
- <lastmod>2020-05-01T11:11:56+12:00</lastmod>
+ <lastmod>2023-10-30T12:01:30+00:00</lastmod>
</url><url>
<loc>https://jena.apache.org/tutorials/rdf_api_pt.html</loc>
- <lastmod>2023-02-05T18:59:30+01:00</lastmod>
+ <lastmod>2023-10-30T12:01:30+00:00</lastmod>
</url><url>
<loc>https://jena.apache.org/tutorials/using_jena_with_eclipse_pt.html</loc>
- <lastmod>2022-12-21T14:55:40+01:00</lastmod>
+ <lastmod>2023-11-23T00:10:28+01:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/io/arp/arp_standalone.html</loc>
- <lastmod>2023-03-21T21:30:23+00:00</lastmod>
+ <lastmod>2023-10-30T12:01:30+00:00</lastmod>
</url><url>
<loc>https://jena.apache.org/download/maven.html</loc>
<lastmod>2022-12-21T14:55:40+01:00</lastmod>
</url><url>
<loc>https://jena.apache.org/tutorials/using_jena_with_eclipse.html</loc>
- <lastmod>2022-12-21T14:55:40+01:00</lastmod>
+ <lastmod>2023-11-23T00:10:28+01:00</lastmod>
</url><url>
<loc>https://jena.apache.org/about_jena/</loc>
<lastmod>2022-12-21T14:55:40+01:00</lastmod>
@@ -720,7 +720,7 @@
<lastmod>2022-12-21T14:55:40+01:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/io/streaming-io.html</loc>
- <lastmod>2023-02-20T16:01:22-05:00</lastmod>
+ <lastmod>2023-10-30T12:01:30+00:00</lastmod>
</url><url>
<loc>https://jena.apache.org/documentation/io/rdf-output.html</loc>
<lastmod>2023-08-15T14:34:21+01:00</lastmod>
diff --git a/content/tutorials/rdf_api.html b/content/tutorials/rdf_api.html
index 481c58a9a..8849d3809 100644
--- a/content/tutorials/rdf_api.html
+++ b/content/tutorials/rdf_api.html
@@ -907,9 +907,9 @@ should be reasonably clear that the Models have merged as expected. The
intersection and difference of the Models can be computed in a similar
manner, using the methods <code>.intersection(Model)</code> and
<code>.difference(Model)</code>; see the
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html#difference(org.apache.jena.rdf.model.Model)">difference</a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Model.html#difference(org.apache.jena.rdf.model.Model)">difference</a>
and
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html#intersection(org.apache.jena.rdf.model.Model)">intersection</a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Model.html#intersection(org.apache.jena.rdf.model.Model)">intersection</a>
Javadocs for more details.
</p>
<h2 id="ch-Containers">Containers</h2>
diff --git a/content/tutorials/rdf_api_pt.html b/content/tutorials/rdf_api_pt.html
index e744d1a55..17affd378 100644
--- a/content/tutorials/rdf_api_pt.html
+++ b/content/tutorials/rdf_api_pt.html
@@ -681,9 +681,9 @@ model.write(system.out, "RDF/XML-ABBREV");</pre>
</pre>
<p>Mesmo que você não seja familiarizado com os detalhes da sintaxe RDF/XML, deve ser relativamente claro que os modelos foram unidos como esperado A interseção e a diferença de modelos podem ser computados de maneira semelhante, usando os métodos <code>.intersection(Model)</code> e
<code>.difference(Model)</code>; veja a documentação de
-<a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html#difference(org.apache.jena.rdf.model.Model)">difference</a>
+<a href="/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Model.html#difference(org.apache.jena.rdf.model.Model)">difference</a>
e
-<a href "/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html#intersection(org.apache.jena.rdf.model.Model)">intersection</a>
+<a href "/documentation/javadoc/jena/org.apache.jena.core/org/apache/jena/rdf/model/Model.html#intersection(org.apache.jena.rdf.model.Model)">intersection</a>
para mais detalhes.
</p>
<h2 id="ch-Containers">Containers</h2>
diff --git a/content/tutorials/using_jena_with_eclipse.html b/content/tutorials/using_jena_with_eclipse.html
index bfdc0cd70..a73796bcf 100644
--- a/content/tutorials/using_jena_with_eclipse.html
+++ b/content/tutorials/using_jena_with_eclipse.html
@@ -234,8 +234,7 @@ click on <i>Project</i> / <i>Build All</i>.</p>
<p>Eclipse will display a red icon on the project folders with build problems. We will see now how
to fix these build problems, so Eclipse can successfully build and run the project.</p>
<img src="figures/using_jena_with_eclipse-006.png" class="img-responsive" alt="Eclipse build problems">
-<p>The build problems are related to a known
-<a href="https://jena.markmail.org/thread/hdu22kg6qtgsfpn6#query:+page:1+mid:tl3tfxtmfa3hh734+state:results">issue due to how the project shades Google Guava classes</a>.</p>
+<p>The build problems are related to a known issue due to how the project shades Google Guava classes.</p>
<p>The workaround is to make sure the <i>jena-shaded-guava</i> Maven module remains closed
in Eclipse. You can simply right click on the project, and choose Close. Its icon should
change, indicating it has been closed.</p>
diff --git a/content/tutorials/using_jena_with_eclipse_pt.html b/content/tutorials/using_jena_with_eclipse_pt.html
index 378f49536..f3386d2d6 100644
--- a/content/tutorials/using_jena_with_eclipse_pt.html
+++ b/content/tutorials/using_jena_with_eclipse_pt.html
@@ -204,7 +204,7 @@
<p>Quando o projeto tiver sido importado, o Eclipse deverá começar a construir o projeto automaticamente se você estiver com as configurações padrões, senão você pode clicar em <em>Project</em> / _ Build All_.</p>
<p>O Eclipse mostrará um ícone vermelho nos projetos importados que tiverem problemas. Agora veremos como arrumar estes problemas.</p>
<img src="figures/using_jena_with_eclipse-006.png" class="img-responsive" alt="Eclipse build problems">
-<p>Os problemas são geralmente relacionados a um <a href="https://jena.markmail.org/thread/hdu22kg6qtgsfpn6#query:+page:1+mid:tl3tfxtmfa3hh734+state:results">problema conhecido por como um dos projetos utiliza o Maven Shade Plugin nas classes do Google Guava</a>.</p>
+<p>Os problemas são geralmente relacionados a um problema conhecido por como um dos projetos utiliza o Maven Shade Plugin nas classes do Google Guava.</p>
<p>A solução é garantir que o projeto <em>jena-shaded-guava</em> fique fechado no <em>workspace</em> do Eclipse. Você pode simplesmente clicar com o botão direito sobre o projeto, e escolher <em>Close</em>. O ícone do projeto deverá mudar, indicando que ele foi fechado com sucesso.</p>
<img src="figures/using_jena_with_eclipse-007.png" class="img-responsive" alt="Close jena-shaded-maven module">
<p>Feito isso, é uma boa ideia selecionar a opção para limpar (<em>Clean</em>) todos os projetos abertos, para que o Eclipse então comece a construir os projetos novamente.</p>