You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/07/14 14:51:41 UTC

svn commit: r1690917 [1/2] - in /jena/site/trunk/content: about_jena/ documentation/ documentation/csv/ documentation/hadoop/ documentation/inference/ documentation/io/ documentation/jdbc/ documentation/notes/ documentation/ontology/ documentation/quer...

Author: andy
Date: Tue Jul 14 12:51:40 2015
New Revision: 1690917

URL: http://svn.apache.org/r1690917
Log:
com.hp.hpl.jena -> org.apache.jena

Modified:
    jena/site/trunk/content/about_jena/roadmap.mdtext
    jena/site/trunk/content/documentation/csv/design.mdtext
    jena/site/trunk/content/documentation/hadoop/index.mdtext
    jena/site/trunk/content/documentation/inference/index.mdtext
    jena/site/trunk/content/documentation/io/DOM2Jena.java
    jena/site/trunk/content/documentation/io/arp_sax.mdtext
    jena/site/trunk/content/documentation/io/arp_standalone.mdtext
    jena/site/trunk/content/documentation/io/rdfxml_howto.mdtext
    jena/site/trunk/content/documentation/jdbc/index.mdtext
    jena/site/trunk/content/documentation/migrate_jena2_jena3.mdtext
    jena/site/trunk/content/documentation/notes/event-handler-howto.mdtext
    jena/site/trunk/content/documentation/notes/file-manager.mdtext
    jena/site/trunk/content/documentation/notes/iri.mdtext
    jena/site/trunk/content/documentation/notes/model-factory.mdtext
    jena/site/trunk/content/documentation/notes/rdf-frames.mdtext
    jena/site/trunk/content/documentation/notes/sse.mdtext
    jena/site/trunk/content/documentation/notes/typed-literals.mdtext
    jena/site/trunk/content/documentation/ontology/index.mdtext
    jena/site/trunk/content/documentation/query/algebra.mdtext
    jena/site/trunk/content/documentation/query/app_api.mdtext
    jena/site/trunk/content/documentation/query/architecture.mdtext
    jena/site/trunk/content/documentation/query/explain.mdtext
    jena/site/trunk/content/documentation/query/extension.mdtext
    jena/site/trunk/content/documentation/query/http-auth.mdtext
    jena/site/trunk/content/documentation/query/java-uri.mdtext
    jena/site/trunk/content/documentation/query/library-function.mdtext
    jena/site/trunk/content/documentation/query/library-propfunc.mdtext
    jena/site/trunk/content/documentation/query/logging.mdtext
    jena/site/trunk/content/documentation/query/parameterized-sparql-strings.mdtext
    jena/site/trunk/content/documentation/query/sparql-remote.mdtext
    jena/site/trunk/content/documentation/query/spatial-query.mdtext
    jena/site/trunk/content/documentation/query/support_request.mdtext
    jena/site/trunk/content/documentation/query/text-query.mdtext
    jena/site/trunk/content/documentation/query/writing_functions.mdtext
    jena/site/trunk/content/documentation/query/writing_propfuncs.mdtext
    jena/site/trunk/content/documentation/rdf/index.mdtext
    jena/site/trunk/content/documentation/sdb/dataset_description.mdtext
    jena/site/trunk/content/documentation/sdb/fuseki_integration.mdtext
    jena/site/trunk/content/documentation/serving_data/index.mdtext
    jena/site/trunk/content/documentation/tdb/assembler.mdtext
    jena/site/trunk/content/documentation/tdb/configuration.mdtext
    jena/site/trunk/content/documentation/tdb/optimizer.mdtext
    jena/site/trunk/content/documentation/tools/schemagen.mdtext
    jena/site/trunk/content/tutorials/rdf_api.mdtext
    jena/site/trunk/content/tutorials/rdf_api_pt.mdtext
    jena/site/trunk/content/tutorials/using_jena_with_eclipse_pt.mdtext

Modified: jena/site/trunk/content/about_jena/roadmap.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/about_jena/roadmap.mdtext?rev=1690917&r1=1690916&r2=1690917&view=diff
==============================================================================
--- jena/site/trunk/content/about_jena/roadmap.mdtext (original)
+++ jena/site/trunk/content/about_jena/roadmap.mdtext Tue Jul 14 12:51:40 2015
@@ -1,13 +1,6 @@
 Title: Jena Roadmap
 
