kinow commented on a change in pull request #64:
URL: https://github.com/apache/jena-site/pull/64#discussion_r715283976



##########
File path: source/documentation/sparql-apis/__index.md
##########
@@ -0,0 +1,371 @@
+---
+title: Apache Jena SPARQL APIs
+slug: index
+---
+TOC
+
+## Overview
+
+The SPARQL specifications provide
+[query](https://www.w3.org/TR/sparql11-query/),
+[update](https://www.w3.org/TR/sparql11-update/) and the
+[graph store protocol](https://www.w3.org/TR/sparql11-http-rdf-update/) (GSP).
+
+Jena provides a single interface, [`RDFConnection`](../rdfconnection) for 
working
+with local and remote RDF data using these protocols in a unified way for local
+and remote data.
+
+HTTP Authentication is provided for remote operations.
+
+Alternatively, applications can also use the various execution engines through 
`QueryExecution`, `UpdateExecution` and `ModelStore`.
+
+All the main implementations work at "Graph SPI" (GPI) level and an 
application may wish to work with this lower level interface that implements 
generalized RDF (i.e. a triple is any three nodes, including ones like 
variables, and subsystem extension nodes).
+
+For working with RDF data:
+| API  | GPI  |
+| ---- | ---- |
+| `Model`       | `Graph`        |
+| `Statement`   | `Triple`       |
+| `Resource`    | `Node`         |
+| `Literal`     | `Node`         |
+| `String`      | `Var`          |
+| `Dataset`     | `DatasetGraph` |
+|               | `Quad` |
+
+and for SPARQL,
+
+| API  | GPI  |
+| ---- | ---- |
+| `RDFConnection`    | `RDFLink`    |
+| `QueryExecution`   | `QueryExec`  |
+| `UpdateExecution`  | `UpdateExec` |
+| `ResultSet`        | `RowSet`     |
+| `ModelStore`       | `GSP`        |
+
+The GPI version is the main machinery working at the storage and network level,
+and the API version is an adapter to convert to the Model API and related
+classes.
+
+This documentation describes the API classes - the GPI companion classes are 
the
+same style, sometimes with slightly changed naming.
+
+`UpdateProcessor` is a legacy name for `UpdateExecution`
+
+`GSP` provides the SPARQL Graph Store Protocol, including extensions for 
sending
+and receiving datasets, rather than individual graphs.
+
+Both API and GPI provide builders for detailed setup, particularly for remote 
usage over HTTP and HTTPS where detailed control fo the HTTP requests is 
sometimes necessary to work with other triple stores.

Review comment:
       s/fo/for

##########
File path: source/documentation/sparql-apis/__index.md
##########
@@ -0,0 +1,371 @@
+---
+title: Apache Jena SPARQL APIs
+slug: index
+---
+TOC
+
+## Overview
+
+The SPARQL specifications provide
+[query](https://www.w3.org/TR/sparql11-query/),
+[update](https://www.w3.org/TR/sparql11-update/) and the
+[graph store protocol](https://www.w3.org/TR/sparql11-http-rdf-update/) (GSP).
+
+Jena provides a single interface, [`RDFConnection`](../rdfconnection) for 
working
+with local and remote RDF data using these protocols in a unified way for local
+and remote data.
+
+HTTP Authentication is provided for remote operations.
+
+Alternatively, applications can also use the various execution engines through 
`QueryExecution`, `UpdateExecution` and `ModelStore`.
+
+All the main implementations work at "Graph SPI" (GPI) level and an 
application may wish to work with this lower level interface that implements 
generalized RDF (i.e. a triple is any three nodes, including ones like 
variables, and subsystem extension nodes).
+
+For working with RDF data:
+| API  | GPI  |

Review comment:
       I think this needs a blank line? Not being rendered as a table at the 
moment.
   
   
![image](https://user-images.githubusercontent.com/304786/134611284-dd6d447c-f127-4201-82c3-9088839e5292.png)
   

##########
File path: source/documentation/sparql-apis/__index.md
##########
@@ -0,0 +1,371 @@
+---
+title: Apache Jena SPARQL APIs
+slug: index
+---
+TOC
+
+## Overview
+
+The SPARQL specifications provide
+[query](https://www.w3.org/TR/sparql11-query/),
+[update](https://www.w3.org/TR/sparql11-update/) and the
+[graph store protocol](https://www.w3.org/TR/sparql11-http-rdf-update/) (GSP).
+
+Jena provides a single interface, [`RDFConnection`](../rdfconnection) for 
working
+with local and remote RDF data using these protocols in a unified way for local
+and remote data.
+
+HTTP Authentication is provided for remote operations.
+
+Alternatively, applications can also use the various execution engines through 
`QueryExecution`, `UpdateExecution` and `ModelStore`.
+
+All the main implementations work at "Graph SPI" (GPI) level and an 
application may wish to work with this lower level interface that implements 
generalized RDF (i.e. a triple is any three nodes, including ones like 
variables, and subsystem extension nodes).
+
+For working with RDF data:
+| API  | GPI  |
+| ---- | ---- |
+| `Model`       | `Graph`        |
+| `Statement`   | `Triple`       |
+| `Resource`    | `Node`         |
+| `Literal`     | `Node`         |
+| `String`      | `Var`          |
+| `Dataset`     | `DatasetGraph` |
+|               | `Quad` |
+
+and for SPARQL,
+
+| API  | GPI  |
+| ---- | ---- |
+| `RDFConnection`    | `RDFLink`    |
+| `QueryExecution`   | `QueryExec`  |
+| `UpdateExecution`  | `UpdateExec` |
+| `ResultSet`        | `RowSet`     |
+| `ModelStore`       | `GSP`        |
+
+The GPI version is the main machinery working at the storage and network level,
+and the API version is an adapter to convert to the Model API and related
+classes.
+
+This documentation describes the API classes - the GPI companion classes are 
the
+same style, sometimes with slightly changed naming.
+
+`UpdateProcessor` is a legacy name for `UpdateExecution`
+
+`GSP` provides the SPARQL Graph Store Protocol, including extensions for 
sending
+and receiving datasets, rather than individual graphs.
+
+Both API and GPI provide builders for detailed setup, particularly for remote 
usage over HTTP and HTTPS where detailed control fo the HTTP requests is 
sometimes necessary to work with other triple stores.
+
+HTTP authentication support is provided, supporting both basic and digest 
authentication in challenge-response scenarios.
+
+Factory style functions for many common usage patterns are retained in 
`QueryExecutionFactory`, `UpdateExecutionFactory`.
+
+## Changes from Jena 4.1.0 to Jena 4.2.0
+
+* Execution objects have a companion builder. This is especially important of 
HTTP as there many configuration options that may be needed. Local use is still 
covered by the existing `QueryExecutionFactory` as well as the new 
`QueryExecutionBuilder`.
+
+* HTTP usage provided by the JDK `java.net.http` package, with challenge-based
+authentication provides on top by Jena. [See below](#auth).
+
+* Authentication support is uniformly applied to query, update GSP and SPARQL 
`SERVICE`.
+
+* HTTP/2 support (Fuseki to follow unless done and tested in time).
+
+* Remove Apache HttpClient usage
+  * When using this for authentication, application code changes wil be
+    necessary.
+
+* Deprecate modifying `QueryExecution` after it is built.
+  This is still supported for local `QueryExecution`.
+
+* Parameterization for remote queries
+
+* `HttpOp` is split into `HttpRDF` for GET/POST/PUT/DELETE of graphs and
+  datasets and new `HttpOp` for packaged-up common patterns of HTTP usage.
+
+* DatasetAccessors will be removed.
+
+* GSP - support for dataset operations as well as graphs (also supported by 
Fuseki).
+
+## <tt>RDFConnection</tt>
+
+[RDFConnection](../rdfconnection/)
+
+```
+example with builder.
+```
+```
+example with factory
+```
+
+## Query Execution
+
+Factory Examples
+
+```
+Dataset dataset = ...
+Query query = ...
+try ( QueryExecution qExec = QueryExecutionFactory.create(query, dataset) ) {
+     ResultSet results = qExec.execSelect();
+    ... use results ...
+}
+```
+
+Builder Examples
+Builders are reusable and modifiable after a "build" operation.
+
+
+```
+Dataset dataset = ...
+Query query = ...
+try ( QueryExecution qExec = QueryExecution.create()
+                                 .dataset(dataset)
+                                 .query(query)
+                                 .build() ) {
+    ResultSet results = qExec.execSelect();
+    ... use results ...
+}
+```
+
+```
+try ( QueryExecution qExec = QueryExecutionHTTP.service("http://....";)
+                                 .query(query)
+                                 .build() ) {
+    ResultSet results = qExec.execSelect();
+    ... use results ...
+}
+```
+
+```
+// JDK HttpClient
+HttpClient httpClient = HttpClient.newBuilder()
+                .connectTimeout(Duration.ofSeconds(10))  // Timeout to connect
+                .followRedirects(Redirect.NORMAL)
+                .build();
+try ( QueryExecution qExec = QueryExecutionHTTP.create()
+                                 .service("http:// ....")
+                                 .httpClient(httpClient)
+                                 .query(query)
+                                 .sendMode(QuerySendMode.asPost)
+                                 .timeout(30, TimeUnit.SECONDS) // Timeout of 
request
+                                 .build() ) {
+    ResultSet results = qExec.execSelect();
+    ... use results ...
+}
+```
+There is only one timeout setting for HTTP query execution. The "time to
+connect" is handled by the JDK `HttpClient`. Timeouts for local execution are
+"time to first result" and "time to all results" as before.
+
+## <tt>GSP</tt>
+
+<tt>ModelStore</tt>
+
+```
+  Graph graph = GSP.serbvice("http://fuseki/dataset";).defaultGraph().GET();
+```
+
+```
+  Graph graph = ... ; 
+  
GSP.request("http://fuseki/dataset";).graphName("http;//data/myGraph").POST(graph);
+```
+
+```
+  DatasetGraph dataset = GSP.request("http://fuseki/dataset";).getDataset();
+```
+
+## Environment
+
+AuthEnv - passwordRegistry , authModifiers
+RegistryHttpClient
+
+## Customization of HTTP requests
+@@
+
+Params (e.g. apikey)
+
+ARQ.httpRequestModifer
+
+## QueryExecution
+
+## UpdateExecution
+
+## <tt>SERVICE</tt>
+@@
+[Old documentation ](../query/service.html) - passing parameters has changed.
+
+## Misc 
+
+###Params
+
+### SERVICE configuration
+
+See below for more on HTTP authentication with `SERVICE`.
+
+@@
+```java
+ //Symbol                Usage           Default
+ //[ ] srv:queryTimeout      Set timeouts -- There is only one time out now.
+ //[ ] srv:queryCompression  Enable use of deflate and GZip -- unsupported 
(didn't work!)
+ //[ ] srv:queryClient       Enable use of a specific client -- unsupported
+ //[ ] srv:serviceContext    Per-endpoint configuration -- Legacy
+ // + srv:serviceAllowed
+```
+
+Old names
+
+@@check
+
+| Symbol | Java Constant | Usage |
+| ------ | ----- | --- |
+| `arq:httpServiceAllowed` | `ARQ.httpServiceAllowed` | Yes or No |
+| `arq:serviceParams`      | `ARQ.serviceParams`    | Map |
+| `arq:httpQueryTimeout`   | `ARQ.httpQueryTimeout` |  Request timeout (time 
to completion) |
+| `arq:httpQueryClient`    | `ARQ.httpQueryTimeout` | Set the 
java.net.http.HttpClient  |
+| `arq:httpQueryCompression` | | no-op |
+
+where `arq:` is prefix for `<http://jena.apache.org/ARQ#>`.
+
+### ARQ.httpRequestModifier
+
+There is a mechanism to modify HTTP requests to specific endpoints or to a 
collection of endpoints with teh same prefix.

Review comment:
       s/teh/the

##########
File path: source/documentation/sparql-apis/__index.md
##########
@@ -0,0 +1,371 @@
+---
+title: Apache Jena SPARQL APIs
+slug: index
+---
+TOC
+
+## Overview
+
+The SPARQL specifications provide
+[query](https://www.w3.org/TR/sparql11-query/),
+[update](https://www.w3.org/TR/sparql11-update/) and the
+[graph store protocol](https://www.w3.org/TR/sparql11-http-rdf-update/) (GSP).
+
+Jena provides a single interface, [`RDFConnection`](../rdfconnection) for 
working
+with local and remote RDF data using these protocols in a unified way for local
+and remote data.
+
+HTTP Authentication is provided for remote operations.
+
+Alternatively, applications can also use the various execution engines through 
`QueryExecution`, `UpdateExecution` and `ModelStore`.
+
+All the main implementations work at "Graph SPI" (GPI) level and an 
application may wish to work with this lower level interface that implements 
generalized RDF (i.e. a triple is any three nodes, including ones like 
variables, and subsystem extension nodes).
+
+For working with RDF data:
+| API  | GPI  |
+| ---- | ---- |
+| `Model`       | `Graph`        |
+| `Statement`   | `Triple`       |
+| `Resource`    | `Node`         |
+| `Literal`     | `Node`         |
+| `String`      | `Var`          |
+| `Dataset`     | `DatasetGraph` |
+|               | `Quad` |
+
+and for SPARQL,
+
+| API  | GPI  |
+| ---- | ---- |
+| `RDFConnection`    | `RDFLink`    |
+| `QueryExecution`   | `QueryExec`  |
+| `UpdateExecution`  | `UpdateExec` |
+| `ResultSet`        | `RowSet`     |
+| `ModelStore`       | `GSP`        |
+
+The GPI version is the main machinery working at the storage and network level,
+and the API version is an adapter to convert to the Model API and related
+classes.
+
+This documentation describes the API classes - the GPI companion classes are 
the
+same style, sometimes with slightly changed naming.
+
+`UpdateProcessor` is a legacy name for `UpdateExecution`
+
+`GSP` provides the SPARQL Graph Store Protocol, including extensions for 
sending
+and receiving datasets, rather than individual graphs.
+
+Both API and GPI provide builders for detailed setup, particularly for remote 
usage over HTTP and HTTPS where detailed control fo the HTTP requests is 
sometimes necessary to work with other triple stores.
+
+HTTP authentication support is provided, supporting both basic and digest 
authentication in challenge-response scenarios.
+
+Factory style functions for many common usage patterns are retained in 
`QueryExecutionFactory`, `UpdateExecutionFactory`.
+
+## Changes from Jena 4.1.0 to Jena 4.2.0
+
+* Execution objects have a companion builder. This is especially important of 
HTTP as there many configuration options that may be needed. Local use is still 
covered by the existing `QueryExecutionFactory` as well as the new 
`QueryExecutionBuilder`.
+
+* HTTP usage provided by the JDK `java.net.http` package, with challenge-based
+authentication provides on top by Jena. [See below](#auth).
+
+* Authentication support is uniformly applied to query, update GSP and SPARQL 
`SERVICE`.
+
+* HTTP/2 support (Fuseki to follow unless done and tested in time).
+
+* Remove Apache HttpClient usage
+  * When using this for authentication, application code changes wil be
+    necessary.
+
+* Deprecate modifying `QueryExecution` after it is built.
+  This is still supported for local `QueryExecution`.
+
+* Parameterization for remote queries
+
+* `HttpOp` is split into `HttpRDF` for GET/POST/PUT/DELETE of graphs and
+  datasets and new `HttpOp` for packaged-up common patterns of HTTP usage.
+
+* DatasetAccessors will be removed.
+
+* GSP - support for dataset operations as well as graphs (also supported by 
Fuseki).
+
+## <tt>RDFConnection</tt>
+
+[RDFConnection](../rdfconnection/)
+
+```
+example with builder.
+```
+```
+example with factory
+```
+
+## Query Execution
+
+Factory Examples
+
+```
+Dataset dataset = ...
+Query query = ...
+try ( QueryExecution qExec = QueryExecutionFactory.create(query, dataset) ) {
+     ResultSet results = qExec.execSelect();
+    ... use results ...
+}
+```
+
+Builder Examples
+Builders are reusable and modifiable after a "build" operation.
+
+
+```
+Dataset dataset = ...
+Query query = ...
+try ( QueryExecution qExec = QueryExecution.create()
+                                 .dataset(dataset)
+                                 .query(query)
+                                 .build() ) {
+    ResultSet results = qExec.execSelect();
+    ... use results ...
+}
+```
+
+```
+try ( QueryExecution qExec = QueryExecutionHTTP.service("http://....";)
+                                 .query(query)
+                                 .build() ) {
+    ResultSet results = qExec.execSelect();
+    ... use results ...
+}
+```
+
+```
+// JDK HttpClient
+HttpClient httpClient = HttpClient.newBuilder()
+                .connectTimeout(Duration.ofSeconds(10))  // Timeout to connect
+                .followRedirects(Redirect.NORMAL)
+                .build();
+try ( QueryExecution qExec = QueryExecutionHTTP.create()
+                                 .service("http:// ....")
+                                 .httpClient(httpClient)
+                                 .query(query)
+                                 .sendMode(QuerySendMode.asPost)
+                                 .timeout(30, TimeUnit.SECONDS) // Timeout of 
request
+                                 .build() ) {
+    ResultSet results = qExec.execSelect();
+    ... use results ...
+}
+```
+There is only one timeout setting for HTTP query execution. The "time to
+connect" is handled by the JDK `HttpClient`. Timeouts for local execution are
+"time to first result" and "time to all results" as before.
+
+## <tt>GSP</tt>
+
+<tt>ModelStore</tt>
+
+```
+  Graph graph = GSP.serbvice("http://fuseki/dataset";).defaultGraph().GET();
+```
+
+```
+  Graph graph = ... ; 
+  
GSP.request("http://fuseki/dataset";).graphName("http;//data/myGraph").POST(graph);
+```
+
+```
+  DatasetGraph dataset = GSP.request("http://fuseki/dataset";).getDataset();
+```
+
+## Environment
+
+AuthEnv - passwordRegistry , authModifiers
+RegistryHttpClient
+
+## Customization of HTTP requests
+@@
+
+Params (e.g. apikey)
+
+ARQ.httpRequestModifer
+
+## QueryExecution
+
+## UpdateExecution
+
+## <tt>SERVICE</tt>
+@@
+[Old documentation ](../query/service.html) - passing parameters has changed.
+
+## Misc 
+
+###Params
+
+### SERVICE configuration
+
+See below for more on HTTP authentication with `SERVICE`.
+
+@@
+```java
+ //Symbol                Usage           Default
+ //[ ] srv:queryTimeout      Set timeouts -- There is only one time out now.
+ //[ ] srv:queryCompression  Enable use of deflate and GZip -- unsupported 
(didn't work!)
+ //[ ] srv:queryClient       Enable use of a specific client -- unsupported
+ //[ ] srv:serviceContext    Per-endpoint configuration -- Legacy
+ // + srv:serviceAllowed
+```
+
+Old names
+
+@@check
+
+| Symbol | Java Constant | Usage |
+| ------ | ----- | --- |
+| `arq:httpServiceAllowed` | `ARQ.httpServiceAllowed` | Yes or No |
+| `arq:serviceParams`      | `ARQ.serviceParams`    | Map |
+| `arq:httpQueryTimeout`   | `ARQ.httpQueryTimeout` |  Request timeout (time 
to completion) |
+| `arq:httpQueryClient`    | `ARQ.httpQueryTimeout` | Set the 
java.net.http.HttpClient  |
+| `arq:httpQueryCompression` | | no-op |
+
+where `arq:` is prefix for `<http://jena.apache.org/ARQ#>`.
+
+### ARQ.httpRequestModifier
+
+There is a mechanism to modify HTTP requests to specific endpoints or to a 
collection of endpoints with teh same prefix.
+
+For example, to add a header `X-Tracker` to each request:
+
+```java
+    AtomicLong counter = new AtomicLong(0);
+
+    HttpRequestModifier modifier = (params, headers)->{
+        long x = counter.incrementAndGet();
+        headers.put("X-Tracker", "Call="+x);
+    };
+    RegistryRequestModifier.get().addPrefix(serverURL, modifier);
+```
+
+## Authentication {#auth}
+
+For any use of users-password information, and especially HTTP basic
+authentication, information is visible in the HTTP headers. Using HTTPS is
+necessary to avoid snooping.  Digest authentication is also stronger over HTTPS
+because it protects against man-in-the-middle attacks.
+
+There are 5 variations:
+
+1. Basic authentication
+2. Challenge-Basic authentication
+3. Challenge-Digest authentication
+4. URL user (that is, `u...@host.net` in the URL)
+5. URL user and password in the URL (that is, `user:passw...@host.net` in the 
URL)
+
+Basic authentication occurs where the app provides the users and password
+information to the JDK `HttpClient` and that information is always used when
+sending HTTP requests with that `HttpClient`. It does not require an initial
+request-challenge-resend to initiate. This is provided natively by the 
`java.net.http`
+JDK code. See `HttpClient.newBuilder().authenticate(...)`.
+
+Challenge based authentication, for "basic" or "digest", are provided by Jena.
+The challenge happens on the first contact with the remote endpoint and the
+server returns a 401 response with an HTTP header saying which style of
+authentication is required. There is a registry of users name and password for
+endpoints which is consulted and the appropriate
+[`Authorization:`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Authorization)
+header is generated then the request resent. If no registration matches, the 
401
+is passed back to the application as an exception.
+
+Because it is a challenge response to an request, the first request must be
+repeated, first to trigger the challenge and then again with the HTTP
+authentication information.  To make this automatic, the first request must 
not be a streaming
+request (the stream is not repeatable). All HTTP request generated by Jena are 
repeatable.
+
+The URL can contain a `userinfo` part, either the `users@host` form, or the 
`user:password@host` form.
+If just the user is given, the authentication environment is consulted for 
registered users-password information. If user and password is given, the 
details as given are used. This latter form is not recommended and should only 
be used if necessary because the password is in-clear in the SPARQL
+query.
+
+Move page: [/documentation/query/http-auth](/documentation/query/http-auth)
+Link to 
+
+### JDK HttpClient.authenticator
+
+The java platform provides basic authentication.
+
+This is not challenge based - any request sent using a `HttpClient` configured 
with an authenticator will include the authentication details. (Caution- - 
including sending username/password to the wrong site!).
+
+```java
+    Authenticator authenticator = AuthLib.authenticator("user", "password");
+    HttpClient httpClient = HttpClient.newBuilder()
+            .connectTimeout(Duration.ofSeconds(10))
+            .authenticator(authenticator)
+            .build();
+```
+
+```java
+        // Use with RDFConnection      
+        try ( RDFConnection conn = RDFConnectionRemote.service(dataURL)
+                .httpClient(httpClient)
+                .build()) {
+            conn.queryAsk("ASK{}");
+        }
+```
+
+```java
+        // Use with QueryExecution
+        System.out.println("HttpClient + QueryExecutionHTTP");
+        try ( QueryExecution qExec = QueryExecutionHTTP.service(dataURL)
+                .httpClient(httpClient)
+                .endpoint(dataURL)
+                .queryString("ASK{}")
+                .build()) {
+            qExec.execAsk();
+        }
+```
+
+### Challenge registration
+
+`AuthEnv` maintains a registry of credentials and also a registry of which 
service URLs
+the credentials should be used form. It supports registration of endpoint 
prefixes so that one
+registration will apply to all URLs starting with a common root.
+
+The main function is `AuthEnv.get().registerUsernamePassword`.
+
+```java
+   // Application setup code 
+   AuthEnv.get().registerUsernamePassword("username", "password");
+```
+
+```java
+   ...
+   try ( QueryExecution qExec = QueryExecutionHTTP.service(dataURL)
+        // No httpClient
+        .endpoint(dataURL)
+        .queryString("ASK{}")
+        .build()) {
+       qExec.execAsk();
+   }
+```
+
+When a HTTP 401 response with an `WWW-Authenticate` header is received, the 
Jena http handling code
+will will look for a suitable authentication registration (exact or longest 
prefix), and retry the
+request. If it succeeds, a modifier is installed so all subsequent request to 
the same endpoint will
+have the authentication header added and there is no challenge round-trip.
+
+### <tt>SERVICE</tt>
+
+The same mechanism is used for the URL in a SPARQL `SERVICE` clause.  If there 
is a 401 challenge,
+the registry is consulted and authetication applied.
+
+In addition, if the SERVICE URL has a usename as the `userinfo` (that is, 
`https://us...@some.host/...`),

Review comment:
       s/usename/username

##########
File path: source/documentation/sparql-apis/__index.md
##########
@@ -0,0 +1,371 @@
+---
+title: Apache Jena SPARQL APIs
+slug: index
+---
+TOC
+
+## Overview
+
+The SPARQL specifications provide
+[query](https://www.w3.org/TR/sparql11-query/),
+[update](https://www.w3.org/TR/sparql11-update/) and the
+[graph store protocol](https://www.w3.org/TR/sparql11-http-rdf-update/) (GSP).
+
+Jena provides a single interface, [`RDFConnection`](../rdfconnection) for 
working
+with local and remote RDF data using these protocols in a unified way for local
+and remote data.
+
+HTTP Authentication is provided for remote operations.
+
+Alternatively, applications can also use the various execution engines through 
`QueryExecution`, `UpdateExecution` and `ModelStore`.
+
+All the main implementations work at "Graph SPI" (GPI) level and an 
application may wish to work with this lower level interface that implements 
generalized RDF (i.e. a triple is any three nodes, including ones like 
variables, and subsystem extension nodes).
+
+For working with RDF data:
+| API  | GPI  |
+| ---- | ---- |
+| `Model`       | `Graph`        |
+| `Statement`   | `Triple`       |
+| `Resource`    | `Node`         |
+| `Literal`     | `Node`         |
+| `String`      | `Var`          |
+| `Dataset`     | `DatasetGraph` |
+|               | `Quad` |
+
+and for SPARQL,
+
+| API  | GPI  |
+| ---- | ---- |
+| `RDFConnection`    | `RDFLink`    |
+| `QueryExecution`   | `QueryExec`  |
+| `UpdateExecution`  | `UpdateExec` |
+| `ResultSet`        | `RowSet`     |
+| `ModelStore`       | `GSP`        |
+
+The GPI version is the main machinery working at the storage and network level,
+and the API version is an adapter to convert to the Model API and related
+classes.
+
+This documentation describes the API classes - the GPI companion classes are 
the
+same style, sometimes with slightly changed naming.
+
+`UpdateProcessor` is a legacy name for `UpdateExecution`
+
+`GSP` provides the SPARQL Graph Store Protocol, including extensions for 
sending
+and receiving datasets, rather than individual graphs.
+
+Both API and GPI provide builders for detailed setup, particularly for remote 
usage over HTTP and HTTPS where detailed control fo the HTTP requests is 
sometimes necessary to work with other triple stores.
+
+HTTP authentication support is provided, supporting both basic and digest 
authentication in challenge-response scenarios.
+
+Factory style functions for many common usage patterns are retained in 
`QueryExecutionFactory`, `UpdateExecutionFactory`.
+
+## Changes from Jena 4.1.0 to Jena 4.2.0
+
+* Execution objects have a companion builder. This is especially important of 
HTTP as there many configuration options that may be needed. Local use is still 
covered by the existing `QueryExecutionFactory` as well as the new 
`QueryExecutionBuilder`.
+
+* HTTP usage provided by the JDK `java.net.http` package, with challenge-based
+authentication provides on top by Jena. [See below](#auth).
+
+* Authentication support is uniformly applied to query, update GSP and SPARQL 
`SERVICE`.
+
+* HTTP/2 support (Fuseki to follow unless done and tested in time).
+
+* Remove Apache HttpClient usage
+  * When using this for authentication, application code changes wil be
+    necessary.
+
+* Deprecate modifying `QueryExecution` after it is built.
+  This is still supported for local `QueryExecution`.
+
+* Parameterization for remote queries
+
+* `HttpOp` is split into `HttpRDF` for GET/POST/PUT/DELETE of graphs and
+  datasets and new `HttpOp` for packaged-up common patterns of HTTP usage.
+
+* DatasetAccessors will be removed.
+
+* GSP - support for dataset operations as well as graphs (also supported by 
Fuseki).
+
+## <tt>RDFConnection</tt>
+
+[RDFConnection](../rdfconnection/)
+
+```
+example with builder.
+```
+```
+example with factory
+```
+
+## Query Execution
+
+Factory Examples
+
+```
+Dataset dataset = ...
+Query query = ...
+try ( QueryExecution qExec = QueryExecutionFactory.create(query, dataset) ) {
+     ResultSet results = qExec.execSelect();
+    ... use results ...
+}
+```
+
+Builder Examples
+Builders are reusable and modifiable after a "build" operation.
+
+
+```
+Dataset dataset = ...
+Query query = ...
+try ( QueryExecution qExec = QueryExecution.create()
+                                 .dataset(dataset)
+                                 .query(query)
+                                 .build() ) {
+    ResultSet results = qExec.execSelect();
+    ... use results ...
+}
+```
+
+```
+try ( QueryExecution qExec = QueryExecutionHTTP.service("http://....";)
+                                 .query(query)
+                                 .build() ) {
+    ResultSet results = qExec.execSelect();
+    ... use results ...
+}
+```
+
+```
+// JDK HttpClient
+HttpClient httpClient = HttpClient.newBuilder()
+                .connectTimeout(Duration.ofSeconds(10))  // Timeout to connect
+                .followRedirects(Redirect.NORMAL)
+                .build();
+try ( QueryExecution qExec = QueryExecutionHTTP.create()
+                                 .service("http:// ....")
+                                 .httpClient(httpClient)
+                                 .query(query)
+                                 .sendMode(QuerySendMode.asPost)
+                                 .timeout(30, TimeUnit.SECONDS) // Timeout of 
request
+                                 .build() ) {
+    ResultSet results = qExec.execSelect();
+    ... use results ...
+}
+```
+There is only one timeout setting for HTTP query execution. The "time to
+connect" is handled by the JDK `HttpClient`. Timeouts for local execution are
+"time to first result" and "time to all results" as before.
+
+## <tt>GSP</tt>
+
+<tt>ModelStore</tt>
+
+```
+  Graph graph = GSP.serbvice("http://fuseki/dataset";).defaultGraph().GET();
+```
+
+```
+  Graph graph = ... ; 
+  
GSP.request("http://fuseki/dataset";).graphName("http;//data/myGraph").POST(graph);
+```
+
+```
+  DatasetGraph dataset = GSP.request("http://fuseki/dataset";).getDataset();
+```
+
+## Environment
+
+AuthEnv - passwordRegistry , authModifiers
+RegistryHttpClient
+
+## Customization of HTTP requests
+@@
+
+Params (e.g. apikey)
+
+ARQ.httpRequestModifer
+
+## QueryExecution
+
+## UpdateExecution
+
+## <tt>SERVICE</tt>
+@@
+[Old documentation ](../query/service.html) - passing parameters has changed.
+
+## Misc 
+
+###Params
+
+### SERVICE configuration
+
+See below for more on HTTP authentication with `SERVICE`.
+
+@@
+```java
+ //Symbol                Usage           Default
+ //[ ] srv:queryTimeout      Set timeouts -- There is only one time out now.
+ //[ ] srv:queryCompression  Enable use of deflate and GZip -- unsupported 
(didn't work!)
+ //[ ] srv:queryClient       Enable use of a specific client -- unsupported
+ //[ ] srv:serviceContext    Per-endpoint configuration -- Legacy
+ // + srv:serviceAllowed
+```
+
+Old names
+
+@@check
+
+| Symbol | Java Constant | Usage |
+| ------ | ----- | --- |
+| `arq:httpServiceAllowed` | `ARQ.httpServiceAllowed` | Yes or No |
+| `arq:serviceParams`      | `ARQ.serviceParams`    | Map |
+| `arq:httpQueryTimeout`   | `ARQ.httpQueryTimeout` |  Request timeout (time 
to completion) |
+| `arq:httpQueryClient`    | `ARQ.httpQueryTimeout` | Set the 
java.net.http.HttpClient  |
+| `arq:httpQueryCompression` | | no-op |
+
+where `arq:` is prefix for `<http://jena.apache.org/ARQ#>`.
+
+### ARQ.httpRequestModifier
+
+There is a mechanism to modify HTTP requests to specific endpoints or to a 
collection of endpoints with teh same prefix.
+
+For example, to add a header `X-Tracker` to each request:
+
+```java
+    AtomicLong counter = new AtomicLong(0);
+
+    HttpRequestModifier modifier = (params, headers)->{
+        long x = counter.incrementAndGet();
+        headers.put("X-Tracker", "Call="+x);
+    };
+    RegistryRequestModifier.get().addPrefix(serverURL, modifier);
+```
+
+## Authentication {#auth}
+
+For any use of users-password information, and especially HTTP basic
+authentication, information is visible in the HTTP headers. Using HTTPS is
+necessary to avoid snooping.  Digest authentication is also stronger over HTTPS
+because it protects against man-in-the-middle attacks.
+
+There are 5 variations:
+
+1. Basic authentication
+2. Challenge-Basic authentication
+3. Challenge-Digest authentication
+4. URL user (that is, `u...@host.net` in the URL)
+5. URL user and password in the URL (that is, `user:passw...@host.net` in the 
URL)
+
+Basic authentication occurs where the app provides the users and password
+information to the JDK `HttpClient` and that information is always used when
+sending HTTP requests with that `HttpClient`. It does not require an initial
+request-challenge-resend to initiate. This is provided natively by the 
`java.net.http`
+JDK code. See `HttpClient.newBuilder().authenticate(...)`.
+
+Challenge based authentication, for "basic" or "digest", are provided by Jena.
+The challenge happens on the first contact with the remote endpoint and the
+server returns a 401 response with an HTTP header saying which style of
+authentication is required. There is a registry of users name and password for
+endpoints which is consulted and the appropriate
+[`Authorization:`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Authorization)
+header is generated then the request resent. If no registration matches, the 
401
+is passed back to the application as an exception.
+
+Because it is a challenge response to an request, the first request must be

Review comment:
       s/to an request/to a request (or to an HTTP request?)

##########
File path: source/documentation/sparql-apis/__index.md
##########
@@ -0,0 +1,371 @@
+---
+title: Apache Jena SPARQL APIs
+slug: index
+---
+TOC
+
+## Overview
+
+The SPARQL specifications provide
+[query](https://www.w3.org/TR/sparql11-query/),
+[update](https://www.w3.org/TR/sparql11-update/) and the
+[graph store protocol](https://www.w3.org/TR/sparql11-http-rdf-update/) (GSP).
+
+Jena provides a single interface, [`RDFConnection`](../rdfconnection) for 
working
+with local and remote RDF data using these protocols in a unified way for local
+and remote data.
+
+HTTP Authentication is provided for remote operations.
+
+Alternatively, applications can also use the various execution engines through 
`QueryExecution`, `UpdateExecution` and `ModelStore`.
+
+All the main implementations work at "Graph SPI" (GPI) level and an 
application may wish to work with this lower level interface that implements 
generalized RDF (i.e. a triple is any three nodes, including ones like 
variables, and subsystem extension nodes).
+
+For working with RDF data:
+| API  | GPI  |
+| ---- | ---- |
+| `Model`       | `Graph`        |
+| `Statement`   | `Triple`       |
+| `Resource`    | `Node`         |
+| `Literal`     | `Node`         |
+| `String`      | `Var`          |
+| `Dataset`     | `DatasetGraph` |
+|               | `Quad` |
+
+and for SPARQL,
+
+| API  | GPI  |
+| ---- | ---- |
+| `RDFConnection`    | `RDFLink`    |
+| `QueryExecution`   | `QueryExec`  |
+| `UpdateExecution`  | `UpdateExec` |
+| `ResultSet`        | `RowSet`     |
+| `ModelStore`       | `GSP`        |
+
+The GPI version is the main machinery working at the storage and network level,
+and the API version is an adapter to convert to the Model API and related
+classes.
+
+This documentation describes the API classes - the GPI companion classes are 
the
+same style, sometimes with slightly changed naming.
+
+`UpdateProcessor` is a legacy name for `UpdateExecution`
+
+`GSP` provides the SPARQL Graph Store Protocol, including extensions for 
sending
+and receiving datasets, rather than individual graphs.
+
+Both API and GPI provide builders for detailed setup, particularly for remote 
usage over HTTP and HTTPS where detailed control fo the HTTP requests is 
sometimes necessary to work with other triple stores.
+
+HTTP authentication support is provided, supporting both basic and digest 
authentication in challenge-response scenarios.
+
+Factory style functions for many common usage patterns are retained in 
`QueryExecutionFactory`, `UpdateExecutionFactory`.
+
+## Changes from Jena 4.1.0 to Jena 4.2.0
+
+* Execution objects have a companion builder. This is especially important of 
HTTP as there many configuration options that may be needed. Local use is still 
covered by the existing `QueryExecutionFactory` as well as the new 
`QueryExecutionBuilder`.
+
+* HTTP usage provided by the JDK `java.net.http` package, with challenge-based
+authentication provides on top by Jena. [See below](#auth).
+
+* Authentication support is uniformly applied to query, update GSP and SPARQL 
`SERVICE`.
+
+* HTTP/2 support (Fuseki to follow unless done and tested in time).
+
+* Remove Apache HttpClient usage
+  * When using this for authentication, application code changes wil be
+    necessary.
+
+* Deprecate modifying `QueryExecution` after it is built.
+  This is still supported for local `QueryExecution`.
+
+* Parameterization for remote queries
+
+* `HttpOp` is split into `HttpRDF` for GET/POST/PUT/DELETE of graphs and
+  datasets and new `HttpOp` for packaged-up common patterns of HTTP usage.
+
+* DatasetAccessors will be removed.
+
+* GSP - support for dataset operations as well as graphs (also supported by 
Fuseki).
+
+## <tt>RDFConnection</tt>
+
+[RDFConnection](../rdfconnection/)
+
+```
+example with builder.
+```
+```
+example with factory
+```
+
+## Query Execution
+
+Factory Examples
+
+```
+Dataset dataset = ...
+Query query = ...
+try ( QueryExecution qExec = QueryExecutionFactory.create(query, dataset) ) {
+     ResultSet results = qExec.execSelect();
+    ... use results ...
+}
+```
+
+Builder Examples
+Builders are reusable and modifiable after a "build" operation.
+
+
+```
+Dataset dataset = ...
+Query query = ...
+try ( QueryExecution qExec = QueryExecution.create()
+                                 .dataset(dataset)
+                                 .query(query)
+                                 .build() ) {
+    ResultSet results = qExec.execSelect();
+    ... use results ...
+}
+```
+
+```
+try ( QueryExecution qExec = QueryExecutionHTTP.service("http://....";)
+                                 .query(query)
+                                 .build() ) {
+    ResultSet results = qExec.execSelect();
+    ... use results ...
+}
+```
+
+```
+// JDK HttpClient
+HttpClient httpClient = HttpClient.newBuilder()
+                .connectTimeout(Duration.ofSeconds(10))  // Timeout to connect
+                .followRedirects(Redirect.NORMAL)
+                .build();
+try ( QueryExecution qExec = QueryExecutionHTTP.create()
+                                 .service("http:// ....")
+                                 .httpClient(httpClient)
+                                 .query(query)
+                                 .sendMode(QuerySendMode.asPost)
+                                 .timeout(30, TimeUnit.SECONDS) // Timeout of 
request
+                                 .build() ) {
+    ResultSet results = qExec.execSelect();
+    ... use results ...
+}
+```
+There is only one timeout setting for HTTP query execution. The "time to
+connect" is handled by the JDK `HttpClient`. Timeouts for local execution are
+"time to first result" and "time to all results" as before.
+
+## <tt>GSP</tt>
+
+<tt>ModelStore</tt>
+
+```
+  Graph graph = GSP.serbvice("http://fuseki/dataset";).defaultGraph().GET();
+```
+
+```
+  Graph graph = ... ; 
+  
GSP.request("http://fuseki/dataset";).graphName("http;//data/myGraph").POST(graph);
+```
+
+```
+  DatasetGraph dataset = GSP.request("http://fuseki/dataset";).getDataset();
+```
+
+## Environment
+
+AuthEnv - passwordRegistry , authModifiers
+RegistryHttpClient
+
+## Customization of HTTP requests
+@@
+
+Params (e.g. apikey)
+
+ARQ.httpRequestModifer
+
+## QueryExecution
+
+## UpdateExecution
+
+## <tt>SERVICE</tt>
+@@
+[Old documentation ](../query/service.html) - passing parameters has changed.
+
+## Misc 
+
+###Params
+
+### SERVICE configuration
+
+See below for more on HTTP authentication with `SERVICE`.
+
+@@
+```java
+ //Symbol                Usage           Default
+ //[ ] srv:queryTimeout      Set timeouts -- There is only one time out now.
+ //[ ] srv:queryCompression  Enable use of deflate and GZip -- unsupported 
(didn't work!)
+ //[ ] srv:queryClient       Enable use of a specific client -- unsupported
+ //[ ] srv:serviceContext    Per-endpoint configuration -- Legacy
+ // + srv:serviceAllowed
+```
+
+Old names
+
+@@check
+
+| Symbol | Java Constant | Usage |
+| ------ | ----- | --- |
+| `arq:httpServiceAllowed` | `ARQ.httpServiceAllowed` | Yes or No |
+| `arq:serviceParams`      | `ARQ.serviceParams`    | Map |
+| `arq:httpQueryTimeout`   | `ARQ.httpQueryTimeout` |  Request timeout (time 
to completion) |
+| `arq:httpQueryClient`    | `ARQ.httpQueryTimeout` | Set the 
java.net.http.HttpClient  |
+| `arq:httpQueryCompression` | | no-op |
+
+where `arq:` is prefix for `<http://jena.apache.org/ARQ#>`.
+
+### ARQ.httpRequestModifier
+
+There is a mechanism to modify HTTP requests to specific endpoints or to a 
collection of endpoints with teh same prefix.
+
+For example, to add a header `X-Tracker` to each request:
+
+```java
+    AtomicLong counter = new AtomicLong(0);
+
+    HttpRequestModifier modifier = (params, headers)->{
+        long x = counter.incrementAndGet();
+        headers.put("X-Tracker", "Call="+x);
+    };
+    RegistryRequestModifier.get().addPrefix(serverURL, modifier);
+```
+
+## Authentication {#auth}
+
+For any use of users-password information, and especially HTTP basic
+authentication, information is visible in the HTTP headers. Using HTTPS is
+necessary to avoid snooping.  Digest authentication is also stronger over HTTPS
+because it protects against man-in-the-middle attacks.
+
+There are 5 variations:
+
+1. Basic authentication
+2. Challenge-Basic authentication
+3. Challenge-Digest authentication
+4. URL user (that is, `u...@host.net` in the URL)
+5. URL user and password in the URL (that is, `user:passw...@host.net` in the 
URL)
+
+Basic authentication occurs where the app provides the users and password
+information to the JDK `HttpClient` and that information is always used when
+sending HTTP requests with that `HttpClient`. It does not require an initial
+request-challenge-resend to initiate. This is provided natively by the 
`java.net.http`
+JDK code. See `HttpClient.newBuilder().authenticate(...)`.
+
+Challenge based authentication, for "basic" or "digest", are provided by Jena.
+The challenge happens on the first contact with the remote endpoint and the
+server returns a 401 response with an HTTP header saying which style of
+authentication is required. There is a registry of users name and password for
+endpoints which is consulted and the appropriate
+[`Authorization:`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Authorization)
+header is generated then the request resent. If no registration matches, the 
401
+is passed back to the application as an exception.
+
+Because it is a challenge response to an request, the first request must be
+repeated, first to trigger the challenge and then again with the HTTP
+authentication information.  To make this automatic, the first request must 
not be a streaming
+request (the stream is not repeatable). All HTTP request generated by Jena are 
repeatable.
+
+The URL can contain a `userinfo` part, either the `users@host` form, or the 
`user:password@host` form.
+If just the user is given, the authentication environment is consulted for 
registered users-password information. If user and password is given, the 
details as given are used. This latter form is not recommended and should only 
be used if necessary because the password is in-clear in the SPARQL
+query.
+
+Move page: [/documentation/query/http-auth](/documentation/query/http-auth)
+Link to 
+
+### JDK HttpClient.authenticator
+
+The java platform provides basic authentication.
+
+This is not challenge based - any request sent using a `HttpClient` configured 
with an authenticator will include the authentication details. (Caution- - 
including sending username/password to the wrong site!).
+
+```java
+    Authenticator authenticator = AuthLib.authenticator("user", "password");
+    HttpClient httpClient = HttpClient.newBuilder()
+            .connectTimeout(Duration.ofSeconds(10))
+            .authenticator(authenticator)
+            .build();
+```
+
+```java
+        // Use with RDFConnection      
+        try ( RDFConnection conn = RDFConnectionRemote.service(dataURL)
+                .httpClient(httpClient)
+                .build()) {
+            conn.queryAsk("ASK{}");
+        }
+```
+
+```java
+        // Use with QueryExecution
+        System.out.println("HttpClient + QueryExecutionHTTP");
+        try ( QueryExecution qExec = QueryExecutionHTTP.service(dataURL)
+                .httpClient(httpClient)
+                .endpoint(dataURL)
+                .queryString("ASK{}")
+                .build()) {
+            qExec.execAsk();
+        }
+```
+
+### Challenge registration
+
+`AuthEnv` maintains a registry of credentials and also a registry of which 
service URLs
+the credentials should be used form. It supports registration of endpoint 
prefixes so that one
+registration will apply to all URLs starting with a common root.
+
+The main function is `AuthEnv.get().registerUsernamePassword`.
+
+```java
+   // Application setup code 
+   AuthEnv.get().registerUsernamePassword("username", "password");
+```
+
+```java
+   ...
+   try ( QueryExecution qExec = QueryExecutionHTTP.service(dataURL)
+        // No httpClient
+        .endpoint(dataURL)
+        .queryString("ASK{}")
+        .build()) {
+       qExec.execAsk();
+   }
+```
+
+When a HTTP 401 response with an `WWW-Authenticate` header is received, the 
Jena http handling code

Review comment:
       s/a HTTP/an HTTP? Never remember if the H here sounds like vowel or not 
...

##########
File path: source/documentation/sparql-apis/__index.md
##########
@@ -0,0 +1,371 @@
+---
+title: Apache Jena SPARQL APIs
+slug: index
+---
+TOC
+
+## Overview
+
+The SPARQL specifications provide
+[query](https://www.w3.org/TR/sparql11-query/),
+[update](https://www.w3.org/TR/sparql11-update/) and the
+[graph store protocol](https://www.w3.org/TR/sparql11-http-rdf-update/) (GSP).
+
+Jena provides a single interface, [`RDFConnection`](../rdfconnection) for 
working
+with local and remote RDF data using these protocols in a unified way for local
+and remote data.
+
+HTTP Authentication is provided for remote operations.
+
+Alternatively, applications can also use the various execution engines through 
`QueryExecution`, `UpdateExecution` and `ModelStore`.
+
+All the main implementations work at "Graph SPI" (GPI) level and an 
application may wish to work with this lower level interface that implements 
generalized RDF (i.e. a triple is any three nodes, including ones like 
variables, and subsystem extension nodes).
+
+For working with RDF data:
+| API  | GPI  |
+| ---- | ---- |
+| `Model`       | `Graph`        |
+| `Statement`   | `Triple`       |
+| `Resource`    | `Node`         |
+| `Literal`     | `Node`         |
+| `String`      | `Var`          |
+| `Dataset`     | `DatasetGraph` |
+|               | `Quad` |
+
+and for SPARQL,
+
+| API  | GPI  |
+| ---- | ---- |
+| `RDFConnection`    | `RDFLink`    |
+| `QueryExecution`   | `QueryExec`  |
+| `UpdateExecution`  | `UpdateExec` |
+| `ResultSet`        | `RowSet`     |
+| `ModelStore`       | `GSP`        |
+
+The GPI version is the main machinery working at the storage and network level,
+and the API version is an adapter to convert to the Model API and related
+classes.
+
+This documentation describes the API classes - the GPI companion classes are 
the
+same style, sometimes with slightly changed naming.
+
+`UpdateProcessor` is a legacy name for `UpdateExecution`
+
+`GSP` provides the SPARQL Graph Store Protocol, including extensions for 
sending
+and receiving datasets, rather than individual graphs.
+
+Both API and GPI provide builders for detailed setup, particularly for remote 
usage over HTTP and HTTPS where detailed control fo the HTTP requests is 
sometimes necessary to work with other triple stores.
+
+HTTP authentication support is provided, supporting both basic and digest 
authentication in challenge-response scenarios.
+
+Factory style functions for many common usage patterns are retained in 
`QueryExecutionFactory`, `UpdateExecutionFactory`.
+
+## Changes from Jena 4.1.0 to Jena 4.2.0
+
+* Execution objects have a companion builder. This is especially important of 
HTTP as there many configuration options that may be needed. Local use is still 
covered by the existing `QueryExecutionFactory` as well as the new 
`QueryExecutionBuilder`.
+
+* HTTP usage provided by the JDK `java.net.http` package, with challenge-based
+authentication provides on top by Jena. [See below](#auth).
+
+* Authentication support is uniformly applied to query, update GSP and SPARQL 
`SERVICE`.
+
+* HTTP/2 support (Fuseki to follow unless done and tested in time).
+
+* Remove Apache HttpClient usage
+  * When using this for authentication, application code changes wil be
+    necessary.
+
+* Deprecate modifying `QueryExecution` after it is built.
+  This is still supported for local `QueryExecution`.
+
+* Parameterization for remote queries
+
+* `HttpOp` is split into `HttpRDF` for GET/POST/PUT/DELETE of graphs and
+  datasets and new `HttpOp` for packaged-up common patterns of HTTP usage.
+
+* DatasetAccessors will be removed.
+
+* GSP - support for dataset operations as well as graphs (also supported by 
Fuseki).
+
+## <tt>RDFConnection</tt>
+
+[RDFConnection](../rdfconnection/)
+
+```
+example with builder.
+```
+```
+example with factory
+```
+
+## Query Execution
+
+Factory Examples
+
+```
+Dataset dataset = ...
+Query query = ...
+try ( QueryExecution qExec = QueryExecutionFactory.create(query, dataset) ) {
+     ResultSet results = qExec.execSelect();
+    ... use results ...
+}
+```
+
+Builder Examples
+Builders are reusable and modifiable after a "build" operation.
+
+
+```
+Dataset dataset = ...
+Query query = ...
+try ( QueryExecution qExec = QueryExecution.create()
+                                 .dataset(dataset)
+                                 .query(query)
+                                 .build() ) {
+    ResultSet results = qExec.execSelect();
+    ... use results ...
+}
+```
+
+```
+try ( QueryExecution qExec = QueryExecutionHTTP.service("http://....";)
+                                 .query(query)
+                                 .build() ) {
+    ResultSet results = qExec.execSelect();
+    ... use results ...
+}
+```
+
+```
+// JDK HttpClient
+HttpClient httpClient = HttpClient.newBuilder()
+                .connectTimeout(Duration.ofSeconds(10))  // Timeout to connect
+                .followRedirects(Redirect.NORMAL)
+                .build();
+try ( QueryExecution qExec = QueryExecutionHTTP.create()
+                                 .service("http:// ....")
+                                 .httpClient(httpClient)
+                                 .query(query)
+                                 .sendMode(QuerySendMode.asPost)
+                                 .timeout(30, TimeUnit.SECONDS) // Timeout of 
request
+                                 .build() ) {
+    ResultSet results = qExec.execSelect();
+    ... use results ...
+}
+```
+There is only one timeout setting for HTTP query execution. The "time to
+connect" is handled by the JDK `HttpClient`. Timeouts for local execution are
+"time to first result" and "time to all results" as before.
+
+## <tt>GSP</tt>
+
+<tt>ModelStore</tt>
+
+```
+  Graph graph = GSP.serbvice("http://fuseki/dataset";).defaultGraph().GET();
+```
+
+```
+  Graph graph = ... ; 
+  
GSP.request("http://fuseki/dataset";).graphName("http;//data/myGraph").POST(graph);
+```
+
+```
+  DatasetGraph dataset = GSP.request("http://fuseki/dataset";).getDataset();
+```
+
+## Environment
+
+AuthEnv - passwordRegistry , authModifiers
+RegistryHttpClient
+
+## Customization of HTTP requests
+@@
+
+Params (e.g. apikey)
+
+ARQ.httpRequestModifer
+
+## QueryExecution
+
+## UpdateExecution
+
+## <tt>SERVICE</tt>
+@@
+[Old documentation ](../query/service.html) - passing parameters has changed.
+
+## Misc 
+
+###Params
+
+### SERVICE configuration
+
+See below for more on HTTP authentication with `SERVICE`.
+
+@@
+```java
+ //Symbol                Usage           Default
+ //[ ] srv:queryTimeout      Set timeouts -- There is only one time out now.
+ //[ ] srv:queryCompression  Enable use of deflate and GZip -- unsupported 
(didn't work!)
+ //[ ] srv:queryClient       Enable use of a specific client -- unsupported
+ //[ ] srv:serviceContext    Per-endpoint configuration -- Legacy
+ // + srv:serviceAllowed
+```
+
+Old names
+
+@@check
+
+| Symbol | Java Constant | Usage |
+| ------ | ----- | --- |
+| `arq:httpServiceAllowed` | `ARQ.httpServiceAllowed` | Yes or No |
+| `arq:serviceParams`      | `ARQ.serviceParams`    | Map |
+| `arq:httpQueryTimeout`   | `ARQ.httpQueryTimeout` |  Request timeout (time 
to completion) |
+| `arq:httpQueryClient`    | `ARQ.httpQueryTimeout` | Set the 
java.net.http.HttpClient  |
+| `arq:httpQueryCompression` | | no-op |
+
+where `arq:` is prefix for `<http://jena.apache.org/ARQ#>`.
+
+### ARQ.httpRequestModifier
+
+There is a mechanism to modify HTTP requests to specific endpoints or to a 
collection of endpoints with teh same prefix.
+
+For example, to add a header `X-Tracker` to each request:
+
+```java
+    AtomicLong counter = new AtomicLong(0);
+
+    HttpRequestModifier modifier = (params, headers)->{
+        long x = counter.incrementAndGet();
+        headers.put("X-Tracker", "Call="+x);
+    };
+    RegistryRequestModifier.get().addPrefix(serverURL, modifier);
+```
+
+## Authentication {#auth}
+
+For any use of users-password information, and especially HTTP basic
+authentication, information is visible in the HTTP headers. Using HTTPS is
+necessary to avoid snooping.  Digest authentication is also stronger over HTTPS
+because it protects against man-in-the-middle attacks.
+
+There are 5 variations:
+
+1. Basic authentication
+2. Challenge-Basic authentication
+3. Challenge-Digest authentication
+4. URL user (that is, `u...@host.net` in the URL)
+5. URL user and password in the URL (that is, `user:passw...@host.net` in the 
URL)
+
+Basic authentication occurs where the app provides the users and password
+information to the JDK `HttpClient` and that information is always used when
+sending HTTP requests with that `HttpClient`. It does not require an initial
+request-challenge-resend to initiate. This is provided natively by the 
`java.net.http`
+JDK code. See `HttpClient.newBuilder().authenticate(...)`.
+
+Challenge based authentication, for "basic" or "digest", are provided by Jena.
+The challenge happens on the first contact with the remote endpoint and the
+server returns a 401 response with an HTTP header saying which style of
+authentication is required. There is a registry of users name and password for
+endpoints which is consulted and the appropriate
+[`Authorization:`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Authorization)
+header is generated then the request resent. If no registration matches, the 
401
+is passed back to the application as an exception.
+
+Because it is a challenge response to an request, the first request must be
+repeated, first to trigger the challenge and then again with the HTTP
+authentication information.  To make this automatic, the first request must 
not be a streaming
+request (the stream is not repeatable). All HTTP request generated by Jena are 
repeatable.
+
+The URL can contain a `userinfo` part, either the `users@host` form, or the 
`user:password@host` form.
+If just the user is given, the authentication environment is consulted for 
registered users-password information. If user and password is given, the 
details as given are used. This latter form is not recommended and should only 
be used if necessary because the password is in-clear in the SPARQL
+query.
+
+Move page: [/documentation/query/http-auth](/documentation/query/http-auth)
+Link to 
+
+### JDK HttpClient.authenticator
+
+The java platform provides basic authentication.
+
+This is not challenge based - any request sent using a `HttpClient` configured 
with an authenticator will include the authentication details. (Caution- - 
including sending username/password to the wrong site!).
+
+```java
+    Authenticator authenticator = AuthLib.authenticator("user", "password");
+    HttpClient httpClient = HttpClient.newBuilder()
+            .connectTimeout(Duration.ofSeconds(10))
+            .authenticator(authenticator)
+            .build();
+```
+
+```java
+        // Use with RDFConnection      
+        try ( RDFConnection conn = RDFConnectionRemote.service(dataURL)
+                .httpClient(httpClient)
+                .build()) {
+            conn.queryAsk("ASK{}");
+        }
+```
+
+```java
+        // Use with QueryExecution
+        System.out.println("HttpClient + QueryExecutionHTTP");
+        try ( QueryExecution qExec = QueryExecutionHTTP.service(dataURL)
+                .httpClient(httpClient)
+                .endpoint(dataURL)
+                .queryString("ASK{}")
+                .build()) {
+            qExec.execAsk();
+        }
+```
+
+### Challenge registration
+
+`AuthEnv` maintains a registry of credentials and also a registry of which 
service URLs
+the credentials should be used form. It supports registration of endpoint 
prefixes so that one

Review comment:
       s/used form/used from




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@jena.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


Reply via email to