-There isn't an official roadmap yet. 
-
-However, you can view a list of the [open issues](https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&jqlQuery=project+%3D+JENA+AND+status+%3D+Open+ORDER+BY+priority+DESC&mode=hide) on JIRA (sorted by priority).
+You can view a list of the [open issues](https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&jqlQuery=project+%3D+JENA+AND+status+%3D+Open+ORDER+BY+priority+DESC&mode=hide) on JIRA (sorted by priority).
 Or, you can look at the [last week activity](https://issues.apache.org/jira/secure/QuickSearch.jspa?searchString=jena+updated:-1w) to get a sense of what people are working on.
 
-The following features are desired or expected, but are not yet underway:
-
- * OWL 2 support in ontology API
- * migrate package names from <code>com.hp</code> to <code>org.apache</code>
-
 Patches and other contributions welcome!

Modified: jena/site/trunk/content/documentation/csv/design.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/csv/design.mdtext?rev=1690917&r1=1690916&r2=1690917&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/csv/design.mdtext (original)
+++ jena/site/trunk/content/documentation/csv/design.mdtext Tue Jul 14 12:51:40 2015
@@ -21,7 +21,7 @@ With special storage, a PropertyTable
 -    can guarantee access orders
 
 More explicitly, `PropertyTable` is designed to be a table of RDF terms, or 
-[Nodes](https://github.com/apache/jena/tree/master/jena-core/src/main/java/com/hp/hpl/jena/graph/Node.java) in Jena. 
+[Nodes](https://github.com/apache/jena/tree/master/jena-core/src/main/java/org/apache/jena/graph/Node.java) in Jena. 
 Each [Column](https://github.com/apache/jena/tree/master/jena-csv/src/main/java/org/apache/jena/propertytable/Column.java) of the `PropertyTable` has an unique columnKey `Node` of the predicate (or p for short).
 Each [Row](https://github.com/apache/jena/tree/master/jena-csv/src/main/java/org/apache/jena/propertytable/Row.java) of the `PropertyTable` has an unique rowKey `Node` of the subject (or s for short).
 You can use `getColumn()` to get the `Column` by its columnKey `Node` of the predicate, while `getRow()` for `Row`.
@@ -36,8 +36,8 @@ Once a `PropertyTable` is built, tabular
 
 ## GraphPropertyTable
 
-`GraphPropertyTable` implements the [Graph](https://github.com/apache/jena/tree/master/jena-core/src/main/java/com/hp/hpl/jena/graph/Graph.java) interface (read-only) over a `PropertyTable`. 
-This is subclass from [GraphBase](https://github.com/apache/jena/tree/master/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/GraphBase.java) and implements `find()`. 
+`GraphPropertyTable` implements the [Graph](https://github.com/apache/jena/tree/master/jena-core/src/main/java/org/apache/jena/graph/Graph.java) interface (read-only) over a `PropertyTable`. 
+This is subclass from [GraphBase](https://github.com/apache/jena/tree/master/jena-core/src/main/java/org/apache/jena/graph/impl/GraphBase.java) and implements `find()`. 
 The `graphBaseFind()`(for matching a `Triple`) and `propertyTableBaseFind()`(for matching a whole `Row`) methods can choose the access route based on the find arguments.
 `GraphPropertyTable` holds/wraps an reference of the `PropertyTable` instance, so that such a `Graph` can be treated in a more table-like fashion.
 

Modified: jena/site/trunk/content/documentation/hadoop/index.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/hadoop/index.mdtext?rev=1690917&r1=1690916&r2=1690917&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/hadoop/index.mdtext (original)
+++ jena/site/trunk/content/documentation/hadoop/index.mdtext Tue Jul 14 12:51:40 2015
@@ -102,7 +102,7 @@ then outputs each node with an initial c
     
     import org.apache.jena.hadoop.rdf.types.NodeWritable;
     import org.apache.jena.hadoop.rdf.types.TripleWritable;
-    import com.hp.hpl.jena.graph.Triple;
+    import org.apache.jena.graph.Triple;
     
     /**
      * A mapper for counting node usages within triples designed primarily for use

Modified: jena/site/trunk/content/documentation/inference/index.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/inference/index.mdtext?rev=1690917&r1=1690916&r2=1690917&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/inference/index.mdtext (original)
+++ jena/site/trunk/content/documentation/inference/index.mdtext Tue Jul 14 12:51:40 2015
@@ -43,7 +43,7 @@ Title: Reasoners and rule engines: Jena
   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/com/hp/hpl/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/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
@@ -52,7 +52,7 @@ Title: Reasoners and rule engines: Jena
   of the Graph SPI, so that any of the different Model interfaces can be constructed
   around an inference Graph. In particular, the <a href="../ontology/index.html">Ontology
   API</a> provides convenient ways to link appropriate reasoners into the <code>OntModel</code>s
-  that it constructs. As part of the general RDF API we also provide an <a href="/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/InfModel.html"><code>InfModel</code></a>,
+  that it constructs. As part of the general RDF API we also provide an <a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/InfModel.html"><code>InfModel</code></a>,
   this is an extension to the normal <code>Model</code> interface that provides
   additional control and access to an underlying inference graph. </p>
 <p>The reasoner API supports the notion of specializing a reasoner by binding
@@ -109,12 +109,12 @@ Title: Reasoners and rule engines: Jena
 
 ####Finding a reasoner
 <p>For each type of reasoner there is a factory class (which conforms to the interface
-  <code><a href="/documentation/javadoc/jena/com/hp/hpl/jena/reasoner/ReasonerFactory.html">ReasonerFactory</a></code>)
+  <code><a href="/documentation/javadoc/jena/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/com/hp/hpl/jena/reasoner/Reasoner.html">Reasoner</a></code>.
+  <code><a href="/documentation/javadoc/jena/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/com/hp/hpl/jena/reasoner/ReasonerRegistry.html">ReasonerRegistry</a></code>
+  a global <code><a href="/documentation/javadoc/jena/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>,
@@ -142,7 +142,7 @@ Title: Reasoners and rule engines: Jena
   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/com/hp/hpl/jena/vocabulary/ReasonerVocabulary.html">ReasonerVocabulary</a></code>
+  below and are predefined in the <code><a href="/documentation/javadoc/jena/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 &quot;true&quot; or &quot;false&quot;,
@@ -161,7 +161,7 @@ Title: Reasoners and rule engines: Jena
   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/com/hp/hpl/jena/rdf/model/ModelFactory.html"><code>ModelFactory</code></a>
+  the <a href="/documentation/javadoc/jena/org/apache/jena/rdf/model/ModelFactory.html"><code>ModelFactory</code></a>
   methods, particularly <code>ModelFactory.createInfModel</code>. </p>
 
 ####Accessing inferences
@@ -376,7 +376,7 @@ Title: Reasoners and rule engines: Jena
   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/com/hp/hpl/jena/vocabulary/ReasonerVocabulary.html"><code>ReasonerVocabulary</code></a>.</p>
+  in <a href="/documentation/javadoc/jena/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>
@@ -384,14 +384,14 @@ Title: Reasoners and rule engines: Jena
 ####<a name="derivations"></a>Derivations
 <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/com/hp/hpl/jena/reasoner/Derivation.html"><code>Derviation</code></a>
+  method. This returns a iterator over a set <a href="/documentation/javadoc/jena/org/apache/jena/reasoner/Derivation.html"><code>Derviation</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/com/hp/hpl/jena/reasoner/rulesys/RuleDerivation.html">RuleDerivation</a></code>.</p>
+  can be accessed - see <code><a href="/documentation/javadoc/jena/org/apache/jena/reasoner/rulesys/RuleDerivation.html">RuleDerivation</a></code>.</p>
 <p>Derviation 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
@@ -1002,7 +1002,7 @@ configuration still leaves something to
 
 ###<a name="OWLconfiguration"></a>OWL Configuration
 <p>This reasoner is accessed using <code>ModelFactory.createOntologyModel</code>
-  with the prebuilt <a href="/documentation/javadoc/jena/com/hp/hpl/jena/ontology/OntModelSpec.html"><code>OntModelSpec</code></a>
+  with the prebuilt <a href="/documentation/javadoc/jena/org/apache/jena/ontology/OntModelSpec.html"><code>OntModelSpec</code></a>
   <code>OWL_MEM_RULE_INF</code> or manually via <code>ReasonerRegistery.getOWLReasoner()</code>.</p>
 <p>There are no OWL-specific configuration parameters though the reasoner supports
   the standard control parameters:</p>
@@ -1256,7 +1256,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/com/hp/hpl/jena/reasoner/rulesys/GenericRuleReasoner.html">GenericRuleReasoner</a></code>.
+  reasoner <code><a href="/documentation/javadoc/jena/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
@@ -1268,9 +1268,9 @@ class B = cardinality(P,1)</pre>
 <p>[<a href="#rules">rule index</a>] [<a href="#index">main index</a>]</p>
 
 ### <a name="RULEsyntax"></a>Rule syntax and structure
-<p>A rule for the rule-based reasoner is defined by a Java <code><a href="/documentation/javadoc/jena/com/hp/hpl/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/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/com/hp/hpl/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/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
@@ -1314,7 +1314,7 @@ term</i>      :=   (<i>node</i>, <i>node
   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/com/hp/hpl/jena/util/PrintUtil.html">PrintUtil</a></code>
+  prefixes is those registered with the <code><a href="/documentation/javadoc/jena/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>
@@ -2060,18 +2060,18 @@ while (i.hasNext()) {
 
 #### Builtins
 <p>Second, the set of procedural builtins can be extended. A builtin should implement
-  the <a href="/documentation/javadoc/jena/com/hp/hpl/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/com/hp/hpl/jena/reasoner/rulesys/builtins/BaseBuiltin.html">BaseBuiltin</a></code>
+  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>
   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/com/hp/hpl/jena/reasoner/rulesys/RuleContext.html">RuleContext</a></code>
+  the supplied <code><a href="/documentation/javadoc/jena/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/com/hp/hpl/jena/reasoner/rulesys/BuiltinRegistry.html"><code>BuiltinRegistry</code></a>
+  with <a href="/documentation/javadoc/jena/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>
@@ -2081,7 +2081,7 @@ while (i.hasNext()) {
   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/com/hp/hpl/jena/reasoner/rulesys/RulePreprocessHook.html"><code>RulePreprocessHook</code></a>
+  and the <a href="/documentation/javadoc/jena/org/apache/jena/reasoner/rulesys/RulePreprocessHook.html"><code>RulePreprocessHook</code></a>
   class for more details.</p>
 <p>[<a href="#index">Index</a>]</p>
 

Modified: jena/site/trunk/content/documentation/io/DOM2Jena.java
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/io/DOM2Jena.java?rev=1690917&r1=1690916&r2=1690917&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/io/DOM2Jena.java (original)
+++ jena/site/trunk/content/documentation/io/DOM2Jena.java Tue Jul 14 12:51:40 2015
@@ -6,8 +6,8 @@ import org.xml.sax.*;
 import org.w3c.dom.*;
 import javax.xml.parsers.*;
 import java.io.*;
-import com.hp.hpl.jena.rdf.arp.*;
-import com.hp.hpl.jena.rdf.model.*;
+import org.apache.jena.rdf.arp.*;
+import org.apache.jena.rdf.model.*;
 
 /**
  * @author Jeremy J. Carroll

Modified: jena/site/trunk/content/documentation/io/arp_sax.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/io/arp_sax.mdtext?rev=1690917&r1=1690916&r2=1690917&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/io/arp_sax.mdtext (original)
+++ jena/site/trunk/content/documentation/io/arp_sax.mdtext Tue Jul 14 12:51:40 2015
@@ -22,23 +22,23 @@ Jena Model.
 
 To read an arbitrary SAX source as triples to be added into a Jena
 model, it is not possible to use a
-`Model.`[`read`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/Model.html#read(java.io.InputStream,%20java.lang.String))()
+`Model.`[`read`](/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html#read(java.io.InputStream,%20java.lang.String))()
 operation. Instead, you construct a SAX event handler of class
-[`SAX2Model`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/SAX2Model.html),
+[`SAX2Model`](/documentation/javadoc/jena/org/apache/jena/rdf/arp/SAX2Model.html),
 using the
-[`create`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/SAX2Model.html#create(java.lang.String,%20com.hp.hpl.jena.rdf.model.Model))
+[`create`](/documentation/javadoc/jena/org/apache/jena/rdf/arp/SAX2Model.html#create(java.lang.String,%20org.apache.jena.rdf.model.Model))
 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
-[`SAX2Model`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/SAX2Model.html)
+[`SAX2Model`](/documentation/javadoc/jena/org/apache/jena/rdf/arp/SAX2Model.html)
 handler.
 
 ## Sample Code
 
 This code uses the Xerces parser as a SAX event stream, and adds
 the triple to a
-[`Model`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/Model.html) using
+[`Model`](/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html) using
 default options.
 
     // Use your own SAX source.
@@ -73,10 +73,10 @@ default options.
 ## Initializing SAX event source
 
 If your SAX event source is a subclass of `XMLReader`, then the
-[installHandlers](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/SAX2RDF.html#installHandlers(org.xml.sax.XMLReader,%20com.hp.hpl.jena.rdf.arp.XMLHandler))
+[installHandlers](/documentation/javadoc/jena/org/apache/jena/rdf/arp/SAX2RDF.html#installHandlers(org.xml.sax.XMLReader,%20org.apache.jena.rdf.arp.XMLHandler))
 static method can be used as shown in the sample. Otherwise, you
 have to do it yourself. The
-[`installHandlers`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/SAX2RDF.html#installHandlers(org.xml.sax.XMLReader,%20com.hp.hpl.jena.rdf.arp.XMLHandler))
+[`installHandlers`](/documentation/javadoc/jena/org/apache/jena/rdf/arp/SAX2RDF.html#installHandlers(org.xml.sax.XMLReader,%20org.apache.jena.rdf.arp.XMLHandler))
 code is like this:
 
     static public void installHandlers(XMLReader rdr, XMLHandler sax2rdf)
@@ -100,11 +100,11 @@ required operations are as above.
 
 ## Error Handler
 
-The [SAX2Model](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/SAX2Model.html)
+The [SAX2Model](/documentation/javadoc/jena/org/apache/jena/rdf/arp/SAX2Model.html)
 handler supports the
-[setErrorHandler](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/RDFReader.html#setErrorHandler(com.hp.hpl.jena.rdf.model.RDFErrorHandler))
+[setErrorHandler](/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFReader.html#setErrorHandler(org.apache.jena.rdf.model.RDFErrorHandler))
 method, from the Jena
-[RDFReader](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/RDFReader.html)
+[RDFReader](/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFReader.html)
 interface. This is used in the same way as that method to control
 error reporting.
 
@@ -114,11 +114,11 @@ allows long jobs to be aborted on user r
 
 ## Options
 
-The [`SAX2Model`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/SAX2Model.html)
+The [`SAX2Model`](/documentation/javadoc/jena/org/apache/jena/rdf/arp/SAX2Model.html)
 handler supports the
-[`setProperty`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/RDFReader.html#setProperty(java.lang.String,%20java.lang.Object))
+[`setProperty`](/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFReader.html#setProperty(java.lang.String,%20java.lang.Object))
 method, from the Jena
-[`RDFReader`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/RDFReader.html)
+[`RDFReader`](/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFReader.html)
 interface. This is used in nearly the same way to have fine grain
 control over ARPs behaviour, particularly over error reporting, see
 the [I/O howto](iohowto.html#arp_properties). Setting SAX or
@@ -132,13 +132,13 @@ and desirable that it knows the correct
 prefixes.
 
 There is a second version of the
-[`create`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/SAX2Model.html#create(java.lang.String,%20com.hp.hpl.jena.rdf.model.Model,%20java.lang.String))
+[`create`](/documentation/javadoc/jena/org/apache/jena/rdf/arp/SAX2Model.html#create(java.lang.String,%20org.apache.jena.rdf.model.Model,%20java.lang.String))
 method, which allows specification of the `xml:lang` value from the
 outer context. If this is inappropriate it is possible, but hard
 work, to synthesis an appropriate SAX event.
 
 For the namespaces prefixes, it is possible to call the
-[`startPrefixMapping`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/SAX2RDF.html#startPrefixMapping(java.lang.String,%20java.lang.String))
+[`startPrefixMapping`](/documentation/javadoc/jena/org/apache/jena/rdf/arp/SAX2RDF.html#startPrefixMapping(java.lang.String,%20java.lang.String))
 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
@@ -150,11 +150,11 @@ events, but nothing untoward is likely i
 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
-[SAX2RDF](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/SAX2RDF.html). The
-[create](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/SAX2RDF.html#create(java.lang.String))
+[SAX2RDF](/documentation/javadoc/jena/org/apache/jena/rdf/arp/SAX2RDF.html). The
+[create](/documentation/javadoc/jena/org/apache/jena/rdf/arp/SAX2RDF.html#create(java.lang.String))
 method on this class does not provide any means of specifying what
 to do with the triples. Instead, the class implements the
-[ARPConfig](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/SAX2RDF.html)
+[ARPConfig](/documentation/javadoc/jena/org/apache/jena/rdf/arp/SAX2RDF.html)
 interface, which permits the setting of handlers and parser
 options, as described in the documentation for using
 [ARP without Jena](standalone.html).
@@ -162,7 +162,7 @@ options, as described in the documentati
 Thus you need to:
 
 1.  Create a SAX2RDF using
-    [SAX2RDF.create()](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/SAX2RDF.html#create(java.lang.String))
+    [SAX2RDF.create()](/documentation/javadoc/jena/org/apache/jena/rdf/arp/SAX2RDF.html#create(java.lang.String))
 2.  Attach your StatementHandler and SAXErrorHandler and optionally
     your NamespaceHandler and ExtendedHandler to the SAX2RDF instance.
 3.  Install the SAX2RDF instance as the SAX handler on your SAX
@@ -177,19 +177,19 @@ This issue has no impact on any other Je
 
 ### Using a DOM as Input to Jena
 
-The [`DOM2Model`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/DOM2Model.html)
+The [`DOM2Model`](/documentation/javadoc/jena/org/apache/jena/rdf/arp/DOM2Model.html)
 subclass of SAX2Model, allows the parsing of a DOM using ARP. The
 procedure to follow is:
 
 -   Construct a `DOM2Model`, using a factory method such as
-    [`createD2M`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/DOM2Model.html#createD2M(java.lang.String,%20com.hp.hpl.jena.rdf.model.Model)),
+    [`createD2M`](/documentation/javadoc/jena/org/apache/jena/rdf/arp/DOM2Model.html#createD2M(java.lang.String,%20org.apache.jena.rdf.model.Model)),
     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).
 -   Set any properties, error handlers etc. on the `DOM2Model`
     object.
 -   The DOM is parsed simply by calling the
-    [`load(Node)`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/DOM2Model.html#load(org.w3c.dom.Node))
+    [`load(Node)`](/documentation/javadoc/jena/org/apache/jena/rdf/arp/DOM2Model.html#load(org.w3c.dom.Node))
     method.
 
 ### Using a DOM as Input to ARP

Modified: jena/site/trunk/content/documentation/io/arp_standalone.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/io/arp_standalone.mdtext?rev=1690917&r1=1690916&r2=1690917&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/io/arp_standalone.mdtext (original)
+++ jena/site/trunk/content/documentation/io/arp_standalone.mdtext Tue Jul 14 12:51:40 2015
@@ -19,21 +19,21 @@ standalone.
 To load an RDF file:
 
 1.  Create an
-    [ARP](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/ARP.html#ARP()) instance.
+    [ARP](/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARP.html#ARP()) instance.
 2.  Set parse options, particularly error detection control, using
-    [getOptions](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/ARPConfig.html#getOptions())
+    [getOptions](/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPConfig.html#getOptions())
     or
-    [setOptionsWith](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/ARPConfig.html#setOptionsWith(com.hp.hpl.jena.rdf.arp.ARPOptions)).
+    [setOptionsWith](/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPConfig.html#setOptionsWith(org.apache.jena.rdf.arp.ARPOptions)).
 3.  Set its handlers, by calling the
-    [getHandlers](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/ARPConfig.html#getHandlers())
+    [getHandlers](/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPConfig.html#getHandlers())
     or
-    [setHandlersWith](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/ARPConfig.html#setHandlersWith(com.hp.hpl.jena.rdf.arp.ARPHandlers))
+    [setHandlersWith](/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPConfig.html#setHandlersWith(org.apache.jena.rdf.arp.ARPHandlers))
     methods, and then.
     -   Setting the
-        [statement handler](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/ARPHandlers.html#setStatementHandler(com.hp.hpl.jena.rdf.arp.StatementHandler)).
+        [statement handler](/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPHandlers.html#setStatementHandler(org.apache.jena.rdf.arp.StatementHandler)).
     -   Optionally setting the other handlers.
 4.  Call a
-    [load](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/ARP.html#load(java.io.InputStream,%20java.lang.String))
+    [load](/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARP.html#load(java.io.InputStream,%20java.lang.String))
     method
 
 Xerces is used for parsing the XML. The SAXEvents generated by
@@ -102,22 +102,22 @@ ARP reports events concerning:
 
 User code is needed to respond to any of these events of interest.
 This is written by implementing any of the relevant interfaces:
-[StatementHandler](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/StatementHandler.html),
+[StatementHandler](/documentation/javadoc/jena/org/apache/jena/rdf/arp/StatementHandler.html),
 org.xml.sax.ErrorHandler,
-[NamespaceHandler](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/NamespaceHandler.html),
+[NamespaceHandler](/documentation/javadoc/jena/org/apache/jena/rdf/arp/NamespaceHandler.html),
 and
-[ExtendedHandler](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/ExtendedHandler.html).
+[ExtendedHandler](/documentation/javadoc/jena/org/apache/jena/rdf/arp/ExtendedHandler.html).
 
 An individual handler is set by calling the
-[getHandlers](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/ARPConfig.html#getHandlers())
+[getHandlers](/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPConfig.html#getHandlers())
 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.
-[setStatementHandler](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/ARPHandlers.html#setStatementHandler(com.hp.hpl.jena.rdf.arp.StatementHandler)).
+[setStatementHandler](/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPHandlers.html#setStatementHandler(org.apache.jena.rdf.arp.StatementHandler)).
 
 All the handlers can be copied from one ARP instance to another by
 using the
-[setHandlersWith](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/ARPConfig.html#setHandlersWith(com.hp.hpl.jena.rdf.arp.ARPHandlers))
+[setHandlersWith](/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPConfig.html#setHandlersWith(org.apache.jena.rdf.arp.ARPHandlers))
 method:
 
      ARP from, to;
@@ -128,7 +128,7 @@ method:
 
 The error handler reports both XML and RDF errors, the former
 detected by Xerces. See
-[ARPHandlers.setErrorHandler](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/ARPHandlers.html#setErrorHandler(org.xml.sax.ErrorHandler))
+[ARPHandlers.setErrorHandler](/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPHandlers.html#setErrorHandler(org.xml.sax.ErrorHandler))
 for details of how to distinguish between them.
 
 ## Configuring ARP
@@ -144,9 +144,9 @@ whole file as RDF anyway, or to scan the
 
 As with the handlers, there is an options object that encapsulates
 these settings. It can be accessed using
-[`getOptions`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/ARPConfig.html#getOptions()),
+[`getOptions`](/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPConfig.html#getOptions()),
 and then individual settings can be made using the methods in
-[`ARPOptions`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/ARPOptions.html).
+[`ARPOptions`](/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPOptions.html).
 
 It is also possible to copy all the option settings from one ARP
 instance to another:
@@ -172,8 +172,8 @@ non-Xerces parser, or from an in-memory
 tree.
 
 Instead of an ARP instance, you create an instance of
-[SAX2RDF](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/SAX2RDF.html) using
-the [newInstance](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/SAX2RDF.html#newInstance(java.lang.String))
+[SAX2RDF](/documentation/javadoc/jena/org/apache/jena/rdf/arp/SAX2RDF.html) using
+the [newInstance](/documentation/javadoc/jena/org/apache/jena/rdf/arp/SAX2RDF.html#newInstance(java.lang.String))
 method. This can be configured just like an ARP instance, following
 the initialization section of the [sample code](#sample).
 
@@ -184,8 +184,8 @@ This is used like a SAX2Model instance a
 
 For very large files, ARP does not use any additional memory except
 when either the
-[ExtendedHandler.discardNodesWithNodeID](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/ExtendedHandler.html#discardNodesWithNodeID())
+[ExtendedHandler.discardNodesWithNodeID](/documentation/javadoc/jena/org/apache/jena/rdf/arp/ExtendedHandler.html#discardNodesWithNodeID())
 returns false or when the
-[AResource.setUserData](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/AResource.html#setUserData(java.lang.Object))
+[AResource.setUserData](/documentation/javadoc/jena/org/apache/jena/rdf/arp/AResource.html#setUserData(java.lang.Object))
 method has been used. In these cases ARP needs to remember the
 `rdf:nodeID` usage through the file life time.

Modified: jena/site/trunk/content/documentation/io/rdfxml_howto.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/io/rdfxml_howto.mdtext?rev=1690917&r1=1690916&r2=1690917&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/io/rdfxml_howto.mdtext (original)
+++ jena/site/trunk/content/documentation/io/rdfxml_howto.mdtext Tue Jul 14 12:51:40 2015
@@ -27,20 +27,20 @@ The main I/O methods in Jena use `InputS
 This is import to correctly handle character sets.
 
 These methods are found on the
-[`Model`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/Model.html) interface.
+[`Model`](/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html) interface.
 These are:
 
-- [`Model`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/Model.html) [`read`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/Model.html#read(java.io.InputStream, java.lang.String))`(java.io.InputStream in, java.lang.String base)`
+- [`Model`](/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html) [`read`](/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html#read(java.io.InputStream, java.lang.String))`(java.io.InputStream in, java.lang.String base)`
   <br />Add statements from an RDF/XML serialization
-- [`Model`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/Model.html) [`read`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/Model.html#read(java.io.InputStream, java.lang.String, java.lang.String))`(java.io.InputStream in, java.lang.String base, java.lang.String lang)`
+- [`Model`](/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html) [`read`](/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html#read(java.io.InputStream, java.lang.String, java.lang.String))`(java.io.InputStream in, java.lang.String base, java.lang.String lang)`
   <br /> Add RDF statements represented in language `lang` to the model.
-- [`Model`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/Model.html) [`read`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/Model.html#read(java.lang.String))`(java.lang.String url)`
+- [`Model`](/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html) [`read`](/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html#read(java.lang.String))`(java.lang.String url)`
   <br />Add the RDF statements from an XML document.
-- [`Model`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/Model.html) [`write`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/Model.html#write(java.io.OutputStream))`(java.io.OutputStream out)`
+- [`Model`](/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html) [`write`](/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html#write(java.io.OutputStream))`(java.io.OutputStream out)`
   <br /> Write the model as an XML document.
-- [`Model`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/Model.html) [`write`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/Model.html#write(java.io.OutputStream, java.lang.String))`(java.io.OutputStream out, java.lang.String lang)`
+- [`Model`](/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html) [`write`](/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html#write(java.io.OutputStream, java.lang.String))`(java.io.OutputStream out, java.lang.String lang)`
   <br />Write a serialized representation of a model in a specified language.
-- [`Model`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/Model.html) [`write`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/Model.html#write(java.io.OutputStream, java.lang.String, java.lang.String))`(java.io.OutputStream out, java.lang.String lang, java.lang.String base)`
+- [`Model`](/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html) [`write`](/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html#write(java.io.OutputStream, java.lang.String, java.lang.String))`(java.io.OutputStream out, java.lang.String lang, java.lang.String base)`
   <br />Write a serialized representation of a model in a specified language.
 
 The built-in languages are `"RDF/XML"`, `"RDF/XML-ABBREV"` as well as 
@@ -52,9 +52,9 @@ applications, they are useful, see [belo
 there is every intention to continue to support them. The RDF/XML
 parser now checks to see if the `Model.read(Reader …)` calls
 are being abused, and issues
-[`ERR_ENCODING_MISMATCH`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/ARPErrorNumbers.html#ERR_ENCODING_MISMATCH)
+[`ERR_ENCODING_MISMATCH`](/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPErrorNumbers.html#ERR_ENCODING_MISMATCH)
 and
-[`WARN_ENCODING_MISMATCH`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/ARPErrorNumbers.html#WARN_ENCODING_MISMATCH)
+[`WARN_ENCODING_MISMATCH`](/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPErrorNumbers.html#WARN_ENCODING_MISMATCH)
 errors. Most incorrect usage of `Reader`s for RDF/XML input will
 result in such errors. Most incorrect usage of `Writer`s for RDF/XML
 output will produce correct XML by using an appropriate XML
@@ -169,15 +169,15 @@ These do not need to be encoded and deco
 does not need to be specified. Other examples are when an advanced
 user explicitly wishes to correctly control the encoding.
 
-- [`Model`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/Model.html) [`read`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/Model.html#read(java.io.Reader, java.lang.String))`(java.io.Reader reader, java.lang.String base)`
+- [`Model`](/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html) [`read`](/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html#read(java.io.Reader, java.lang.String))`(java.io.Reader reader, java.lang.String base)`
 <br />Using this method is often a mistake.
-- [`Model`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/Model.html) [`read`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/Model.html#read(java.io.Reader, java.lang.String, java.lang.String))`(java.io.Reader reader, java.lang.String base, java.lang.String lang)`
+- [`Model`](/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html) [`read`](/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html#read(java.io.Reader, java.lang.String, java.lang.String))`(java.io.Reader reader, java.lang.String base, java.lang.String lang)`
 <br />Using this method is often a mistake.
-- [`Model`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/Model.html) [`write`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/Model.html#write(java.io.Writer))`(java.io.Writer writer)`
+- [`Model`](/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html) [`write`](/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html#write(java.io.Writer))`(java.io.Writer writer)`
 <br />Caution! Write the model as an XML document.
-- [`Model`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/Model.html) [`write`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/Model.html#write(java.io.Writer, java.lang.String))`(java.io.Writer writer, java.lang.String lang)`
+- [`Model`](/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html) [`write`](/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html#write(java.io.Writer, java.lang.String))`(java.io.Writer writer, java.lang.String lang)`
 <br /> Caution! Write a serialized representation of a model in a specified language.
-- [`Model`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/Model.html) [`write`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/Model.html#write(java.io.Writer, java.lang.String, java.lang.String))`(java.io.Writer writer, java.lang.String lang, java.lang.String base)`
+- [`Model`](/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html) [`write`](/documentation/javadoc/jena/org/apache/jena/rdf/model/Model.html#write(java.io.Writer, java.lang.String, java.lang.String))`(java.io.Writer writer, java.lang.String lang, java.lang.String base)`
 <br /> Caution! Write a serialized representation of a model in a specified language.
 
 Incorrect use of these `read(Reader, …)` methods results in
@@ -214,32 +214,32 @@ above.
 
 The four vital calls in the `Model` interface are:
 
-- [`RDFReader`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/RDFReader.html)
-[`getReader`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/RDFReaderF.html#getReader())`()`
+- [`RDFReader`](/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFReader.html)
+[`getReader`](/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFReaderF.html#getReader())`()`
 <br />Return an RDFReader instance for the default serialization language.
-- [`RDFReader`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/RDFReader.html)
-[`getReader`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/RDFReaderF.html#getReader(java.lang.String))`(java.lang.String lang)`
+- [`RDFReader`](/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFReader.html)
+[`getReader`](/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFReaderF.html#getReader(java.lang.String))`(java.lang.String lang)`
 <br />Return an RDFReader instance for the specified serialization language.
-- [`RDFReader`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/RDFReader.html)
-[`getWriter`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/RDFWriterF.html#getWriter())`()`
+- [`RDFReader`](/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFReader.html)
+[`getWriter`](/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFWriterF.html#getWriter())`()`
 <br />Return an RDFWriter instance for the default serialization language.
-- [`RDFReader`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/RDFReader.html)
-[`getWriter`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/RDFWriterF.html#getWriter(java.lang.String))`(java.lang.String lang)`
+- [`RDFReader`](/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFReader.html)
+[`getWriter`](/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFWriterF.html#getWriter(java.lang.String))`(java.lang.String lang)`
 <br />An RDFWriter instance for the specified serialization language.
 
 Each of these calls returns an `RDFReader` or `RDFWriter` that can be
 used to read or write any `Model` (not just the one which created
 it). As well as the necessary
-[`read`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/RDFReader.html#read(com.hp.hpl.jena.rdf.model.Model, java.io.InputStream, java.lang.String))
+[`read`](/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFReader.html#read(org.apache.jena.rdf.model.Model, java.io.InputStream, java.lang.String))
 and
-[`write`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/RDFWriter.html#write(com.hp.hpl.jena.rdf.model.Model, java.io.OutputStream, java.lang.String))
+[`write`](/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFWriter.html#write(org.apache.jena.rdf.model.Model, java.io.OutputStream, java.lang.String))
 methods, these interfaces provide:
 
-- [`RDFErrorHandler`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/RDFErrorHandler.html)
-[`setErrorHandler`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/RDFReader.html#setErrorHandler(com.hp.hpl.jena.rdf.model.RDFErrorHandler))`(` [RDFErrorHandler](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/RDFErrorHandler.html) `errHandler )`
+- [`RDFErrorHandler`](/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFErrorHandler.html)
+[`setErrorHandler`](/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFReader.html#setErrorHandler(org.apache.jena.rdf.model.RDFErrorHandler))`(` [RDFErrorHandler](/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFErrorHandler.html) `errHandler )`
 <br />Set an error handler for the reader
 - `java.lang.Object`
-[`setProperty`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/RDFReader.html#setProperty(java.lang.String, java.lang.Object))`(java.lang.String propName, java.lang.Object propValue)`
+[`setProperty`](/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFReader.html#setProperty(java.lang.String, java.lang.Object))`(java.lang.String propName, java.lang.Object propValue)`
 <br />Set the value of a reader property.
 
 Setting properties, or the error handler, on an `RDFReader` or an
@@ -284,17 +284,17 @@ For RDF/XML and RDF/XML-ABBREV, there ar
 `RDFReader` and the `RDFWriter`. N3 has options on the `RDFWriter`. These
 options are detailed below. For RDF/XML they are also found in the
 JavaDoc for
-`JenaReader.`[`setProperty`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/JenaReader.html#setProperty(java.lang.String, java.lang.Object))`(String, Object)`
+`JenaReader.`[`setProperty`](/documentation/javadoc/jena/org/apache/jena/rdf/arp/JenaReader.html#setProperty(java.lang.String, java.lang.Object))`(String, Object)`
 and
-`RDFXMLWriterI.`[`setProperty`](/documentation/javadoc/jena/com/hp/hpl/jena/xmloutput/RDFXMLWriterI.html#setProperty(java.lang.String, java.lang.Object))`(String, Object)`.
+`RDFXMLWriterI.`[`setProperty`](/documentation/javadoc/jena/org/apache/jena/xmloutput/RDFXMLWriterI.html#setProperty(java.lang.String, java.lang.Object))`(String, Object)`.
 
 ## 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`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/RDFReaderF.html#getReader())`()`
+[`getReader`](/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFReaderF.html#getReader())`()`
 method on any `Model`. It is then configured using the
-[`setProperty`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/JenaReader.html#setProperty(java.lang.String, java.lang.Object))`(String, Object)`
+[`setProperty`](/documentation/javadoc/jena/org/apache/jena/rdf/arp/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 parser.
 (The Jena RDF/XML parser, ARP, implements the
@@ -303,7 +303,7 @@ over a [Xerces2-J](http://xml.apache.org
 parser). However, changing the features and properties of the XML
 parser is not likely to be useful, but was easy to implement.
 
-[`setProperty`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/JenaReader.html#setProperty(java.lang.String, java.lang.Object))`(String, Object)`
+[`setProperty`](/documentation/javadoc/jena/org/apache/jena/rdf/arp/JenaReader.html#setProperty(java.lang.String, java.lang.Object))`(String, Object)`
 can be used to set and get:
 
 - ARP properties
@@ -334,9 +334,9 @@ ARP property names and string values are
 Property Name | Description | Value class | Legal Values
 ------------- | ----------- | ----------- | ------------
 `iri-rules` | Set the engine for checking and resolving. `"strict"` sets the IRI engine with rules for valid IRIs, XLink and RDF; it does not permit spaces in IRIs. `"iri"`sets the IRI engine to IRI ([RFC 3986](http://www.ietf.org/rfc/rfc3986.txt), [RFC 3987](http://www.ietf.org/rfc/rfc3987.txt)) `.` The default is `"lax"`(for backwards compatibility)`,` the rules for RDF URI references only, which does permit spaces although the use of spaces is not good practice. | String | `lax`<br />`strict`<br />`iri`
-`error-mode`| [`ARPOptions.setDefaultErrorMode()`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/ARPOptions.html#setDefaultErrorMode()) <br />[`ARPOptions.setLaxErrorMode()`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/ARPOptions.html#setLaxErrorMode())<br />[`ARPOptions.setStrictErrorMode()`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/ARPOptions.html#setStrictErrorMode())<br />[`ARPOptions.setStrictErrorMode(int)`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/ARPOptions.html#setStrictErrorMode(int))<br />  This allows a coarse-grained approach to control of error handling. Setting this property is equivalent to setting many of the fine-grained error handling properties. | `String` | `default`<br />`lax`<br />`strict`<br />`strict-ignore`<br />`strict-warning`<br />`strict-error`<br />`strict-fatal`
-`embedding` | [`ARPOptions.setEmbedding(boolean)`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/ARPOptions.html#setEmbedding(boolean)) <br />This sets ARP to look for RDF embedded within an enclosing XML document. | `String` or `Boolean` | `true`<br />`false`
-`ERR_<XXX>` <br />`WARN_<XXX>`<br />`IGN_<XXX>` | See [`ARPErrorNumbers`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/ARPErrorNumbers.html) for a complete list of the error conditions detected. Setting one of these properties is equivalent to the method [`ARPOptions.setErrorMode(int, int)`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/ARPOptions.html#setErrorMode(int,%20int)). Thus fine-grained control over the behaviour in response to specific error conditions is possible.| `String` or `Integer` | [`EM_IGNORE`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/ARPErrorNumbers.html#EM_IGNORE)<br />[`EM_WARNING`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/ARPErrorNumbers.html#EM_WARNING)<br />[`EM_ERROR`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/ARPErrorNumbers.html#EM_ERROR)<br />[`EM_FATAL`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/ARPErrorNumbers.html#EM_FATAL)
+`error-mode`| [`ARPOptions.setDefaultErrorMode()`](/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPOptions.html#setDefaultErrorMode()) <br />[`ARPOptions.setLaxErrorMode()`](/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPOptions.html#setLaxErrorMode())<br />[`ARPOptions.setStrictErrorMode()`](/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPOptions.html#setStrictErrorMode())<br />[`ARPOptions.setStrictErrorMode(int)`](/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPOptions.html#setStrictErrorMode(int))<br />  This allows a coarse-grained approach to control of error handling. Setting this property is equivalent to setting many of the fine-grained error handling properties. | `String` | `default`<br />`lax`<br />`strict`<br />`strict-ignore`<br />`strict-warning`<br />`strict-error`<br />`strict-fatal`
+`embedding` | [`ARPOptions.setEmbedding(boolean)`](/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPOptions.html#setEmbedding(boolean)) <br />This sets ARP to look for RDF embedded within an enclosing XML document. | `String` or `Boolean` | `true`<br />`false`
+`ERR_<XXX>` <br />`WARN_<XXX>`<br />`IGN_<XXX>` | See [`ARPErrorNumbers`](/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPErrorNumbers.html) for a complete list of the error conditions detected. Setting one of these properties is equivalent to the method [`ARPOptions.setErrorMode(int, int)`](/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPOptions.html#setErrorMode(int,%20int)). Thus fine-grained control over the behaviour in response to specific error conditions is possible.| `String` or `Integer` | [`EM_IGNORE`](/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPErrorNumbers.html#EM_IGNORE)<br />[`EM_WARNING`](/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPErrorNumbers.html#EM_WARNING)<br />[`EM_ERROR`](/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPErrorNumbers.html#EM_ERROR)<br />[`EM_FATAL`](/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPErrorNumbers.html#EM_FATAL)
 
 As an example, if you are working in an environment with legacy RDF
 data that uses unqualified RDF attributes such as "about" instead
@@ -371,7 +371,7 @@ The other way round does not work.
      …
 
 This is because in strict mode
-[`IGN_DAML_COLLECTION`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/ARPErrorNumbers.html#IGN_DAML_COLLECTION)
+[`IGN_DAML_COLLECTION`](/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPErrorNumbers.html#IGN_DAML_COLLECTION)
 is treated as an error, and so the second call to `setProperty`
 overwrites the effect of the first.
 
@@ -399,7 +399,7 @@ or other IRI rule engine from `IRIFactor
 
 ARP can be interrupted using the `Thread.interrupt()` method. This
 causes an
-[`ERR_INTERRUPTED`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/ARPErrorNumbers.html#ERR_INTERRUPTED)
+[`ERR_INTERRUPTED`](/documentation/javadoc/jena/org/apache/jena/rdf/arp/ARPErrorNumbers.html#ERR_INTERRUPTED)
 error during the parse, which is usually treated as a fatal error.
 
 Here is an illustrative code sample:
@@ -434,11 +434,11 @@ more readable XML.
 
 For access to advanced features, first get an RDFWriter object, of
 the appropriate language, by using
-[`getWriter`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/RDFWriterF.html#getWriter(java.lang.String))`("RDF/XML")`
+[`getWriter`](/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFWriterF.html#getWriter(java.lang.String))`("RDF/XML")`
 or
-[`getWriter`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/RDFWriterF.html#getWriter(java.lang.String))`("RDF/XML-ABBREV")`
+[`getWriter`](/documentation/javadoc/jena/org/apache/jena/rdf/model/RDFWriterF.html#getWriter(java.lang.String))`("RDF/XML-ABBREV")`
 on any `Model`. It is then configured using the
-[`setProperty`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/JenaReader.html#setProperty(java.lang.String, java.lang.Object))`(String, Object)`
+[`setProperty`](/documentation/javadoc/jena/org/apache/jena/rdf/arp/JenaReader.html#setProperty(java.lang.String, java.lang.Object))`(String, Object)`
 method. This changes the properties for writing RDF/XML.
 
 ### Properties to Control RDF/XML Output
@@ -533,22 +533,22 @@ fragment IDs from [http://www.w3.org/TR/
 indicating grammar rules that will not be used. Rules that can be blocked are:
 
 - [section-Reification](http://www.w3.org/TR/rdf-syntax-grammar#section-Reification)
- ([`RDFSyntax.sectionReification`](/documentation/javadoc/jena/com/hp/hpl/jena/vocabulary/RDFSyntax.html#sectionReification))
+ ([`RDFSyntax.sectionReification`](/documentation/javadoc/jena/org/apache/jena/vocabulary/RDFSyntax.html#sectionReification))
 - [section-List-Expand](http://www.w3.org/TR/rdf-syntax-grammar#section-List-Expand)
- ([`RDFSyntax.sectionListExpand`](/documentation/javadoc/jena/com/hp/hpl/jena/vocabulary/RDFSyntax.html#sectionListExpand))
+ ([`RDFSyntax.sectionListExpand`](/documentation/javadoc/jena/org/apache/jena/vocabulary/RDFSyntax.html#sectionListExpand))
 - [parseTypeLiteralPropertyElt](http://www.w3.org/TR/rdf-syntax-grammar#parseTypeLiteralPropertyElt)
- ([`RDFSyntax.parseTypeLiteralPropertyElt`](/documentation/javadoc/jena/com/hp/hpl/jena/vocabulary/RDFSyntax.html#parseTypeLiteralPropertyElt))
+ ([`RDFSyntax.parseTypeLiteralPropertyElt`](/documentation/javadoc/jena/org/apache/jena/vocabulary/RDFSyntax.html#parseTypeLiteralPropertyElt))
 - [parseTypeResourcePropertyElt](http://www.w3.org/TR/rdf-syntax-grammar#parseTypeResourcePropertyElt)
- ([`RDFSyntax.parseTypeLiteralPropertyElt`](/documentation/javadoc/jena/com/hp/hpl/jena/vocabulary/RDFSyntax.html#parseTypeLiteralPropertyElt))
+ ([`RDFSyntax.parseTypeLiteralPropertyElt`](/documentation/javadoc/jena/org/apache/jena/vocabulary/RDFSyntax.html#parseTypeLiteralPropertyElt))
 - [parseTypeCollectionPropertyElt](http://www.w3.org/TR/rdf-syntax-grammar#parseTypeCollectionPropertyElt)
- ([`RDFSyntax.parseTypeCollectionPropertyElt`](/documentation/javadoc/jena/com/hp/hpl/jena/vocabulary/RDFSyntax.html#parseTypeCollectionPropertyElt))
+ ([`RDFSyntax.parseTypeCollectionPropertyElt`](/documentation/javadoc/jena/org/apache/jena/vocabulary/RDFSyntax.html#parseTypeCollectionPropertyElt))
 - [idAttr](http://www.w3.org/TR/rdf-syntax-grammar#idAttr)
- ([`RDFSyntax.idAttr`](/documentation/javadoc/jena/com/hp/hpl/jena/vocabulary/RDFSyntax.html#idAttr))
+ ([`RDFSyntax.idAttr`](/documentation/javadoc/jena/org/apache/jena/vocabulary/RDFSyntax.html#idAttr))
 - [propertyAttr](http://www.w3.org/TR/rdf-syntax-grammar#propertyAttr)
- ([`RDFSyntax.propertyAttr`](/documentation/javadoc/jena/com/hp/hpl/jena/vocabulary/RDFSyntax.html#propertyAttr))
+ ([`RDFSyntax.propertyAttr`](/documentation/javadoc/jena/org/apache/jena/vocabulary/RDFSyntax.html#propertyAttr))
 
 In addition `"daml:collection"`
-([`DAML_OIL.collection`](/documentation/javadoc/jena/com/hp/hpl/jena/vocabulary/DAML_OIL.html#collection))
+([`DAML_OIL.collection`](/documentation/javadoc/jena/org/apache/jena/vocabulary/DAML_OIL.html#collection))
 can be blocked. Blocking
 [idAttr](http://www.w3.org/TR/rdf-syntax-grammar#idAttr) also
 blocks

Modified: jena/site/trunk/content/documentation/jdbc/index.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/jdbc/index.mdtext?rev=1690917&r1=1690916&r2=1690917&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/jdbc/index.mdtext (original)
+++ jena/site/trunk/content/documentation/jdbc/index.mdtext Tue Jul 14 12:51:40 2015
@@ -68,7 +68,7 @@ sniffing may not be accurate for the ent
 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 `Types.JAVA_OBJECT` with the Java
-type `Node` (i.e. the Jena [Node](/documentation/javadoc/jena/com/hp/hpl/jena/graph/Node.html) class).
+type `Node` (i.e. the Jena [Node](/documentation/javadoc/jena/org/apache/jena/graph/Node.html) class).
 
 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

Modified: jena/site/trunk/content/documentation/migrate_jena2_jena3.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/migrate_jena2_jena3.mdtext?rev=1690917&r1=1690916&r2=1690917&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/migrate_jena2_jena3.mdtext (original)
+++ jena/site/trunk/content/documentation/migrate_jena2_jena3.mdtext Tue Jul 14 12:51:40 2015
@@ -78,3 +78,7 @@ recommended that data is reloaded at a c
 
 Gone:
 ModelFactory.createFileModelMaker // JA.FileModel
+
+Gone:
+GraphStore
+

Modified: jena/site/trunk/content/documentation/notes/event-handler-howto.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/notes/event-handler-howto.mdtext?rev=1690917&r1=1690916&r2=1690917&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/notes/event-handler-howto.mdtext (original)
+++ jena/site/trunk/content/documentation/notes/event-handler-howto.mdtext Tue Jul 14 12:51:40 2015
@@ -84,7 +84,7 @@ listener as statements.
 
 The full Listener API is rather chunky and it can be inconvenient
 to use, especially for the creation of inline classes. There are
-four utility classes in *com.hp.hpl.jena.rdf.listeners:*
+four utility classes in *org.apache.jena.rdf.listeners:*
 
 -   *NullListener*. This class's methods do nothing. This is useful
     when you want to subclass and intercept only specific ways of

Modified: jena/site/trunk/content/documentation/notes/file-manager.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/notes/file-manager.mdtext?rev=1690917&r1=1690916&r2=1690917&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/notes/file-manager.mdtext (original)
+++ jena/site/trunk/content/documentation/notes/file-manager.mdtext Tue Jul 14 12:51:40 2015
@@ -109,14 +109,14 @@ original URI, not the alternative locati
 ### Debugging
 
 Using log4j, set the logging level of the classes:
-    com.hp.hpl.jena.util.FileManager=ALL
-    com.hp.hpl.jena.util.LocationManager=ALL
+    org.apache.jena.util.FileManager=ALL
+    org.apache.jena.util.LocationManager=ALL
 
 ### See also
 
 Javadoc:
-[FileManager](/documentation/javadoc/jena/com/hp/hpl/jena/util/FileManager.html)
-[LocationMapper](/documentation/javadoc/jena/com/hp/hpl/jena/util/LocationMapper.html)
+[FileManager](/documentation/javadoc/jena/org/apache/jena/util/FileManager.html)
+[LocationMapper](/documentation/javadoc/jena/org/apache/jena/util/LocationMapper.html)
 
 
 

Modified: jena/site/trunk/content/documentation/notes/iri.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/notes/iri.mdtext?rev=1690917&r1=1690916&r2=1690917&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/notes/iri.mdtext (original)
+++ jena/site/trunk/content/documentation/notes/iri.mdtext Tue Jul 14 12:51:40 2015
@@ -41,7 +41,7 @@ list.
     =======
     use something like:
 
-    import com.hp.hpl.jena.iri.*;
+    import org.apache.jena.iri.*;
 
      static IRIFactory iriFactory = IRIFactory
                                     .semanticWebImplementation();
@@ -68,7 +68,7 @@ list.
 
     As shown, you start by building an IRIFactory
 
-    com.hp.hpl.jena.iri.IRIFactory
+    org.apache.jena.iri.IRIFactory
 
     this embodies some set of rules, against which you will check
     an IRI.

Modified: jena/site/trunk/content/documentation/notes/model-factory.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/notes/model-factory.mdtext?rev=1690917&r1=1690916&r2=1690917&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/notes/model-factory.mdtext (original)
+++ jena/site/trunk/content/documentation/notes/model-factory.mdtext Tue Jul 14 12:51:40 2015
@@ -6,7 +6,7 @@ Jena is a moderately complicated system,
 different kinds of `Model` and ways of constructing them. This note
 describes the Jena `ModelFactory`, a one-stop shop for
 creating Jena models. `ModelFactory` lives in Java package
-`com.hp.hpl.jena.rdf.model`.
+`org.apache.jena.rdf.model`.
 
 This note is an introduction, not an exhaustive description. As
 usual consult the Javadoc for details of the methods and classes to
@@ -60,7 +60,7 @@ allow the reasoner to digest them before
 
 From where do you fetch your reasoners? From the
 *reasoner registry*, the class
-[ReasonerRegistry](/documentation/javadoc/jena/com/hp/hpl/jena/reasoner/ReasonerRegistry.html).
+[ReasonerRegistry](/documentation/javadoc/jena/org/apache/jena/reasoner/ReasonerRegistry.html).
 This allows reasoners to be looked up by name, but also provides
 some predefined access methods for well-know reasoners:
 
@@ -85,7 +85,7 @@ in-memory and presents OWL ontologies.
 
 - `createOntologyModel(OntModelSpec spec, Model base)` Creates an
 ontology model according the
-[OntModelSpec](/documentation/javadoc/jena/com/hp/hpl/jena/ontology/OntModelSpec.html)
+[OntModelSpec](/documentation/javadoc/jena/org/apache/jena/ontology/OntModelSpec.html)
 `spec` which presents the ontology of `base`.
 
 - `createOntologyModel(OntModelSpec spec, ModelMaker maker, Model base)`
@@ -178,7 +178,7 @@ returns that model.
 There are other methods, for removing models, additional control
 over create *vs* open, closing the maker, and looking names up; for
 those consult the
-[ModelMaker JavaDoc](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/ModelMaker.html).
+[ModelMaker JavaDoc](/documentation/javadoc/jena/org/apache/jena/rdf/model/ModelMaker.html).
 
 ## Miscellany
 

Modified: jena/site/trunk/content/documentation/notes/rdf-frames.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/notes/rdf-frames.mdtext?rev=1690917&r1=1690916&r2=1690917&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/notes/rdf-frames.mdtext (original)
+++ jena/site/trunk/content/documentation/notes/rdf-frames.mdtext Tue Jul 14 12:51:40 2015
@@ -203,7 +203,7 @@ converse for properties:
       OntProperty.listDeclaringClasses( boolean direct );
 
 All of the above API methods return a Jena
-[`ExtendedIterator`](/documentation/javadoc/jena/com/hp/hpl/jena/util/iterator/ExtendedIterator.html).
+[`ExtendedIterator`](/documentation/javadoc/jena/org/apache/jena/util/iterator/ExtendedIterator.html).
 
 **Note a change from the Jena 2.1 interface:** the optional Boolean
 parameter on `listDeclaredProperties` has changed name from `all`

Modified: jena/site/trunk/content/documentation/notes/sse.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/notes/sse.mdtext?rev=1690917&r1=1690916&r2=1690917&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/notes/sse.mdtext (original)
+++ jena/site/trunk/content/documentation/notes/sse.mdtext Tue Jul 14 12:51:40 2015
@@ -307,7 +307,7 @@ Elements for executing SPARQL:
 
 ### SSE Factory
 
-The class `SSE` in package `com.hp.hpl.jena.sparql.sse` provides many
+The class `SSE` in package `org.apache.jena.sparql.sse` provides many
 convenience functions to call builders for RDF and SPARQL structures.
 
     Node n = SSE.parseNode("<http://example/node>") ;

Modified: jena/site/trunk/content/documentation/notes/typed-literals.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/notes/typed-literals.mdtext?rev=1690917&r1=1690916&r2=1690917&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/notes/typed-literals.mdtext (original)
+++ jena/site/trunk/content/documentation/notes/typed-literals.mdtext Tue Jul 14 12:51:40 2015
@@ -57,7 +57,7 @@ typed literals whose datatype is the spe
 
 Jena will correctly parse typed literals within RDF/XML, NTriple
 and Turtle source files. The same Java object,
-[`Literal`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/model/Literal.html)
+[`Literal`](/documentation/javadoc/jena/org/apache/jena/rdf/model/Literal.html)
 will represent "plain" and "typed" literals. Literal now supports
 some new methods:
 
@@ -128,7 +128,7 @@ made it impossible to cache literals in
 
 Datatypes for typed literals are represented by instances of the
 interface
-[`com.hp.hpl.jena.datatypes.RDFDatatype`](/documentation/javadoc/jena/com/hp/hpl/jena/datatypes/RDFDatatype.html).
+[`org.apache.jena.datatypes.RDFDatatype`](/documentation/javadoc/jena/org/apache/jena/datatypes/RDFDatatype.html).
 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.
@@ -164,8 +164,8 @@ untill very late on. To overcome this we
 switches that allow you to force Jena to report such syntactic
 errors earlier. These are static Boolean parameters:
 
-    com.hp.hpl.jena.shared.impl.JenaParameters.enableEagerLiteralValidation
-    com.hp.hpl.jena.shared.impl.JenaParameters.enableSilentAcceptanceOfUnknownDatatypes
+    org.apache.jena.shared.impl.JenaParameters.enableEagerLiteralValidation
+    org.apache.jena.shared.impl.JenaParameters.enableSilentAcceptanceOfUnknownDatatypes
 
 They are placed here in an impl package (and thus only visible in
 the full javadoc, not the API javadoc) because they should not be
@@ -187,7 +187,7 @@ Jena includes prebuilt, and pre-register
     gYearMonth gMonthDay
 
 These are all available as static member variables from
-[`com.hp.hpl.jena.datatypes.xsd.XSDDatatype`](/documentation/javadoc/jena/com/hp/hpl/jena/datatypes/xsd/XSDDatatype.html).
+[`org.apache.jena.datatypes.xsd.XSDDatatype`](/documentation/javadoc/jena/org/apache/jena/datatypes/xsd/XSDDatatype.html).
 
 Of these types, the following are registered as the default type to
 use to represent certain Java classes:
@@ -262,7 +262,7 @@ standard for how to map the datatype URI
 
 Within Jena2 we allow new datatypes to be created and registered by
 using the
-[`TypeMapper`](/documentation/javadoc/jena/com/hp/hpl/jena/datatypes/TypeMapper.html)
+[`TypeMapper`](/documentation/javadoc/jena/org/apache/jena/datatypes/TypeMapper.html)
 class.
 
 The easiest way to define a new RDFDatatype is to subclass